Commit bbe11249 authored by Roi Dayan's avatar Roi Dayan Committed by Saeed Mahameed
Browse files

net/mlx5e: CT: Fix releasing ft entries 



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

Fixes: ac991b48 ("net/mlx5e: CT: Offload established flows")
Signed-off-by: default avatarRoi Dayan <roid@mellanox.com>
Signed-off-by: default avatarEli Britstein <elibr@mellanox.com>
Signed-off-by: default avatarSaeed Mahameed <saeedm@mellanox.com>
parent de96d573

drivers/net/ethernet/mellanox/mlx5/core/en/tc_ct.c

+16 −8
Original line number Diff line number Diff line
@@ -817,6 +817,19 @@ err_set: 
	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

CRA Git | Maintained and supported by SUSTech CRA and CCSE