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

Commit 595c7736 authored by Jason Gunthorpe's avatar Jason Gunthorpe
Browse files

RDMA/uverbs: Simplify method definition macros 



Instead of the large set of indirecting macros, define the few needed
macros to directly instantiate the struct uverbs_method_def and associated
attributes 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 d108dac0

drivers/infiniband/core/uverbs_std_types_counters.c

+3 −4
Original line number Diff line number Diff line
@@ -124,21 +124,20 @@ static int UVERBS_HANDLER(UVERBS_METHOD_COUNTERS_READ)(struct ib_device *ib_dev, 
	return ret;

}



static DECLARE_UVERBS_NAMED_METHOD(UVERBS_METHOD_COUNTERS_CREATE,

DECLARE_UVERBS_NAMED_METHOD(UVERBS_METHOD_COUNTERS_CREATE,

	&UVERBS_ATTR_IDR(UVERBS_ATTR_CREATE_COUNTERS_HANDLE,

			 UVERBS_OBJECT_COUNTERS,

			 UVERBS_ACCESS_NEW,

			 UA_FLAGS(UVERBS_ATTR_SPEC_F_MANDATORY)));



static DECLARE_UVERBS_NAMED_METHOD_WITH_HANDLER(UVERBS_METHOD_COUNTERS_DESTROY,

	uverbs_destroy_def_handler,

DECLARE_UVERBS_NAMED_METHOD_DESTROY(UVERBS_METHOD_COUNTERS_DESTROY,

	&UVERBS_ATTR_IDR(UVERBS_ATTR_DESTROY_COUNTERS_HANDLE,

			 UVERBS_OBJECT_COUNTERS,

			 UVERBS_ACCESS_DESTROY,

			 UA_FLAGS(UVERBS_ATTR_SPEC_F_MANDATORY)));



#define MAX_COUNTERS_BUFF_SIZE USHRT_MAX

static DECLARE_UVERBS_NAMED_METHOD(UVERBS_METHOD_COUNTERS_READ,

DECLARE_UVERBS_NAMED_METHOD(UVERBS_METHOD_COUNTERS_READ,

	&UVERBS_ATTR_IDR(UVERBS_ATTR_READ_COUNTERS_HANDLE,

			 UVERBS_OBJECT_COUNTERS,

			 UVERBS_ACCESS_READ,

drivers/infiniband/core/uverbs_std_types_cq.c

+2 −2
Original line number Diff line number Diff line
@@ -147,7 +147,7 @@ static int UVERBS_HANDLER(UVERBS_METHOD_CQ_CREATE)(struct ib_device *ib_dev, 
	return ret;

};



static DECLARE_UVERBS_NAMED_METHOD(UVERBS_METHOD_CQ_CREATE,

DECLARE_UVERBS_NAMED_METHOD(UVERBS_METHOD_CQ_CREATE,

	&UVERBS_ATTR_IDR(UVERBS_ATTR_CREATE_CQ_HANDLE, UVERBS_OBJECT_CQ,

			 UVERBS_ACCESS_NEW,

			 UA_FLAGS(UVERBS_ATTR_SPEC_F_MANDATORY)),
@@ -196,7 +196,7 @@ static int UVERBS_HANDLER(UVERBS_METHOD_CQ_DESTROY)(struct ib_device *ib_dev, 
			      sizeof(resp));

}



static DECLARE_UVERBS_NAMED_METHOD(UVERBS_METHOD_CQ_DESTROY,

DECLARE_UVERBS_NAMED_METHOD(UVERBS_METHOD_CQ_DESTROY,

	&UVERBS_ATTR_IDR(UVERBS_ATTR_DESTROY_CQ_HANDLE, UVERBS_OBJECT_CQ,

			 UVERBS_ACCESS_DESTROY,

			 UA_FLAGS(UVERBS_ATTR_SPEC_F_MANDATORY)),

drivers/infiniband/core/uverbs_std_types_dm.c

+2 −3
Original line number Diff line number Diff line
@@ -85,7 +85,7 @@ static int UVERBS_HANDLER(UVERBS_METHOD_DM_ALLOC)(struct ib_device *ib_dev, 
	return 0;

}



static DECLARE_UVERBS_NAMED_METHOD(UVERBS_METHOD_DM_ALLOC,

DECLARE_UVERBS_NAMED_METHOD(UVERBS_METHOD_DM_ALLOC,

	&UVERBS_ATTR_IDR(UVERBS_ATTR_ALLOC_DM_HANDLE, UVERBS_OBJECT_DM,

			 UVERBS_ACCESS_NEW,

			 UA_FLAGS(UVERBS_ATTR_SPEC_F_MANDATORY)),
@@ -96,8 +96,7 @@ static DECLARE_UVERBS_NAMED_METHOD(UVERBS_METHOD_DM_ALLOC, 
			    UVERBS_ATTR_TYPE(u32),

			    UA_FLAGS(UVERBS_ATTR_SPEC_F_MANDATORY)));



static DECLARE_UVERBS_NAMED_METHOD_WITH_HANDLER(UVERBS_METHOD_DM_FREE,

	uverbs_destroy_def_handler,

DECLARE_UVERBS_NAMED_METHOD_DESTROY(UVERBS_METHOD_DM_FREE,

	&UVERBS_ATTR_IDR(UVERBS_ATTR_FREE_DM_HANDLE,

			 UVERBS_OBJECT_DM,

			 UVERBS_ACCESS_DESTROY,

drivers/infiniband/core/uverbs_std_types_flow_action.c

+3 −4
Original line number Diff line number Diff line
@@ -385,7 +385,7 @@ static const struct uverbs_attr_spec uverbs_flow_action_esp_replay[] = { 
	},

};



static DECLARE_UVERBS_NAMED_METHOD(UVERBS_METHOD_FLOW_ACTION_ESP_CREATE,

DECLARE_UVERBS_NAMED_METHOD(UVERBS_METHOD_FLOW_ACTION_ESP_CREATE,

	&UVERBS_ATTR_IDR(UVERBS_ATTR_CREATE_FLOW_ACTION_ESP_HANDLE,

			 UVERBS_OBJECT_FLOW_ACTION,

			 UVERBS_ACCESS_NEW,
@@ -403,7 +403,7 @@ static DECLARE_UVERBS_NAMED_METHOD(UVERBS_METHOD_FLOW_ACTION_ESP_CREATE, 
	&UVERBS_ATTR_PTR_IN(UVERBS_ATTR_FLOW_ACTION_ESP_ENCAP,

			    UVERBS_ATTR_STRUCT(struct ib_uverbs_flow_action_esp_encap, type)));



static DECLARE_UVERBS_NAMED_METHOD(UVERBS_METHOD_FLOW_ACTION_ESP_MODIFY,

DECLARE_UVERBS_NAMED_METHOD(UVERBS_METHOD_FLOW_ACTION_ESP_MODIFY,

	&UVERBS_ATTR_IDR(UVERBS_ATTR_MODIFY_FLOW_ACTION_ESP_HANDLE,

			 UVERBS_OBJECT_FLOW_ACTION,

			 UVERBS_ACCESS_WRITE,
@@ -419,8 +419,7 @@ static DECLARE_UVERBS_NAMED_METHOD(UVERBS_METHOD_FLOW_ACTION_ESP_MODIFY, 
	&UVERBS_ATTR_PTR_IN(UVERBS_ATTR_FLOW_ACTION_ESP_ENCAP,

			    UVERBS_ATTR_STRUCT(struct ib_uverbs_flow_action_esp_encap, type)));



static DECLARE_UVERBS_NAMED_METHOD_WITH_HANDLER(UVERBS_METHOD_FLOW_ACTION_DESTROY,

	uverbs_destroy_def_handler,

DECLARE_UVERBS_NAMED_METHOD_DESTROY(UVERBS_METHOD_FLOW_ACTION_DESTROY,

	&UVERBS_ATTR_IDR(UVERBS_ATTR_DESTROY_FLOW_ACTION_HANDLE,

			 UVERBS_OBJECT_FLOW_ACTION,

			 UVERBS_ACCESS_DESTROY,

drivers/infiniband/core/uverbs_std_types_mr.c

+1 −1
Original line number Diff line number Diff line
@@ -115,7 +115,7 @@ static int UVERBS_HANDLER(UVERBS_METHOD_DM_MR_REG)(struct ib_device *ib_dev, 
	return ret;

}



static DECLARE_UVERBS_NAMED_METHOD(UVERBS_METHOD_DM_MR_REG,

DECLARE_UVERBS_NAMED_METHOD(UVERBS_METHOD_DM_MR_REG,

	&UVERBS_ATTR_IDR(UVERBS_ATTR_REG_DM_MR_HANDLE, UVERBS_OBJECT_MR,

			 UVERBS_ACCESS_NEW,

			 UA_FLAGS(UVERBS_ATTR_SPEC_F_MANDATORY)),