[net-next V2 09/13] net/mlx5e: Generalize close RQ

[Saeed Mahameed]

From: Aya Levin <a...@nvidia.com>

Allow different flavours of RQ to use the same close flow. Add validity
checks to support different RQ types which not necessarily initialize
all the RQ's functionality.

Signed-off-by: Aya Levin <a...@nvidia.com>
Reviewed-by: Tariq Toukan <tar...@nvidia.com>
Signed-off-by: Saeed Mahameed <sae...@nvidia.com>
---
 drivers/net/ethernet/mellanox/mlx5/core/en/trap.c | 12 +-----------
 drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 13 ++++++++-----
 2 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en/trap.c 
b/drivers/net/ethernet/mellanox/mlx5/core/en/trap.c
index d6e6641e9288..86ab4e864fe6 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/en/trap.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en/trap.c
@@ -30,14 +30,6 @@ static int mlx5e_trap_napi_poll(struct napi_struct *napi, 
int budget)
        return work_done;
 }
 
-static void mlx5e_free_trap_rq(struct mlx5e_rq *rq)
-{
-       page_pool_destroy(rq->page_pool);
-       mlx5e_free_di_list(rq);
-       kvfree(rq->wqe.frags);
-       mlx5_wq_destroy(&rq->wq_ctrl);
-}
-
 static void mlx5e_init_trap_rq(struct mlx5e_trap *t, struct mlx5e_params 
*params,
                               struct mlx5e_rq *rq)
 {
@@ -93,9 +85,7 @@ static int mlx5e_open_trap_rq(struct mlx5e_priv *priv, struct 
mlx5e_trap *t)
 
 static void mlx5e_close_trap_rq(struct mlx5e_rq *rq)
 {
-       mlx5e_destroy_rq(rq);
-       mlx5e_free_rx_descs(rq);
-       mlx5e_free_trap_rq(rq);
+       mlx5e_close_rq(rq);
        mlx5e_close_cq(&rq->cq);
 }
 
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c 
b/drivers/net/ethernet/mellanox/mlx5/core/en_main.c
index 06df647b2beb..f2884edd4b61 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_main.c
@@ -592,10 +592,12 @@ static void mlx5e_free_rq(struct mlx5e_rq *rq)
        struct bpf_prog *old_prog;
        int i;
 
-       old_prog = rcu_dereference_protected(rq->xdp_prog,
-                                            
lockdep_is_held(&rq->priv->state_lock));
-       if (old_prog)
-               bpf_prog_put(old_prog);
+       if (xdp_rxq_info_is_reg(&rq->xdp_rxq)) {
+               old_prog = rcu_dereference_protected(rq->xdp_prog,
+                                                    
lockdep_is_held(&rq->priv->state_lock));
+               if (old_prog)
+                       bpf_prog_put(old_prog);
+       }
 
        switch (rq->wq_type) {
        case MLX5_WQ_TYPE_LINKED_LIST_STRIDING_RQ:
@@ -901,7 +903,8 @@ void mlx5e_deactivate_rq(struct mlx5e_rq *rq)
 void mlx5e_close_rq(struct mlx5e_rq *rq)
 {
        cancel_work_sync(&rq->dim.work);
-       cancel_work_sync(&rq->icosq->recover_work);
+       if (rq->icosq)
+               cancel_work_sync(&rq->icosq->recover_work);
        cancel_work_sync(&rq->recover_work);
        mlx5e_destroy_rq(rq);
        mlx5e_free_rx_descs(rq);
-- 
2.30.2