[net-next 13/13] net/mlx5e: CT: Fix releasing ft entries

[Saeed Mahameed]

From: Roi Dayan <r...@mellanox.com>

Before this commit, on ft flush, ft entries were not removed
from the ct_tuple hashtables. Fix it.

Fixes: ac991b48d43c ("net/mlx5e: CT: Offload established flows")
Signed-off-by: Roi Dayan <r...@mellanox.com>
Signed-off-by: Eli Britstein <el...@mellanox.com>
Signed-off-by: Saeed Mahameed <sae...@mellanox.com>
---
 .../ethernet/mellanox/mlx5/core/en/tc_ct.c    | 24 ++++++++++++-------
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en/tc_ct.c 
b/drivers/net/ethernet/mellanox/mlx5/core/en/tc_ct.c
index 96225e897064..4c65677feaab 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/en/tc_ct.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en/tc_ct.c
@@ -817,6 +817,19 @@ mlx5_tc_ct_block_flow_offload_add(struct mlx5_ct_ft *ft,
        return err;
 }
 
+static void
+mlx5_tc_ct_del_ft_entry(struct mlx5_tc_ct_priv *ct_priv,
+                       struct mlx5_ct_entry *entry)
+{
+       mlx5_tc_ct_entry_del_rules(ct_priv, entry);
+       if (entry->tuple_node.next)
+               rhashtable_remove_fast(&ct_priv->ct_tuples_nat_ht,
+                                      &entry->tuple_nat_node,
+                                      tuples_nat_ht_params);
+       rhashtable_remove_fast(&ct_priv->ct_tuples_ht, &entry->tuple_node,
+                              tuples_ht_params);
+}
+
 static int
 mlx5_tc_ct_block_flow_offload_del(struct mlx5_ct_ft *ft,
                                  struct flow_cls_offload *flow)
@@ -829,13 +842,7 @@ mlx5_tc_ct_block_flow_offload_del(struct mlx5_ct_ft *ft,
        if (!entry)
                return -ENOENT;
 
-       mlx5_tc_ct_entry_del_rules(ft->ct_priv, entry);
-       if (entry->tuple_node.next)
-               rhashtable_remove_fast(&ft->ct_priv->ct_tuples_nat_ht,
-                                      &entry->tuple_nat_node,
-                                      tuples_nat_ht_params);
-       rhashtable_remove_fast(&ft->ct_priv->ct_tuples_ht, &entry->tuple_node,
-                              tuples_ht_params);
+       mlx5_tc_ct_del_ft_entry(ft->ct_priv, entry);
        WARN_ON(rhashtable_remove_fast(&ft->ct_entries_ht,
                                       &entry->node,
                                       cts_ht_params));
@@ -1348,7 +1355,8 @@ mlx5_tc_ct_flush_ft_entry(void *ptr, void *arg)
        struct mlx5_tc_ct_priv *ct_priv = arg;
        struct mlx5_ct_entry *entry = ptr;
 
-       mlx5_tc_ct_entry_del_rules(ct_priv, entry);
+       mlx5_tc_ct_del_ft_entry(ct_priv, entry);
+       kfree(entry);
 }
 
 static void
-- 
2.26.2