Rewrite mlx3 mkeys logic
Subsystems (2)
v2 cover Rewrite mlx3 mkeys logic
From: Leon Romanovsky <[email protected]>
This is rewrote version of [1].
[1] https://lore.kernel.org/all/[email protected]
Thanks
Or Har-Toov (3):
RDMA/mlx5: Uncacheable mkey has neither rb_key or cache_ent RDMA/mlx5: Change check for cacheable mkeys RDMA/mlx5: Adding remote atomic access flag to updatable flags
drivers/infiniband/hw/mlx5/mlx5_ib.h | 3 ++- drivers/infiniband/hw/mlx5/mr.c | 35 +++++++++++++++++++--------- 2 files changed, 26 insertions(+), 12 deletions(-)
Signature · 1 line
2.44.0
PATCH v2 1/3 RDMA/mlx5: Uncacheable mkey has neither rb_key or cache_ent
From: Or Har-Toov <[email protected]>
As some mkeys can't be modified with UMR due to some UMR limitations, like the size of translation that can be updated, not all user mkeys can be cached.
--- drivers/infiniband/hw/mlx5/mlx5_ib.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/infiniband/hw/mlx5/mlx5_ib.h +1 -1
@@ -643,7 +643,7 @@ struct mlx5_ib_mkey {unsigned int ndescs;struct wait_queue_head wait;refcount_t usecount; -/* User Mkey must hold either a rb_key or a cache_ent. */ +/* Cacheable user Mkey must hold either a rb_key or a cache_ent. */ struct mlx5r_cache_rb_key rb_key;struct mlx5_cache_ent *cache_ent; };
Signature · 1 line
2.44.0
PATCH v2 2/3 RDMA/mlx5: Change check for cacheable mkeys
In reply to Leon RomanovskyFrom: Or Har-Toov <[email protected]>
umem can be NULL for user application mkeys in some cases. Therefore umem can't be used for checking if the mkey is cacheable and it is changed for checking a flag that indicates it. Also make sure that all mkeys which are not returned to the cache will be destroyed.
--- drivers/infiniband/hw/mlx5/mlx5_ib.h | 1 + drivers/infiniband/hw/mlx5/mr.c | 32 +++++++++++++++++++--------- 2 files changed, 23 insertions(+), 10 deletions(-)
drivers/infiniband/hw/mlx5/mlx5_ib.h +1 -0
@@ -646,6 +646,7 @@ struct mlx5_ib_mkey {/* Cacheable user Mkey must hold either a rb_key or a cache_ent. */ struct mlx5r_cache_rb_key rb_key;struct mlx5_cache_ent *cache_ent; + u8 cacheable : 1; };#define MLX5_IB_MTT_PRESENT (MLX5_IB_MTT_READ | MLX5_IB_MTT_WRITE)
drivers/infiniband/hw/mlx5/mr.c +22 -10
@@ -1158,6 +1158,7 @@ static struct mlx5_ib_mr *alloc_cacheable_mr(struct ib_pd *pd,if (IS_ERR (mr))return mr; mr->mmkey.rb_key = rb_key; + mr->mmkey.cacheable = true;return mr; }
@@ -1168,6 +1169,7 @@ static struct mlx5_ib_mr *alloc_cacheable_mr(struct ib_pd *pd, mr->ibmr.pd = pd; mr->umem = umem; mr->page_shift =order_base_2 (page_size); + mr->mmkey.cacheable = true;set_mr_fields (dev, mr, umem->length, access_flags, iova);return mr;
@@ -1835,6 +1837,23 @@ static int cache_ent_find_and_store(struct mlx5_ib_dev *dev,return ret; } +static int mlx5_revoke_mr (struct mlx5_ib_mr *mr) +{ +struct mlx5_ib_dev *dev =to_mdev (mr->ibmr.device); +struct mlx5_cache_ent *ent = mr->mmkey.cache_ent; + +if (mr->mmkey.cacheable && !mlx5r_umr_revoke_mr (mr) && !cache_ent_find_and_store (dev, mr)) +return 0 ; + +if (ent) { +spin_lock_irq (&ent->mkeys_queue.lock); + ent->in_use--; + mr->mmkey.cache_ent =NULL ; +spin_unlock_irq (&ent->mkeys_queue.lock); + } +return destroy_mkey (dev, mr); +} +int mlx5_ib_dereg_mr (struct ib_mr *ibmr,struct ib_udata *udata) {struct mlx5_ib_mr *mr =to_mmr (ibmr);
@@ -1880,16 +1899,9 @@ int mlx5_ib_dereg_mr(struct ib_mr *ibmr, struct ib_udata *udata) }/* Stop DMA */ -if (mr->umem &&mlx5r_umr_can_load_pas (dev, mr->umem->length)) -if (mlx5r_umr_revoke_mr (mr) || -cache_ent_find_and_store (dev, mr)) - mr->mmkey.cache_ent =NULL ; - -if (!mr->mmkey.cache_ent) { - rc =destroy_mkey (to_mdev (mr->ibmr.device), mr); -if (rc) -return rc; - } + rc =mlx5_revoke_mr (mr); +if (rc) +return rc;if (mr->umem) {bool is_odp =is_odp_mr (mr);
Signature · 1 line
2.44.0
PATCH v2 3/3 RDMA/mlx5: Adding remote atomic access flag to updatable flags
In reply to Leon RomanovskyFrom: Or Har-Toov <[email protected]>
Currently IB_ACCESS_REMOTE_ATOMIC is blocked from being updated via UMR although in some cases it should be possible. These cases are checked in mlx5r_umr_can_reconfig function.
--- drivers/infiniband/hw/mlx5/mr.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/infiniband/hw/mlx5/mr.c +2 -1
@@ -1572,7 +1572,8 @@ static bool can_use_umr_rereg_access(struct mlx5_ib_dev *dev,unsigned int diffs = current_access_flags ^ target_access_flags;if (diffs & ~(IB_ACCESS_LOCAL_WRITE |IB_ACCESS_REMOTE_WRITE | -IB_ACCESS_REMOTE_READ |IB_ACCESS_RELAXED_ORDERING )) +IB_ACCESS_REMOTE_READ |IB_ACCESS_RELAXED_ORDERING | +IB_ACCESS_REMOTE_ATOMIC ))return false;return mlx5r_umr_can_reconfig (dev, current_access_flags, target_access_flags);
Signature · 1 line
2.44.0
Leon Romanovsky
maintainerThere is a type in subject, it should be mlx5.
Thanks
Leon Romanovsky
AppliedQuoted 9 lines · Leon Romanovsky
From: Leon Romanovsky <[email protected]>
This is rewrote version of [1].
[1] https://lore.kernel.org/all/[email protected]
Thanks
[...]
Applied, thanks!
[1/3] RDMA/mlx5: Uncacheable mkey has neither rb_key or cache_ent
https://git.kernel.org/rdma/rdma/c/0611a8e8b475fc [2/3] RDMA/mlx5: Change check for cacheable mkeys https://git.kernel.org/rdma/rdma/c/8c1185fef68cc6 [3/3] RDMA/mlx5: Adding remote atomic access flag to updatable flags https://git.kernel.org/rdma/rdma/c/2ca7e93bc963d9
Best regards,
Signature · 1 line
Leon Romanovsky <[email protected]>