net/mlx5e: Remove duplicate mkey from SHAMPO header

SHAMPO structure holds two variations of the mkey, which is unnecessary,
a duplication that's repeated per rq.

Remove duplicate mkey information and keep only one version, the one
used in the fast path, rename field to reflect field type clearly.

Signed-off-by: Lama Kayal <lkayal@nvidia.com>
Reviewed-by: Dragos Tatulea <dtatulea@nvidia.com>
Signed-off-by: Tariq Toukan <tariqt@nvidia.com>
Reviewed-by: Michal Swiatkowski <michal.swiatkowski@linux.intel.com>
Reviewed-by: Jacob Keller <jacob.e.keller@intel.com>
Link: https://patch.msgid.link/1753081999-326247-4-git-send-email-tariqt@nvidia.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en.h b/drivers/net/ethernet/mellanox/mlx5/core/en.h
index 558fad0b7e4838d91ea306158477eba219ac3e44..99295eaf2f02077ec287934f81092030dbfa6883 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/en.h
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en.h
@@ -630,14 +630,13 @@ struct mlx5e_dma_info {
 };
 
 struct mlx5e_shampo_hd {
-       u32 mkey;
        struct mlx5e_frag_page *pages;
        u32 hd_per_wq;
        u16 hd_per_wqe;
        unsigned long *bitmap;
        u16 pi;
        u16 ci;
-       __be32 key;
+       __be32 mkey_be;
 };
 
 struct mlx5e_hw_gro_data {

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c b/drivers/net/ethernet/mellanox/mlx5/core/en_main.c
index bd481f3384d0bbbce4cd6ff00a9068737e848a72..33bdb7f1e03fd4568a0fcfc0366052edfad55458 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_main.c
@@ -546,18 +546,26 @@ static int mlx5e_create_rq_umr_mkey(struct mlx5_core_dev *mdev, struct mlx5e_rq
 }
 
 static int mlx5e_create_rq_hd_umr_mkey(struct mlx5_core_dev *mdev,
-                                      u16 hd_per_wq, u32 *umr_mkey)
+                                      u16 hd_per_wq, __be32 *umr_mkey)
 {
        u32 max_ksm_size = BIT(MLX5_CAP_GEN(mdev, log_max_klm_list_size));
+       u32 mkey;
+       int err;
 
        if (max_ksm_size < hd_per_wq) {
                mlx5_core_err(mdev, "max ksm list size 0x%x is smaller than shampo header buffer list size 0x%x\n",
                              max_ksm_size, hd_per_wq);
                return -EINVAL;
        }
-       return mlx5e_create_umr_ksm_mkey(mdev, hd_per_wq,
-                                        MLX5E_SHAMPO_LOG_HEADER_ENTRY_SIZE,
-                                        umr_mkey);
+
+       err = mlx5e_create_umr_ksm_mkey(mdev, hd_per_wq,
+                                       MLX5E_SHAMPO_LOG_HEADER_ENTRY_SIZE,
+                                       &mkey);
+       if (err)
+               return err;
+
+       *umr_mkey = cpu_to_be32(mkey);
+       return 0;
 }
 
 static void mlx5e_init_frags_partition(struct mlx5e_rq *rq)
@@ -783,11 +791,10 @@ static int mlx5_rq_shampo_alloc(struct mlx5_core_dev *mdev,
                goto err_shampo_hd_info_alloc;
 
        err = mlx5e_create_rq_hd_umr_mkey(mdev, hd_per_wq,
-                                         &rq->mpwqe.shampo->mkey);
+                                         &rq->mpwqe.shampo->mkey_be);
        if (err)
                goto err_umr_mkey;
 
-       rq->mpwqe.shampo->key = cpu_to_be32(rq->mpwqe.shampo->mkey);
        rq->mpwqe.shampo->hd_per_wqe =
                mlx5e_shampo_hd_per_wqe(mdev, params, rqp);
        wq_size = BIT(MLX5_GET(wq, wqc, log_wq_sz));
@@ -832,7 +839,7 @@ static int mlx5_rq_shampo_alloc(struct mlx5_core_dev *mdev,
 err_hw_gro_data:
        page_pool_destroy(rq->hd_page_pool);
 err_hds_page_pool:
-       mlx5_core_destroy_mkey(mdev, rq->mpwqe.shampo->mkey);
+       mlx5_core_destroy_mkey(mdev, be32_to_cpu(rq->mpwqe.shampo->mkey_be));
 err_umr_mkey:
        mlx5e_rq_shampo_hd_info_free(rq);
 err_shampo_hd_info_alloc:
@@ -849,7 +856,8 @@ static void mlx5e_rq_free_shampo(struct mlx5e_rq *rq)
        if (rq->hd_page_pool != rq->page_pool)
                page_pool_destroy(rq->hd_page_pool);
        mlx5e_rq_shampo_hd_info_free(rq);
-       mlx5_core_destroy_mkey(rq->mdev, rq->mpwqe.shampo->mkey);
+       mlx5_core_destroy_mkey(rq->mdev,
+                              be32_to_cpu(rq->mpwqe.shampo->mkey_be));
        kvfree(rq->mpwqe.shampo);
 }
 
@@ -1122,7 +1130,8 @@ int mlx5e_create_rq(struct mlx5e_rq *rq, struct mlx5e_rq_param *param, u16 q_cou
        if (test_bit(MLX5E_RQ_STATE_SHAMPO, &rq->state)) {
                MLX5_SET(wq, wq, log_headers_buffer_entry_num,
                         order_base_2(rq->mpwqe.shampo->hd_per_wq));
-               MLX5_SET(wq, wq, headers_mkey, rq->mpwqe.shampo->mkey);
+               MLX5_SET(wq, wq, headers_mkey,
+                        be32_to_cpu(rq->mpwqe.shampo->mkey_be));
        }
 
        mlx5_fill_page_frag_array(&rq->wq_ctrl.buf,

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_rx.c b/drivers/net/ethernet/mellanox/mlx5/core/en_rx.c
index a4896e89fa355f73fca3f6d87fc10cff216a60e6..218b1a09534c2fbc3d84b8a06e054ad97152d93d 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_rx.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_rx.c
@@ -676,7 +676,7 @@ static int mlx5e_build_shampo_hd_umr(struct mlx5e_rq *rq,
        wqe_bbs = MLX5E_KSM_UMR_WQEBBS(ksm_entries);
        pi = mlx5e_icosq_get_next_pi(sq, wqe_bbs);
        umr_wqe = mlx5_wq_cyc_get_wqe(&sq->wq, pi);
-       build_ksm_umr(sq, umr_wqe, shampo->key, index, ksm_entries);
+       build_ksm_umr(sq, umr_wqe, shampo->mkey_be, index, ksm_entries);
 
        WARN_ON_ONCE(ksm_entries & (MLX5E_SHAMPO_WQ_HEADER_PER_PAGE - 1));
        while (i < ksm_entries) {