Commit d623dfd2 authored Mar 19, 2019 by Artemy Kovalyov Committed by Jason Gunthorpe Mar 27, 2019

IB/mlx5: Compare only index part of a memory window rkey



The InfiniBand Architecture Specification section 10.6.7.2.4 TYPE 2 MEMORY
WINDOWS says that if the CI supports the Base Memory Management Extensions
defined in this specification, the R_Key format for a Type 2 Memory Window
must consist of:

* 24 bit index in the most significant bits of the R_Key, which is owned
  by the CI, and
* 8 bit key in the least significant bits of the R_Key, which is owned by
  the Consumer.

This means that the kernel should compare only the index part of a R_Key
to determine equality with another R_Key.

Fixes: db570d7d ("IB/mlx5: Add ODP support to MW")
Signed-off-by: Artemy Kovalyov <artemyko@mellanox.com>
Signed-off-by: Moni Shoua <monis@mellanox.com>
Signed-off-by: Leon Romanovsky <leonro@mellanox.com>
Signed-off-by: Jason Gunthorpe <jgg@mellanox.com>

parent 1e5887b7

drivers/infiniband/hw/mlx5/odp.c

+10 −1

Original line number	Diff line number	Diff line
		@@ -710,6 +710,15 @@ struct pf_frame {
		int depth;
		};

		static bool mkey_is_eq(struct mlx5_core_mkey *mmkey, u32 key)
		{
		if (!mmkey)
		return false;
		if (mmkey->type == MLX5_MKEY_MW)
		return mlx5_base_mkey(mmkey->key) == mlx5_base_mkey(key);
		return mmkey->key == key;
		}

		static int get_indirect_num_descs(struct mlx5_core_mkey *mmkey)
		{
		struct mlx5_ib_mw *mw;
		@@ -759,7 +768,7 @@ static int pagefault_single_data_segment(struct mlx5_ib_dev *dev,

		next_mr:
		mmkey = __mlx5_mr_lookup(dev->mdev, mlx5_base_mkey(key));
		if (!mmkey \|\| mmkey->key != key) {
		if (!mkey_is_eq(mmkey, key)) {
		mlx5_ib_dbg(dev, "failed to find mkey %x\n", key);
		ret = -EFAULT;
		goto srcu_unlock;

Admin message