Commit bfe0cc6e authored by Jianxin Xiong's avatar Jianxin Xiong Committed by Jason Gunthorpe
Browse files

RDMA/uverbs: Add uverbs command for dma-buf based MR registration 

Implement a new uverbs ioctl method for memory registration with file
descriptor as an extra parameter.

Link: https://lore.kernel.org/r/1608067636-98073-4-git-send-email-jianxin.xiong@intel.com


Signed-off-by: default avatarJianxin Xiong <jianxin.xiong@intel.com>
Reviewed-by: default avatarSean Hefty <sean.hefty@intel.com>
Acked-by: default avatarMichael J. Ruhl <michael.j.ruhl@intel.com>
Acked-by: default avatarChristian Koenig <christian.koenig@amd.com>
Acked-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Reviewed-by: default avatarLeon Romanovsky <leonro@nvidia.com>
Signed-off-by: default avatarJason Gunthorpe <jgg@nvidia.com>
parent 3bc489e8

drivers/infiniband/core/uverbs_std_types_mr.c

+115 −2
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2018, Mellanox Technologies inc.  All rights reserved.

 * Copyright (c) 2020, Intel Corporation.  All rights reserved.

 *

 * This software is available to you under a choice of one of two

 * licenses.  You may choose to be licensed under the terms of the GNU
@@ -182,6 +183,86 @@ static int UVERBS_HANDLER(UVERBS_METHOD_QUERY_MR)( 
	return IS_UVERBS_COPY_ERR(ret) ? ret : 0;

}



static int UVERBS_HANDLER(UVERBS_METHOD_REG_DMABUF_MR)(

	struct uverbs_attr_bundle *attrs)

{

	struct ib_uobject *uobj =

		uverbs_attr_get_uobject(attrs, UVERBS_ATTR_REG_DMABUF_MR_HANDLE);

	struct ib_pd *pd =

		uverbs_attr_get_obj(attrs, UVERBS_ATTR_REG_DMABUF_MR_PD_HANDLE);

	struct ib_device *ib_dev = pd->device;



	u64 offset, length, iova;

	u32 fd, access_flags;

	struct ib_mr *mr;

	int ret;



	if (!ib_dev->ops.reg_user_mr_dmabuf)

		return -EOPNOTSUPP;



	ret = uverbs_copy_from(&offset, attrs,

			       UVERBS_ATTR_REG_DMABUF_MR_OFFSET);

	if (ret)

		return ret;



	ret = uverbs_copy_from(&length, attrs,

			       UVERBS_ATTR_REG_DMABUF_MR_LENGTH);

	if (ret)

		return ret;



	ret = uverbs_copy_from(&iova, attrs,

			       UVERBS_ATTR_REG_DMABUF_MR_IOVA);

	if (ret)

		return ret;



	if ((offset & ~PAGE_MASK) != (iova & ~PAGE_MASK))

		return -EINVAL;



	ret = uverbs_copy_from(&fd, attrs,

			       UVERBS_ATTR_REG_DMABUF_MR_FD);

	if (ret)

		return ret;



	ret = uverbs_get_flags32(&access_flags, attrs,

				 UVERBS_ATTR_REG_DMABUF_MR_ACCESS_FLAGS,

				 IB_ACCESS_LOCAL_WRITE |

				 IB_ACCESS_REMOTE_READ |

				 IB_ACCESS_REMOTE_WRITE |

				 IB_ACCESS_REMOTE_ATOMIC |

				 IB_ACCESS_RELAXED_ORDERING);

	if (ret)

		return ret;



	ret = ib_check_mr_access(ib_dev, access_flags);

	if (ret)

		return ret;



	mr = pd->device->ops.reg_user_mr_dmabuf(pd, offset, length, iova, fd,

						access_flags,

						&attrs->driver_udata);

	if (IS_ERR(mr))

		return PTR_ERR(mr);



	mr->device = pd->device;

	mr->pd = pd;

	mr->type = IB_MR_TYPE_USER;

	mr->uobject = uobj;

	atomic_inc(&pd->usecnt);



	uobj->object = mr;



	uverbs_finalize_uobj_create(attrs, UVERBS_ATTR_REG_DMABUF_MR_HANDLE);



	ret = uverbs_copy_to(attrs, UVERBS_ATTR_REG_DMABUF_MR_RESP_LKEY,

			     &mr->lkey, sizeof(mr->lkey));

	if (ret)

		return ret;



	ret = uverbs_copy_to(attrs, UVERBS_ATTR_REG_DMABUF_MR_RESP_RKEY,

			     &mr->rkey, sizeof(mr->rkey));

	return ret;

}



DECLARE_UVERBS_NAMED_METHOD(

	UVERBS_METHOD_ADVISE_MR,

	UVERBS_ATTR_IDR(UVERBS_ATTR_ADVISE_MR_PD_HANDLE,
@@ -247,6 +328,37 @@ DECLARE_UVERBS_NAMED_METHOD( 
			    UVERBS_ATTR_TYPE(u32),

			    UA_MANDATORY));



DECLARE_UVERBS_NAMED_METHOD(

	UVERBS_METHOD_REG_DMABUF_MR,

	UVERBS_ATTR_IDR(UVERBS_ATTR_REG_DMABUF_MR_HANDLE,

			UVERBS_OBJECT_MR,

			UVERBS_ACCESS_NEW,

			UA_MANDATORY),

	UVERBS_ATTR_IDR(UVERBS_ATTR_REG_DMABUF_MR_PD_HANDLE,

			UVERBS_OBJECT_PD,

			UVERBS_ACCESS_READ,

			UA_MANDATORY),

	UVERBS_ATTR_PTR_IN(UVERBS_ATTR_REG_DMABUF_MR_OFFSET,

			   UVERBS_ATTR_TYPE(u64),

			   UA_MANDATORY),

	UVERBS_ATTR_PTR_IN(UVERBS_ATTR_REG_DMABUF_MR_LENGTH,

			   UVERBS_ATTR_TYPE(u64),

			   UA_MANDATORY),

	UVERBS_ATTR_PTR_IN(UVERBS_ATTR_REG_DMABUF_MR_IOVA,

			   UVERBS_ATTR_TYPE(u64),

			   UA_MANDATORY),

	UVERBS_ATTR_PTR_IN(UVERBS_ATTR_REG_DMABUF_MR_FD,

			   UVERBS_ATTR_TYPE(u32),

			   UA_MANDATORY),

	UVERBS_ATTR_FLAGS_IN(UVERBS_ATTR_REG_DMABUF_MR_ACCESS_FLAGS,

			     enum ib_access_flags),

	UVERBS_ATTR_PTR_OUT(UVERBS_ATTR_REG_DMABUF_MR_RESP_LKEY,

			    UVERBS_ATTR_TYPE(u32),

			    UA_MANDATORY),

	UVERBS_ATTR_PTR_OUT(UVERBS_ATTR_REG_DMABUF_MR_RESP_RKEY,

			    UVERBS_ATTR_TYPE(u32),

			    UA_MANDATORY));



DECLARE_UVERBS_NAMED_METHOD_DESTROY(

	UVERBS_METHOD_MR_DESTROY,

	UVERBS_ATTR_IDR(UVERBS_ATTR_DESTROY_MR_HANDLE,
@@ -257,10 +369,11 @@ DECLARE_UVERBS_NAMED_METHOD_DESTROY( 
DECLARE_UVERBS_NAMED_OBJECT(

	UVERBS_OBJECT_MR,

	UVERBS_TYPE_ALLOC_IDR(uverbs_free_mr),

	&UVERBS_METHOD(UVERBS_METHOD_ADVISE_MR),

	&UVERBS_METHOD(UVERBS_METHOD_DM_MR_REG),

	&UVERBS_METHOD(UVERBS_METHOD_MR_DESTROY),

	&UVERBS_METHOD(UVERBS_METHOD_ADVISE_MR),

	&UVERBS_METHOD(UVERBS_METHOD_QUERY_MR));

	&UVERBS_METHOD(UVERBS_METHOD_QUERY_MR),

	&UVERBS_METHOD(UVERBS_METHOD_REG_DMABUF_MR));



const struct uapi_definition uverbs_def_obj_mr[] = {

	UAPI_DEF_CHAIN_OBJ_TREE_NAMED(UVERBS_OBJECT_MR,

include/uapi/rdma/ib_user_ioctl_cmds.h

+14 −0
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2018, Mellanox Technologies inc.  All rights reserved.

 * Copyright (c) 2020, Intel Corporation. All rights reserved.

 *

 * This software is available to you under a choice of one of two

 * licenses.  You may choose to be licensed under the terms of the GNU
@@ -251,6 +252,7 @@ enum uverbs_methods_mr { 
	UVERBS_METHOD_MR_DESTROY,

	UVERBS_METHOD_ADVISE_MR,

	UVERBS_METHOD_QUERY_MR,

	UVERBS_METHOD_REG_DMABUF_MR,

};



enum uverbs_attrs_mr_destroy_ids {
@@ -272,6 +274,18 @@ enum uverbs_attrs_query_mr_cmd_attr_ids { 
	UVERBS_ATTR_QUERY_MR_RESP_IOVA,

};



enum uverbs_attrs_reg_dmabuf_mr_cmd_attr_ids {

	UVERBS_ATTR_REG_DMABUF_MR_HANDLE,

	UVERBS_ATTR_REG_DMABUF_MR_PD_HANDLE,

	UVERBS_ATTR_REG_DMABUF_MR_OFFSET,

	UVERBS_ATTR_REG_DMABUF_MR_LENGTH,

	UVERBS_ATTR_REG_DMABUF_MR_IOVA,

	UVERBS_ATTR_REG_DMABUF_MR_FD,

	UVERBS_ATTR_REG_DMABUF_MR_ACCESS_FLAGS,

	UVERBS_ATTR_REG_DMABUF_MR_RESP_LKEY,

	UVERBS_ATTR_REG_DMABUF_MR_RESP_RKEY,

};



enum uverbs_attrs_create_counters_cmd_attr_ids {

	UVERBS_ATTR_CREATE_COUNTERS_HANDLE,

};