{IB,net}/mlx5: Setup mkey variant before mr create command invocation

On reg_mr_callback() mlx5_ib is recalculating the mkey variant which is
wrong and will lead to using a different key variant than the one
submitted to firmware on create mkey command invocation.

To fix this, we store the mkey variant before invoking the firmware
command and use it later on completion (reg_mr_callback).

Signed-off-by: Saeed Mahameed <saeedm@mellanox.com>
Reviewed-by: Eli Cohen <eli@mellanox.com>
Signed-off-by: Leon Romanovsky <leonro@mellanox.com>

diff --git a/drivers/infiniband/hw/mlx5/mr.c b/drivers/infiniband/hw/mlx5/mr.c
index 6fa0a83c19de239ae74851653f79c5a31dd277d8..45c3282dd5e1db0b34fe2fc9e4f2e1a349d74154 100644 (file)
--- a/drivers/infiniband/hw/mlx5/mr.c
+++ b/drivers/infiniband/hw/mlx5/mr.c
@@ -87,7 +87,6 @@ static void reg_mr_callback(int status, struct mlx5_async_work *context)
        struct mlx5_mr_cache *cache = &dev->cache;
        int c = order2idx(dev, mr->order);
        struct mlx5_cache_ent *ent = &cache->ent[c];
-       u8 key;
        unsigned long flags;
 
        spin_lock_irqsave(&ent->lock, flags);
@@ -102,10 +101,8 @@ static void reg_mr_callback(int status, struct mlx5_async_work *context)
        }
 
        mr->mmkey.type = MLX5_MKEY_MR;
-       spin_lock_irqsave(&dev->mdev->priv.mkey_lock, flags);
-       key = dev->mdev->priv.mkey_key++;
-       spin_unlock_irqrestore(&dev->mdev->priv.mkey_lock, flags);
-       mr->mmkey.key = mlx5_idx_to_mkey(MLX5_GET(create_mkey_out, mr->out, mkey_index)) | key;
+       mr->mmkey.key |= mlx5_idx_to_mkey(
+               MLX5_GET(create_mkey_out, mr->out, mkey_index));
 
        cache->last_add = jiffies;
 

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/mr.c b/drivers/net/ethernet/mellanox/mlx5/core/mr.c
index 42cc3c7ac5b6802fb6b4ccf15f4717e14d4d74f5..770d13bb4f20ddb0945a9439d3ad34840c713550 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/mr.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/mr.c
@@ -56,6 +56,7 @@ int mlx5_core_create_mkey_cb(struct mlx5_core_dev *dev,
 
        MLX5_SET(create_mkey_in, in, opcode, MLX5_CMD_OP_CREATE_MKEY);
        MLX5_SET(mkc, mkc, mkey_7_0, key);
+       mkey->key = key;
 
        if (callback)
                return mlx5_cmd_exec_cb(async_ctx, in, inlen, out, outlen,
@@ -68,7 +69,7 @@ int mlx5_core_create_mkey_cb(struct mlx5_core_dev *dev,
        mkey_index = MLX5_GET(create_mkey_out, lout, mkey_index);
        mkey->iova = MLX5_GET64(mkc, mkc, start_addr);
        mkey->size = MLX5_GET64(mkc, mkc, len);
-       mkey->key = mlx5_idx_to_mkey(mkey_index) | key;
+       mkey->key |= mlx5_idx_to_mkey(mkey_index);
        mkey->pd = MLX5_GET(mkc, mkc, pd);
 
        mlx5_core_dbg(dev, "out 0x%x, key 0x%x, mkey 0x%x\n",