Commit cdd3f236 authored by Tariq Toukan's avatar Tariq Toukan Committed by Saeed Mahameed
Browse files

net/mlx5e: Free drop RQ in a dedicated function 



The drop RQ has very limited objects to be freed, and differs
from regular RQs in the context that it is freed from.
Add a dedicated function for it, use it where needed, and remove
the drop_rq-specific checks in the generic function.

Signed-off-by: default avatarTariq Toukan <tariqt@nvidia.com>
Reviewed-by: default avatarAya Levin <ayal@nvidia.com>
Reviewed-by: default avatarMaxim Mikityanskiy <maximmi@mellanox.com>
Signed-off-by: default avatarSaeed Mahameed <saeedm@nvidia.com>
parent 8e98387b

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

+10 −8
Original line number Diff line number Diff line
@@ -613,14 +613,11 @@ static int mlx5e_alloc_rq(struct mlx5e_channel *c, 


static void mlx5e_free_rq(struct mlx5e_rq *rq)

{

	struct mlx5e_channel *c = rq->channel;

	struct bpf_prog *old_prog = NULL;

	struct bpf_prog *old_prog;

	int i;



	/* drop_rq has neither channel nor xdp_prog. */

	if (c)

	old_prog = rcu_dereference_protected(rq->xdp_prog,

						     lockdep_is_held(&c->priv->state_lock));

					     lockdep_is_held(&rq->channel->priv->state_lock));

	if (old_prog)

		bpf_prog_put(old_prog);
@@ -3196,6 +3193,11 @@ int mlx5e_close(struct net_device *netdev) 
	return err;

}



static void mlx5e_free_drop_rq(struct mlx5e_rq *rq)

{

	mlx5_wq_destroy(&rq->wq_ctrl);

}



static int mlx5e_alloc_drop_rq(struct mlx5_core_dev *mdev,

			       struct mlx5e_rq *rq,

			       struct mlx5e_rq_param *param)
@@ -3263,7 +3265,7 @@ int mlx5e_open_drop_rq(struct mlx5e_priv *priv, 
	return 0;



err_free_rq:

	mlx5e_free_rq(drop_rq);

	mlx5e_free_drop_rq(drop_rq);



err_destroy_cq:

	mlx5e_destroy_cq(cq);
@@ -3277,7 +3279,7 @@ int mlx5e_open_drop_rq(struct mlx5e_priv *priv, 
void mlx5e_close_drop_rq(struct mlx5e_rq *drop_rq)

{

	mlx5e_destroy_rq(drop_rq);

	mlx5e_free_rq(drop_rq);

	mlx5e_free_drop_rq(drop_rq);

	mlx5e_destroy_cq(&drop_rq->cq);

	mlx5e_free_cq(&drop_rq->cq);

}