[PATCH net] net/sched: cls_flower: Remove old entries from rhashtable

[PATCH net] net/sched: cls_flower: Remove old entries from rhashtable

[Roi Dayan]

When replacing a rule we add the new rule to the rhashtable
but only remove the old if not in skip_sw.
This commit fix this and remove the old rule anyway.

Fixes: 35cc3cefc4de ("net/sched: cls_flower: Reject duplicated rules also under skip_sw")
Signed-off-by: Roi Dayan <roid@mellanox.com>
Reviewed-by: Vlad Buslov <vladbu@mellanox.com>
---
 net/sched/cls_flower.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/net/sched/cls_flower.c b/net/sched/cls_flower.c
index 71312d7bd8f4..208d940464d7 100644
--- a/net/sched/cls_flower.c
+++ b/net/sched/cls_flower.c
@@ -1258,10 +1258,9 @@ static int fl_change(struct net *net, struct sk_buff *in_skb,
 		fnew->flags |= TCA_CLS_FLAGS_NOT_IN_HW;
 
 	if (fold) {
-		if (!tc_skip_sw(fold->flags))
-			rhashtable_remove_fast(&fold->mask->ht,
-					       &fold->ht_node,
-					       fold->mask->filter_ht_params);
+		rhashtable_remove_fast(&fold->mask->ht,
+				       &fold->ht_node,
+				       fold->mask->filter_ht_params);
 		if (!tc_skip_hw(fold->flags))
 			fl_hw_destroy_filter(tp, fold, NULL);
 	}
-- 
2.7.5

Re: [PATCH net] net/sched: cls_flower: Remove old entries from rhashtable

[Or Gerlitz]

On Wed, Dec 19, 2018 at 9:41 PM Roi Dayan <roid@mellanox.com> wrote:
>
> When replacing a rule we add the new rule to the rhashtable
> but only remove the old if not in skip_sw.
> This commit fix this and remove the old rule anyway.
>
> Fixes: 35cc3cefc4de ("net/sched: cls_flower: Reject duplicated rules also under skip_sw")
> Signed-off-by: Roi Dayan <roid@mellanox.com>
> Reviewed-by: Vlad Buslov <vladbu@mellanox.com>

Acked-by: Or Gerlitz <ogerlitz@mellanox.com>

Re: [PATCH net] net/sched: cls_flower: Remove old entries from rhashtable

[David Miller]

From: Roi Dayan <roid@mellanox.com>
Date: Wed, 19 Dec 2018 18:07:56 +0200

> When replacing a rule we add the new rule to the rhashtable
> but only remove the old if not in skip_sw.
> This commit fix this and remove the old rule anyway.
> 
> Fixes: 35cc3cefc4de ("net/sched: cls_flower: Reject duplicated rules also under skip_sw")
> Signed-off-by: Roi Dayan <roid@mellanox.com>
> Reviewed-by: Vlad Buslov <vladbu@mellanox.com>

Applied, thanks.