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: Tariq Toukan <tariqt@nvidia.com>
Reviewed-by: Aya Levin <ayal@nvidia.com>
Reviewed-by: Maxim Mikityanskiy <maximmi@mellanox.com>
Signed-off-by: Saeed Mahameed <saeedm@nvidia.com>

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c b/drivers/net/ethernet/mellanox/mlx5/core/en_main.c
index 330201dfe9a47d4e2f3b51774e40b5fbe52ba745..e88730606da35fd70071e1d0800566aa486b0bbf 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_main.c
@@ -613,14 +613,11 @@ err_rq_xdp_prog:
 
 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));
+       old_prog = rcu_dereference_protected(rq->xdp_prog,
+                                            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 @@ err_free_cq:
 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);
 }