RDMA/mlx5: Remove not-used cache disable flag

commit c99a7457e5bb873914a74307ba2df85f6799203b upstream.

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: 374012b00457 ("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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/infiniband/hw/mlx5/mlx5_ib.h b/drivers/infiniband/hw/mlx5/mlx5_ib.h
index edaaea9d9b6fed8a964988118db349f72d634502..9c33d960af3c5cd3887be7546ad496f2666c1394 100644 (file)
--- a/drivers/infiniband/hw/mlx5/mlx5_ib.h
+++ b/drivers/infiniband/hw/mlx5/mlx5_ib.h
@@ -797,7 +797,6 @@ struct mlx5_mkey_cache {
        struct dentry           *fs_root;
        unsigned long           last_add;
        struct delayed_work     remove_ent_dwork;
-       u8                      disable: 1;
 };
 
 struct mlx5_ib_port_resources {

diff --git a/drivers/infiniband/hw/mlx5/mr.c b/drivers/infiniband/hw/mlx5/mr.c
index 2c471022ab0166d78285ded262fd08e65f9eaf90..2f81e69f7b300af6a83947677b231c11719972f7 100644 (file)
--- a/drivers/infiniband/hw/mlx5/mr.c
+++ b/drivers/infiniband/hw/mlx5/mr.c
@@ -1026,7 +1026,6 @@ void mlx5_mkey_cache_cleanup(struct mlx5_ib_dev *dev)
                return;
 
        mutex_lock(&dev->cache.rb_lock);
-       dev->cache.disable = true;
        for (node = rb_first(root); node; node = rb_next(node)) {
                ent = rb_entry(node, struct mlx5_cache_ent, node);
                xa_lock_irq(&ent->mkeys);
@@ -1824,10 +1823,6 @@ static int cache_ent_find_and_store(struct mlx5_ib_dev *dev,
        }
 
        mutex_lock(&cache->rb_lock);
-       if (cache->disable) {
-               mutex_unlock(&cache->rb_lock);
-               return 0;
-       }
        ent = mkey_cache_ent_from_rb_key(dev, mr->mmkey.rb_key);
        if (ent) {
                if (ent->rb_key.ndescs == mr->mmkey.rb_key.ndescs) {