Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4785860e authored by Jason Gunthorpe's avatar Jason Gunthorpe Committed by Doug Ledford
Browse files

RDMA/uverbs: Implement an ioctl that can call write and write_ex handlers 



Now that the handlers do not process their own udata we can make a
sensible ioctl that wrappers them. The ioctl follows the same format as
the write_ex() and has the user explicitly specify the core and driver
in/out opaque structures and a command number.

This works for all forms of write commands.

Signed-off-by: default avatarJason Gunthorpe <jgg@mellanox.com>
Signed-off-by: default avatarLeon Romanovsky <leonro@mellanox.com>
Signed-off-by: default avatarDoug Ledford <dledford@redhat.com>
parent 24141496

drivers/infiniband/core/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -38,4 +38,4 @@ ib_uverbs-y := uverbs_main.o uverbs_cmd.o uverbs_marshall.o \ 
				uverbs_std_types_cq.o \

				uverbs_std_types_flow_action.o uverbs_std_types_dm.o \

				uverbs_std_types_mr.o uverbs_std_types_counters.o \

				uverbs_uapi.o
 
				uverbs_uapi.o uverbs_std_types_device.o

drivers/infiniband/core/rdma_core.h

+5 −0
Original line number Diff line number Diff line
@@ -188,6 +188,7 @@ void uverbs_user_mmap_disassociate(struct ib_uverbs_file *ufile); 


extern const struct uapi_definition uverbs_def_obj_counters[];

extern const struct uapi_definition uverbs_def_obj_cq[];

extern const struct uapi_definition uverbs_def_obj_device[];

extern const struct uapi_definition uverbs_def_obj_dm[];

extern const struct uapi_definition uverbs_def_obj_flow_action[];

extern const struct uapi_definition uverbs_def_obj_intf[];
@@ -214,4 +215,8 @@ uapi_get_method(const struct uverbs_api *uapi, u32 command) 
	return uapi->write_methods[cmd_idx];

}



void uverbs_fill_udata(struct uverbs_attr_bundle *bundle,

		       struct ib_udata *udata, unsigned int attr_in,

		       unsigned int attr_out);



#endif /* RDMA_CORE_H */

drivers/infiniband/core/uverbs.h

+0 −1
Original line number Diff line number Diff line
@@ -246,7 +246,6 @@ int uverbs_dealloc_mw(struct ib_mw *mw); 
void ib_uverbs_detach_umcast(struct ib_qp *qp,

			     struct ib_uqp_object *uobj);



void create_udata(struct uverbs_attr_bundle *ctx, struct ib_udata *udata);

long ib_uverbs_ioctl(struct file *filp, unsigned int cmd, unsigned long arg);



struct ib_uverbs_flow_spec {

drivers/infiniband/core/uverbs_ioctl.c

+22 −18
Original line number Diff line number Diff line
@@ -436,7 +436,9 @@ static int ib_uverbs_run_method(struct bundle_priv *pbundle, 
		return -EINVAL;



	if (pbundle->method_elm->has_udata)

		create_udata(&pbundle->bundle, &pbundle->bundle.driver_udata);

		uverbs_fill_udata(&pbundle->bundle,

				  &pbundle->bundle.driver_udata,

				  UVERBS_ATTR_UHW_IN, UVERBS_ATTR_UHW_OUT);



	if (destroy_bkey != UVERBS_API_ATTR_BKEY_LEN) {

		struct uverbs_obj_attr *destroy_attr =
@@ -664,35 +666,37 @@ int uverbs_get_flags32(u32 *to, const struct uverbs_attr_bundle *attrs_bundle, 
EXPORT_SYMBOL(uverbs_get_flags32);



/*

 * This is for ease of conversion. The purpose is to convert all drivers to

 * use uverbs_attr_bundle instead of ib_udata.  Assume attr == 0 is input and

 * attr == 1 is output.

 * Fill a ib_udata struct (core or uhw) using the given attribute IDs.

 * This is primarily used to convert the UVERBS_ATTR_UHW() into the

 * ib_udata format used by the drivers.

 */

void create_udata(struct uverbs_attr_bundle *bundle, struct ib_udata *udata)

void uverbs_fill_udata(struct uverbs_attr_bundle *bundle,

		       struct ib_udata *udata, unsigned int attr_in,

		       unsigned int attr_out)

{

	struct bundle_priv *pbundle =

		container_of(bundle, struct bundle_priv, bundle);

	const struct uverbs_attr *uhw_in =

		uverbs_attr_get(bundle, UVERBS_ATTR_UHW_IN);

	const struct uverbs_attr *uhw_out =

		uverbs_attr_get(bundle, UVERBS_ATTR_UHW_OUT);



	if (!IS_ERR(uhw_in)) {

		udata->inlen = uhw_in->ptr_attr.len;

		if (uverbs_attr_ptr_is_inline(uhw_in))

	const struct uverbs_attr *in =

		uverbs_attr_get(&pbundle->bundle, attr_in);

	const struct uverbs_attr *out =

		uverbs_attr_get(&pbundle->bundle, attr_out);



	if (!IS_ERR(in)) {

		udata->inlen = in->ptr_attr.len;

		if (uverbs_attr_ptr_is_inline(in))

			udata->inbuf =

				&pbundle->user_attrs[uhw_in->ptr_attr.uattr_idx]

				&pbundle->user_attrs[in->ptr_attr.uattr_idx]

					 .data;

		else

			udata->inbuf = u64_to_user_ptr(uhw_in->ptr_attr.data);

			udata->inbuf = u64_to_user_ptr(in->ptr_attr.data);

	} else {

		udata->inbuf = NULL;

		udata->inlen = 0;

	}



	if (!IS_ERR(uhw_out)) {

		udata->outbuf = u64_to_user_ptr(uhw_out->ptr_attr.data);

		udata->outlen = uhw_out->ptr_attr.len;

	if (!IS_ERR(out)) {

		udata->outbuf = u64_to_user_ptr(out->ptr_attr.data);

		udata->outlen = out->ptr_attr.len;

	} else {

		udata->outbuf = NULL;

		udata->outlen = 0;

drivers/infiniband/core/uverbs_std_types.c

+0 −3
Original line number Diff line number Diff line
@@ -259,10 +259,7 @@ DECLARE_UVERBS_NAMED_OBJECT( 
DECLARE_UVERBS_NAMED_OBJECT(UVERBS_OBJECT_PD,

			    UVERBS_TYPE_ALLOC_IDR(uverbs_free_pd));



DECLARE_UVERBS_GLOBAL_METHODS(UVERBS_OBJECT_DEVICE);



const struct uapi_definition uverbs_def_obj_intf[] = {

	UAPI_DEF_CHAIN_OBJ_TREE_NAMED(UVERBS_OBJECT_DEVICE),

	UAPI_DEF_CHAIN_OBJ_TREE_NAMED(UVERBS_OBJECT_PD,

				      UAPI_DEF_OBJ_NEEDS_FN(dealloc_pd)),

	UAPI_DEF_CHAIN_OBJ_TREE_NAMED(UVERBS_OBJECT_COMP_CHANNEL,