2022-02-16 16:42:25

by Volodymyr Mytnyk

Subject: [PATCH net-next] 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]>
---
.../ethernet/marvell/prestera/prestera_flower.c | 24 ++++++++++++++++++----
1 file changed, 20 insertions(+), 4 deletions(-)

diff --git a/drivers/net/ethernet/marvell/prestera/prestera_flower.c b/drivers/net/ethernet/marvell/prestera/prestera_flower.c
index 580fb986496a..9587707e3148 100644
--- a/drivers/net/ethernet/marvell/prestera/prestera_flower.c
+++ b/drivers/net/ethernet/marvell/prestera/prestera_flower.c
@@ -12,6 +12,14 @@ 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;
@@ -20,9 +28,7 @@ void prestera_flower_template_cleanup(struct prestera_flow_block *block)
/* 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);
+ prestera_flower_template_free(template);
}
}

@@ -423,7 +429,17 @@ 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;
+ struct list_head *pos, *n;
+
+ list_for_each_safe(pos, n, &block->template_list) {
+ template = list_entry(pos, typeof(*template), 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-18 05:01:55

by Jakub Kicinski

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

On Wed, 16 Feb 2022 16:43:44 +0200 Volodymyr Mytnyk wrote:
> + list_for_each_safe(pos, n, &block->template_list) {
> + template = list_entry(pos, typeof(*template), list);

nit: list_for_each_entry_safe()

> + if (template->chain_index == f->common.chain_index) {
> + /* put the reference to the ruleset kept in create */
> + prestera_flower_template_free(template);
> + return;
> + }
> + }

2022-02-18 05:03:04

by Jakub Kicinski

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

On Wed, 16 Feb 2022 16:43:44 +0200 Volodymyr Mytnyk wrote:
> Fixes: fa5d824ce5dd ("net: prestera: acl: add multi-chain support offload")
>
> Signed-off-by: Volodymyr Mytnyk <[email protected]>

Ah, and please don't put empty lines between tags.