2022-02-18 10:16:10

by Volodymyr Mytnyk

Subject: [PATCH net-next v2] net: prestera: flower: fix destroy tmpl in chain

From: Volodymyr Mytnyk <[email protected]>

Fix flower destroy template callback to release template
only for specific tc chain instead of all chain tempaltes.

The issue was intruduced by previous commit that introduced
multi-chain support.

Fixes: fa5d824ce5dd ("net: prestera: acl: add multi-chain support offload")
Signed-off-by: Volodymyr Mytnyk <[email protected]>
---

V1->V2:
use list_for_each_entry_safe instead of list_for_each_safe
remove empty lines between tags

.../ethernet/marvell/prestera/prestera_flower.c | 28 +++++++++++++++-------
1 file changed, 19 insertions(+), 9 deletions(-)

diff --git a/drivers/net/ethernet/marvell/prestera/prestera_flower.c b/drivers/net/ethernet/marvell/prestera/prestera_flower.c
index 580fb986496a..921959a980ee 100644
--- a/drivers/net/ethernet/marvell/prestera/prestera_flower.c
+++ b/drivers/net/ethernet/marvell/prestera/prestera_flower.c
@@ -12,18 +12,21 @@ struct prestera_flower_template {
u32 chain_index;
};

+static void
+prestera_flower_template_free(struct prestera_flower_template *template)
+{
+ prestera_acl_ruleset_put(template->ruleset);
+ list_del(&template->list);
+ kfree(template);
+}
+
void prestera_flower_template_cleanup(struct prestera_flow_block *block)
{
- struct prestera_flower_template *template;
- struct list_head *pos, *n;
+ struct prestera_flower_template *template, *tmp;

/* put the reference to all rulesets kept in tmpl create */
- list_for_each_safe(pos, n, &block->template_list) {
- template = list_entry(pos, typeof(*template), list);
- prestera_acl_ruleset_put(template->ruleset);
- list_del(&template->list);
- kfree(template);
- }
+ list_for_each_entry_safe(template, tmp, &block->template_list, list)
+ prestera_flower_template_free(template);
}

static int
@@ -423,7 +426,14 @@ int prestera_flower_tmplt_create(struct prestera_flow_block *block,
void prestera_flower_tmplt_destroy(struct prestera_flow_block *block,
struct flow_cls_offload *f)
{
- prestera_flower_template_cleanup(block);
+ struct prestera_flower_template *template, *tmp;
+
+ list_for_each_entry_safe(template, tmp, &block->template_list, list)
+ if (template->chain_index == f->common.chain_index) {
+ /* put the reference to the ruleset kept in create */
+ prestera_flower_template_free(template);
+ return;
+ }
}

int prestera_flower_stats(struct prestera_flow_block *block,
--
2.7.4

2022-02-20 05:43:26

by patchwork-bot+netdevbpf

Subject: Re: [PATCH net-next v2] net: prestera: flower: fix destroy tmpl in chain

Hello:

This patch was applied to netdev/net-next.git (master)
by David S. Miller <[email protected]>:

On Fri, 18 Feb 2022 11:39:49 +0200 you wrote:
> From: Volodymyr Mytnyk <[email protected]>
>
> Fix flower destroy template callback to release template
> only for specific tc chain instead of all chain tempaltes.
>
> The issue was intruduced by previous commit that introduced
> multi-chain support.
>
> [...]

Here is the summary with links:
- [net-next,v2] net: prestera: flower: fix destroy tmpl in chain
https://git.kernel.org/netdev/net-next/c/b3ae2d350ddf

You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html