RDMA/mlx5: Don't keep umrable 'page_shift' in cache entries

mkc.log_page_size can be changed using UMR. Therefore, don't treat it as a
cache entry property.

Removing it from struct mlx5_cache_ent.

All cache mkeys will be created with default PAGE_SHIFT, and updated with
the needed page_shift using UMR when passing them to a user.

Link: https://lore.kernel.org/r/20230125222807.6921-2-michaelgur@nvidia.com
Signed-off-by: Aharon Landau <aharonl@nvidia.com>
Signed-off-by: Jason Gunthorpe <jgg@nvidia.com>

diff --git a/drivers/infiniband/hw/mlx5/mlx5_ib.h b/drivers/infiniband/hw/mlx5/mlx5_ib.h
index 8b91babdd4c084f5328cddd6c2d26ff081c0b9a5..8d985f792367ed98d5e9b04771690259c0d43fd8 100644 (file)
--- a/drivers/infiniband/hw/mlx5/mlx5_ib.h
+++ b/drivers/infiniband/hw/mlx5/mlx5_ib.h
@@ -739,7 +739,6 @@ struct mlx5_cache_ent {
        char                    name[4];
        u32                     order;
        u32                     access_mode;
-       u32                     page;
        unsigned int            ndescs;
 
        u8 disabled:1;

diff --git a/drivers/infiniband/hw/mlx5/mr.c b/drivers/infiniband/hw/mlx5/mr.c
index 053fe946e45aef44d62a8fe137a04beb258493cf..356c99d7ec9a44f3f6e42d5f41a41d24c1a663b6 100644 (file)
--- a/drivers/infiniband/hw/mlx5/mr.c
+++ b/drivers/infiniband/hw/mlx5/mr.c
@@ -297,7 +297,7 @@ static void set_cache_mkc(struct mlx5_cache_ent *ent, void *mkc)
 
        MLX5_SET(mkc, mkc, translations_octword_size,
                 get_mkc_octo_size(ent->access_mode, ent->ndescs));
-       MLX5_SET(mkc, mkc, log_page_size, ent->page);
+       MLX5_SET(mkc, mkc, log_page_size, PAGE_SHIFT);
 }
 
 /* Asynchronously schedule new MRs to be populated in the cache. */
@@ -765,7 +765,6 @@ int mlx5_mkey_cache_init(struct mlx5_ib_dev *dev)
                if (ent->order > mkey_cache_max_order(dev))
                        continue;
 
-               ent->page = PAGE_SHIFT;
                ent->ndescs = 1 << ent->order;
                ent->access_mode = MLX5_MKC_ACCESS_MODE_MTT;
                if ((dev->mdev->profile.mask & MLX5_PROF_MASK_MR_CACHE) &&

diff --git a/drivers/infiniband/hw/mlx5/odp.c b/drivers/infiniband/hw/mlx5/odp.c
index e6e021af6aa923a6d749f07caf5d81b983abcb1f..8a78580a2a721fda32b2f863d882cd84701bdfe9 100644 (file)
--- a/drivers/infiniband/hw/mlx5/odp.c
+++ b/drivers/infiniband/hw/mlx5/odp.c
@@ -1594,14 +1594,12 @@ void mlx5_odp_init_mkey_cache_entry(struct mlx5_cache_ent *ent)
 
        switch (ent->order - 2) {
        case MLX5_IMR_MTT_CACHE_ENTRY:
-               ent->page = PAGE_SHIFT;
                ent->ndescs = MLX5_IMR_MTT_ENTRIES;
                ent->access_mode = MLX5_MKC_ACCESS_MODE_MTT;
                ent->limit = 0;
                break;
 
        case MLX5_IMR_KSM_CACHE_ENTRY:
-               ent->page = MLX5_KSM_PAGE_SHIFT;
                ent->ndescs = mlx5_imr_ksm_entries;
                ent->access_mode = MLX5_MKC_ACCESS_MODE_KSM;
                ent->limit = 0;