Commit e2194a17 authored by Paul Blakey's avatar Paul Blakey Committed by Saeed Mahameed
Browse files

net/mlx5: CT: Fix incorrect removal of tuple_nat_node from nat rhashtable 



If a non nat tuple entry is inserted just to the regular tuples
rhashtable (ct_tuples_ht) and not to natted tuples rhashtable
(ct_nat_tuples_ht). Commit bc562be9 ("net/mlx5e: CT: Save ct entries
tuples in hashtables") mixed up the return labels and names sot that on
cleanup or failure we still try to remove for the natted tuples rhashtable.

Fix that by correctly checking if a natted tuples insertion
before removing it. While here make it more readable.

Fixes: bc562be9 ("net/mlx5e: CT: Save ct entries tuples in hashtables")
Reviewed-by: default avatarRoi Dayan <roid@nvidia.com>
Signed-off-by: default avatarPaul Blakey <paulb@nvidia.com>
Signed-off-by: default avatarSaeed Mahameed <saeedm@nvidia.com>
parent 8355060f

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

+13 −7
Original line number Diff line number Diff line
@@ -167,6 +167,12 @@ static const struct rhashtable_params tuples_nat_ht_params = { 
	.min_size = 16 * 1024,

};



static bool

mlx5_tc_ct_entry_has_nat(struct mlx5_ct_entry *entry)

{

	return !!(entry->tuple_nat_node.next);

}



static int

mlx5_tc_ct_rule_to_tuple(struct mlx5_ct_tuple *tuple, struct flow_rule *rule)

{
@@ -911,10 +917,10 @@ mlx5_tc_ct_block_flow_offload_add(struct mlx5_ct_ft *ft, 
err_insert:

	mlx5_tc_ct_entry_del_rules(ct_priv, entry);

err_rules:

	if (mlx5_tc_ct_entry_has_nat(entry))

		rhashtable_remove_fast(&ct_priv->ct_tuples_nat_ht,

				       &entry->tuple_nat_node, tuples_nat_ht_params);

err_tuple_nat:

	if (entry->tuple_node.next)

	rhashtable_remove_fast(&ct_priv->ct_tuples_ht,

			       &entry->tuple_node,

			       tuples_ht_params);
@@ -932,7 +938,7 @@ mlx5_tc_ct_del_ft_entry(struct mlx5_tc_ct_priv *ct_priv, 
{

	mlx5_tc_ct_entry_del_rules(ct_priv, entry);

	mutex_lock(&ct_priv->shared_counter_lock);

	if (entry->tuple_node.next)

	if (mlx5_tc_ct_entry_has_nat(entry))

		rhashtable_remove_fast(&ct_priv->ct_tuples_nat_ht,

				       &entry->tuple_nat_node,

				       tuples_nat_ht_params);