Commit 5e72f3f1 authored by Ariel Levkovich's avatar Ariel Levkovich Committed by Saeed Mahameed
Browse files

net/mlx5e: TC, Keep mod hdr actions after mod hdr alloc 



When offloading TC NIC rule which has mod_hdr action, the
mod_hdr actions list is freed upon mod_hdr allocation.

In the new format of handling multi table actions and CT in
particular, the mod_hdr actions list is still relevant when
setting the pre and post rules and therefore, freeing the list
may cause adding rules which don't set the FTE_ID.

Therefore, the mod_hdr actions list needs to be kept for the
pre/post flows as well and should be left for these handler to
be freed.

Fixes: 8300f225 ("net/mlx5e: Create new flow attr for multi table actions")
Signed-off-by: default avatarAriel Levkovich <lariel@nvidia.com>
Signed-off-by: default avatarSaeed Mahameed <saeedm@nvidia.com>
parent e0bf81bf

drivers/net/ethernet/mellanox/mlx5/core/en_tc.c

+3 −2
Original line number Diff line number Diff line
@@ -1301,7 +1301,6 @@ mlx5e_tc_add_nic_flow(struct mlx5e_priv *priv, 


	if (attr->action & MLX5_FLOW_CONTEXT_ACTION_MOD_HDR) {

		err = mlx5e_attach_mod_hdr(priv, flow, parse_attr);

		mlx5e_mod_hdr_dealloc(&parse_attr->mod_hdr_acts);

		if (err)

			return err;

	}
@@ -1359,8 +1358,10 @@ static void mlx5e_tc_del_nic_flow(struct mlx5e_priv *priv, 
	}

	mutex_unlock(&tc->t_lock);



	if (attr->action & MLX5_FLOW_CONTEXT_ACTION_MOD_HDR)

	if (attr->action & MLX5_FLOW_CONTEXT_ACTION_MOD_HDR) {

		mlx5e_mod_hdr_dealloc(&attr->parse_attr->mod_hdr_acts);

		mlx5e_detach_mod_hdr(priv, flow);

	}



	if (attr->action & MLX5_FLOW_CONTEXT_ACTION_COUNT)

		mlx5_fc_destroy(priv->mdev, attr->counter);