Skip to content

Commit c99a745

Browse files
committed
RDMA/mlx5: Remove not-used cache disable flag
During execution of mlx5_mkey_cache_cleanup(), there is a guarantee that MR are not registered and/or destroyed. It means that we don't need newly introduced cache disable flag. Fixes: 374012b ("RDMA/mlx5: Fix mkey cache possible deadlock on cleanup") Link: https://lore.kernel.org/r/c7e9c9f98c8ae4a7413d97d9349b29f5b0a23dbe.1695921626.git.leon@kernel.org Signed-off-by: Leon Romanovsky <leonro@nvidia.com>
1 parent e0fe97e commit c99a745

File tree

2 files changed

+0
-6
lines changed

2 files changed

+0
-6
lines changed

drivers/infiniband/hw/mlx5/mlx5_ib.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -798,7 +798,6 @@ struct mlx5_mkey_cache {
798798
struct dentry *fs_root;
799799
unsigned long last_add;
800800
struct delayed_work remove_ent_dwork;
801-
u8 disable: 1;
802801
};
803802

804803
struct mlx5_ib_port_resources {

drivers/infiniband/hw/mlx5/mr.c

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1026,7 +1026,6 @@ void mlx5_mkey_cache_cleanup(struct mlx5_ib_dev *dev)
10261026
return;
10271027

10281028
mutex_lock(&dev->cache.rb_lock);
1029-
dev->cache.disable = true;
10301029
for (node = rb_first(root); node; node = rb_next(node)) {
10311030
ent = rb_entry(node, struct mlx5_cache_ent, node);
10321031
xa_lock_irq(&ent->mkeys);
@@ -1830,10 +1829,6 @@ static int cache_ent_find_and_store(struct mlx5_ib_dev *dev,
18301829
}
18311830

18321831
mutex_lock(&cache->rb_lock);
1833-
if (cache->disable) {
1834-
mutex_unlock(&cache->rb_lock);
1835-
return 0;
1836-
}
18371832
ent = mkey_cache_ent_from_rb_key(dev, mr->mmkey.rb_key);
18381833
if (ent) {
18391834
if (ent->rb_key.ndescs == mr->mmkey.rb_key.ndescs) {

0 commit comments

Comments
 (0)