net: prestera: flower: fix destroy tmpl in chain
authorVolodymyr Mytnyk <vmytnyk@marvell.com>
Fri, 18 Feb 2022 09:39:49 +0000 (11:39 +0200)
committerDavid S. Miller <davem@davemloft.net>
Sat, 19 Feb 2022 16:22:03 +0000 (16:22 +0000)
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 <vmytnyk@marvell.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/marvell/prestera/prestera_flower.c

index 580fb98..921959a 100644 (file)
@@ -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 @@ err_malloc:
 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,