Commit fa31f143 authored by Yishai Hadas's avatar Yishai Hadas Committed by Jason Gunthorpe
Browse files

IB/mlx5: DEVX handling for indirection MKEY 



Once an indirection MKEY is created umem valid bit shouldn't be set as
this MKEY doesn't really hold a umem.

Signed-off-by: default avatarYishai Hadas <yishaih@mellanox.com>
Reviewed-by: default avatarArtemy Kovalyov <artemyko@mellanox.com>
Signed-off-by: default avatarLeon Romanovsky <leonro@mellanox.com>
Signed-off-by: default avatarJason Gunthorpe <jgg@mellanox.com>
parent 2b9acb9a

drivers/infiniband/hw/mlx5/devx.c

+36 −2
Original line number Diff line number Diff line
@@ -1011,6 +1011,32 @@ static void devx_obj_build_destroy_cmd(void *in, void *out, void *din, 
	}

}



static int devx_handle_mkey_create(struct mlx5_ib_dev *dev,

				   struct devx_obj *obj,

				   void *in, int in_len)

{

	int min_len = MLX5_BYTE_OFF(create_mkey_in, memory_key_mkey_entry) +

			MLX5_FLD_SZ_BYTES(create_mkey_in,

			memory_key_mkey_entry);

	void *mkc;

	u8 access_mode;



	if (in_len < min_len)

		return -EINVAL;



	mkc = MLX5_ADDR_OF(create_mkey_in, in, memory_key_mkey_entry);



	access_mode = MLX5_GET(mkc, mkc, access_mode_1_0);

	access_mode |= MLX5_GET(mkc, mkc, access_mode_4_2) << 2;



	if (access_mode == MLX5_MKC_ACCESS_MODE_KLMS ||

		access_mode == MLX5_MKC_ACCESS_MODE_KSM)

		return 0;



	MLX5_SET(create_mkey_in, in, mkey_umem_valid, 1);

	return 0;

}



static int devx_obj_cleanup(struct ib_uobject *uobject,

			    enum rdma_remove_reason why)

{
@@ -1032,6 +1058,8 @@ static int UVERBS_HANDLER(MLX5_IB_METHOD_DEVX_OBJ_CREATE)( 
	void *cmd_in = uverbs_attr_get_alloced_ptr(attrs, MLX5_IB_ATTR_DEVX_OBJ_CREATE_CMD_IN);

	int cmd_out_len =  uverbs_attr_get_len(attrs,

					MLX5_IB_ATTR_DEVX_OBJ_CREATE_CMD_OUT);

	int cmd_in_len = uverbs_attr_get_len(attrs,

					MLX5_IB_ATTR_DEVX_OBJ_CREATE_CMD_IN);

	void *cmd_out;

	struct ib_uobject *uobj = uverbs_attr_get_uobject(

		attrs, MLX5_IB_ATTR_DEVX_OBJ_CREATE_HANDLE);
@@ -1060,10 +1088,16 @@ static int UVERBS_HANDLER(MLX5_IB_METHOD_DEVX_OBJ_CREATE)( 
		return -ENOMEM;



	MLX5_SET(general_obj_in_cmd_hdr, cmd_in, uid, uid);

	if (opcode == MLX5_CMD_OP_CREATE_MKEY) {

		err = devx_handle_mkey_create(dev, obj, cmd_in, cmd_in_len);

		if (err)

			goto obj_free;

	} else {

		devx_set_umem_valid(cmd_in);

	}



	err = mlx5_cmd_exec(dev->mdev, cmd_in,

			    uverbs_attr_get_len(attrs, MLX5_IB_ATTR_DEVX_OBJ_CREATE_CMD_IN),

			    cmd_in_len,

			    cmd_out, cmd_out_len);

	if (err)

		goto obj_free;

CRA Git | Maintained and supported by SUSTech CRA and CCSE