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

Commit 6c61d2a5 authored by Jason Gunthorpe's avatar Jason Gunthorpe
Browse files

RDMA/uverbs: Simplify UVERBS_OBJECT and _TREE family of macros 



Instead of the large set of indirecting macros, define the few needed
macros to directly instantiate the struct uverbs_oject_tree_def and
associated objects list.

This is small amount of code duplication but the readability is far
better.

Signed-off-by: default avatarJason Gunthorpe <jgg@mellanox.com>
Signed-off-by: default avatarLeon Romanovsky <leonro@mellanox.com>
parent 595c7736

drivers/infiniband/core/uverbs.h

+0 −2
Original line number Diff line number Diff line
@@ -238,8 +238,6 @@ 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);

extern const struct uverbs_attr_def uverbs_uhw_compat_in;

extern const struct uverbs_attr_def uverbs_uhw_compat_out;

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

int uverbs_destroy_def_handler(struct ib_device *ib_dev,

			       struct ib_uverbs_file *file,

drivers/infiniband/core/uverbs_std_types.c

+17 −29
Original line number Diff line number Diff line
@@ -216,18 +216,6 @@ int uverbs_destroy_def_handler(struct ib_device *ib_dev, 
	return 0;

}



/*

 * This spec is used in order to pass information to the hardware driver in a

 * legacy way. Every verb that could get driver specific data should get this

 * spec.

 */

const struct uverbs_attr_def uverbs_uhw_compat_in =

	UVERBS_ATTR_PTR_IN(UVERBS_ATTR_UHW_IN, UVERBS_ATTR_MIN_SIZE(0),

			   UA_FLAGS(UVERBS_ATTR_SPEC_F_MIN_SZ_OR_ZERO));

const struct uverbs_attr_def uverbs_uhw_compat_out =

	UVERBS_ATTR_PTR_OUT(UVERBS_ATTR_UHW_OUT, UVERBS_ATTR_MIN_SIZE(0),

			    UA_FLAGS(UVERBS_ATTR_SPEC_F_MIN_SZ_OR_ZERO));



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

{

	/*
@@ -300,7 +288,7 @@ DECLARE_UVERBS_NAMED_OBJECT(UVERBS_OBJECT_PD, 


DECLARE_UVERBS_NAMED_OBJECT(UVERBS_OBJECT_DEVICE, NULL);



static DECLARE_UVERBS_OBJECT_TREE(uverbs_default_objects,

DECLARE_UVERBS_OBJECT_TREE(uverbs_default_objects,

			   &UVERBS_OBJECT(UVERBS_OBJECT_DEVICE),

			   &UVERBS_OBJECT(UVERBS_OBJECT_PD),

			   &UVERBS_OBJECT(UVERBS_OBJECT_MR),

drivers/infiniband/core/uverbs_std_types_cq.c

+1 −1
Original line number Diff line number Diff line
@@ -165,7 +165,7 @@ DECLARE_UVERBS_NAMED_METHOD(UVERBS_METHOD_CQ_CREATE, 
	&UVERBS_ATTR_PTR_IN(UVERBS_ATTR_CREATE_CQ_FLAGS, UVERBS_ATTR_TYPE(u32)),

	&UVERBS_ATTR_PTR_OUT(UVERBS_ATTR_CREATE_CQ_RESP_CQE, UVERBS_ATTR_TYPE(u32),

			     UA_FLAGS(UVERBS_ATTR_SPEC_F_MANDATORY)),

	&uverbs_uhw_compat_in, &uverbs_uhw_compat_out);

	UVERBS_ATTR_UHW());



static int UVERBS_HANDLER(UVERBS_METHOD_CQ_DESTROY)(struct ib_device *ib_dev,

						    struct ib_uverbs_file *file,

drivers/infiniband/hw/mlx5/devx.c

+4 −4
Original line number Diff line number Diff line
@@ -1079,24 +1079,24 @@ DECLARE_UVERBS_NAMED_METHOD(MLX5_IB_METHOD_DEVX_OBJ_QUERY, 
			     UA_FLAGS(UVERBS_ATTR_SPEC_F_MANDATORY |

				      UVERBS_ATTR_SPEC_F_MIN_SZ_OR_ZERO)));



static DECLARE_UVERBS_GLOBAL_METHODS(MLX5_IB_OBJECT_DEVX,

DECLARE_UVERBS_GLOBAL_METHODS(MLX5_IB_OBJECT_DEVX,

	&UVERBS_METHOD(MLX5_IB_METHOD_DEVX_OTHER),

	&UVERBS_METHOD(MLX5_IB_METHOD_DEVX_QUERY_UAR),

	&UVERBS_METHOD(MLX5_IB_METHOD_DEVX_QUERY_EQN));



static DECLARE_UVERBS_NAMED_OBJECT(MLX5_IB_OBJECT_DEVX_OBJ,

DECLARE_UVERBS_NAMED_OBJECT(MLX5_IB_OBJECT_DEVX_OBJ,

	&UVERBS_TYPE_ALLOC_IDR(devx_obj_cleanup),

		&UVERBS_METHOD(MLX5_IB_METHOD_DEVX_OBJ_CREATE),

		&UVERBS_METHOD(MLX5_IB_METHOD_DEVX_OBJ_DESTROY),

		&UVERBS_METHOD(MLX5_IB_METHOD_DEVX_OBJ_MODIFY),

		&UVERBS_METHOD(MLX5_IB_METHOD_DEVX_OBJ_QUERY));



static DECLARE_UVERBS_NAMED_OBJECT(MLX5_IB_OBJECT_DEVX_UMEM,

DECLARE_UVERBS_NAMED_OBJECT(MLX5_IB_OBJECT_DEVX_UMEM,

	&UVERBS_TYPE_ALLOC_IDR(devx_umem_cleanup),

	&UVERBS_METHOD(MLX5_IB_METHOD_DEVX_UMEM_REG),

	&UVERBS_METHOD(MLX5_IB_METHOD_DEVX_UMEM_DEREG));



static DECLARE_UVERBS_OBJECT_TREE(devx_objects,

DECLARE_UVERBS_OBJECT_TREE(devx_objects,

	&UVERBS_OBJECT(MLX5_IB_OBJECT_DEVX),

	&UVERBS_OBJECT(MLX5_IB_OBJECT_DEVX_OBJ),

	&UVERBS_OBJECT(MLX5_IB_OBJECT_DEVX_UMEM));

include/rdma/uverbs_ioctl.h

+22 −22
Original line number Diff line number Diff line
@@ -253,33 +253,33 @@ struct uverbs_object_tree_def { 
			  __VA_ARGS__ },                                       \

	})



/*

 * This spec is used in order to pass information to the hardware driver in a

 * legacy way. Every verb that could get driver specific data should get this

 * spec.

 */

#define UVERBS_ATTR_UHW()                                                      \

	&UVERBS_ATTR_PTR_IN(UVERBS_ATTR_UHW_IN,                                \

			    UVERBS_ATTR_SIZE(0, USHRT_MAX),		       \

			    UA_FLAGS(UVERBS_ATTR_SPEC_F_MIN_SZ_OR_ZERO)),      \

	&UVERBS_ATTR_PTR_OUT(UVERBS_ATTR_UHW_OUT,                              \

			     UVERBS_ATTR_SIZE(0, USHRT_MAX),		       \

			     UA_FLAGS(UVERBS_ATTR_SPEC_F_MIN_SZ_OR_ZERO))



/*

 * =======================================

 *	Declaration helpers

 * =======================================

 */

#define _UVERBS_OBJECT_METHODS_SZ(...)					\

	(sizeof((const struct uverbs_method_def * const []){__VA_ARGS__}) / \

	 sizeof(const struct uverbs_method_def *))

#define _UVERBS_OBJECT(_id, _type_attrs, ...)				\

	((const struct uverbs_object_def) {				\

	 .id = _id,							\

	 .type_attrs = _type_attrs,					\

	 .num_methods = _UVERBS_OBJECT_METHODS_SZ(__VA_ARGS__),		\

	 .methods = &(const struct uverbs_method_def * const []){__VA_ARGS__} })

#define DECLARE_UVERBS_OBJECT(_name, _id, _type_attrs, ...)		\

	const struct uverbs_object_def _name =				\

		_UVERBS_OBJECT(_id, _type_attrs, ##__VA_ARGS__)

#define _UVERBS_TREE_OBJECTS_SZ(...)					\

	(sizeof((const struct uverbs_object_def * const []){__VA_ARGS__}) / \

	 sizeof(const struct uverbs_object_def *))

#define _UVERBS_OBJECT_TREE(...)					\

	((const struct uverbs_object_tree_def) {			\

	 .num_objects = _UVERBS_TREE_OBJECTS_SZ(__VA_ARGS__),		\

	 .objects = &(const struct uverbs_object_def * const []){__VA_ARGS__} })



#define DECLARE_UVERBS_OBJECT_TREE(_name, ...)                                 \

	const struct uverbs_object_tree_def _name =			\

		_UVERBS_OBJECT_TREE(__VA_ARGS__)

	static const struct uverbs_object_def *const _name##_ptr[] = {         \

		__VA_ARGS__,                                                   \

	};                                                                     \

	static const struct uverbs_object_tree_def _name = {                   \

		.num_objects = ARRAY_SIZE(_name##_ptr),                        \

		.objects = &_name##_ptr,                                       \

	}



/* =================================================

 *              Parsing infrastructure