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

Commit 9a119cd5 authored by Jason Gunthorpe's avatar Jason Gunthorpe
Browse files

RDMA/uverbs: Get rid of the & in method specifications 



Hide it inside the macros. The & is confusing and interferes with using
this as a generic DSL in later patches.

Since this also touches almost every line, also run the specs through
clang-format (with 'BinPackParameters: false') to make the maintenance
easier.

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

drivers/infiniband/core/uverbs_std_types.c

+31 −26
Original line number Diff line number Diff line
@@ -248,45 +248,50 @@ void create_udata(struct uverbs_attr_bundle *ctx, struct ib_udata *udata) 
	}

}



DECLARE_UVERBS_NAMED_OBJECT(UVERBS_OBJECT_COMP_CHANNEL,

			    &UVERBS_TYPE_ALLOC_FD(sizeof(struct ib_uverbs_completion_event_file),

DECLARE_UVERBS_NAMED_OBJECT(

	UVERBS_OBJECT_COMP_CHANNEL,

	UVERBS_TYPE_ALLOC_FD(sizeof(struct ib_uverbs_completion_event_file),

			     uverbs_hot_unplug_completion_event_file,

			     &uverbs_event_fops,

						  "[infinibandevent]", O_RDONLY));

			     "[infinibandevent]",

			     O_RDONLY));



DECLARE_UVERBS_NAMED_OBJECT(UVERBS_OBJECT_QP,

			    &UVERBS_TYPE_ALLOC_IDR_SZ(sizeof(struct ib_uqp_object),

						      uverbs_free_qp));

DECLARE_UVERBS_NAMED_OBJECT(

	UVERBS_OBJECT_QP,

	UVERBS_TYPE_ALLOC_IDR_SZ(sizeof(struct ib_uqp_object), uverbs_free_qp));



DECLARE_UVERBS_NAMED_OBJECT(UVERBS_OBJECT_MW,

			    &UVERBS_TYPE_ALLOC_IDR(uverbs_free_mw));

			    UVERBS_TYPE_ALLOC_IDR(uverbs_free_mw));



DECLARE_UVERBS_NAMED_OBJECT(UVERBS_OBJECT_SRQ,

			    &UVERBS_TYPE_ALLOC_IDR_SZ(sizeof(struct ib_usrq_object),

DECLARE_UVERBS_NAMED_OBJECT(

	UVERBS_OBJECT_SRQ,

	UVERBS_TYPE_ALLOC_IDR_SZ(sizeof(struct ib_usrq_object),

				 uverbs_free_srq));



DECLARE_UVERBS_NAMED_OBJECT(UVERBS_OBJECT_AH,

			    &UVERBS_TYPE_ALLOC_IDR(uverbs_free_ah));

			    UVERBS_TYPE_ALLOC_IDR(uverbs_free_ah));



DECLARE_UVERBS_NAMED_OBJECT(UVERBS_OBJECT_FLOW,

			    &UVERBS_TYPE_ALLOC_IDR_SZ(sizeof(struct ib_uflow_object),

DECLARE_UVERBS_NAMED_OBJECT(

	UVERBS_OBJECT_FLOW,

	UVERBS_TYPE_ALLOC_IDR_SZ(sizeof(struct ib_uflow_object),

				 uverbs_free_flow));



DECLARE_UVERBS_NAMED_OBJECT(UVERBS_OBJECT_WQ,

			    &UVERBS_TYPE_ALLOC_IDR_SZ(sizeof(struct ib_uwq_object),

						      uverbs_free_wq));

DECLARE_UVERBS_NAMED_OBJECT(

	UVERBS_OBJECT_WQ,

	UVERBS_TYPE_ALLOC_IDR_SZ(sizeof(struct ib_uwq_object), uverbs_free_wq));



DECLARE_UVERBS_NAMED_OBJECT(UVERBS_OBJECT_RWQ_IND_TBL,

			    &UVERBS_TYPE_ALLOC_IDR(uverbs_free_rwq_ind_tbl));

			    UVERBS_TYPE_ALLOC_IDR(uverbs_free_rwq_ind_tbl));



DECLARE_UVERBS_NAMED_OBJECT(UVERBS_OBJECT_XRCD,

			    &UVERBS_TYPE_ALLOC_IDR_SZ(sizeof(struct ib_uxrcd_object),

DECLARE_UVERBS_NAMED_OBJECT(

	UVERBS_OBJECT_XRCD,

	UVERBS_TYPE_ALLOC_IDR_SZ(sizeof(struct ib_uxrcd_object),

				 uverbs_free_xrcd));



DECLARE_UVERBS_NAMED_OBJECT(UVERBS_OBJECT_PD,

			    &UVERBS_TYPE_ALLOC_IDR(uverbs_free_pd));

			    UVERBS_TYPE_ALLOC_IDR(uverbs_free_pd));



DECLARE_UVERBS_NAMED_OBJECT(UVERBS_OBJECT_DEVICE, NULL);

DECLARE_UVERBS_GLOBAL_METHODS(UVERBS_OBJECT_DEVICE);



DECLARE_UVERBS_OBJECT_TREE(uverbs_default_objects,

			   &UVERBS_OBJECT(UVERBS_OBJECT_DEVICE),

drivers/infiniband/core/uverbs_std_types_counters.c

+26 −24
Original line number Diff line number Diff line
@@ -124,34 +124,36 @@ static int UVERBS_HANDLER(UVERBS_METHOD_COUNTERS_READ)(struct ib_device *ib_dev, 
	return ret;

}



DECLARE_UVERBS_NAMED_METHOD(UVERBS_METHOD_COUNTERS_CREATE,

	&UVERBS_ATTR_IDR(UVERBS_ATTR_CREATE_COUNTERS_HANDLE,

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)));



DECLARE_UVERBS_NAMED_METHOD_DESTROY(UVERBS_METHOD_COUNTERS_DESTROY,

	&UVERBS_ATTR_IDR(UVERBS_ATTR_DESTROY_COUNTERS_HANDLE,

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

DECLARE_UVERBS_NAMED_METHOD(UVERBS_METHOD_COUNTERS_READ,

	&UVERBS_ATTR_IDR(UVERBS_ATTR_READ_COUNTERS_HANDLE,

DECLARE_UVERBS_NAMED_METHOD(

	UVERBS_METHOD_COUNTERS_READ,

	UVERBS_ATTR_IDR(UVERBS_ATTR_READ_COUNTERS_HANDLE,

			UVERBS_OBJECT_COUNTERS,

			UVERBS_ACCESS_READ,

			UA_FLAGS(UVERBS_ATTR_SPEC_F_MANDATORY)),

	&UVERBS_ATTR_PTR_OUT(UVERBS_ATTR_READ_COUNTERS_BUFF,

	UVERBS_ATTR_PTR_OUT(UVERBS_ATTR_READ_COUNTERS_BUFF,

			    UVERBS_ATTR_SIZE(0, MAX_COUNTERS_BUFF_SIZE),

			    UA_FLAGS(UVERBS_ATTR_SPEC_F_MANDATORY)),

	&UVERBS_ATTR_PTR_IN(UVERBS_ATTR_READ_COUNTERS_FLAGS,

	UVERBS_ATTR_PTR_IN(UVERBS_ATTR_READ_COUNTERS_FLAGS,

			   UVERBS_ATTR_TYPE(__u32),

			   UA_FLAGS(UVERBS_ATTR_SPEC_F_MANDATORY)));



DECLARE_UVERBS_NAMED_OBJECT(UVERBS_OBJECT_COUNTERS,

			    &UVERBS_TYPE_ALLOC_IDR(uverbs_free_counters),

			    UVERBS_TYPE_ALLOC_IDR(uverbs_free_counters),

			    &UVERBS_METHOD(UVERBS_METHOD_COUNTERS_CREATE),

			    &UVERBS_METHOD(UVERBS_METHOD_COUNTERS_DESTROY),

			    &UVERBS_METHOD(UVERBS_METHOD_COUNTERS_READ));

drivers/infiniband/core/uverbs_std_types_cq.c

+37 −31
Original line number Diff line number Diff line
@@ -147,23 +147,27 @@ static int UVERBS_HANDLER(UVERBS_METHOD_CQ_CREATE)(struct ib_device *ib_dev, 
	return ret;

};



DECLARE_UVERBS_NAMED_METHOD(UVERBS_METHOD_CQ_CREATE,

	&UVERBS_ATTR_IDR(UVERBS_ATTR_CREATE_CQ_HANDLE, UVERBS_OBJECT_CQ,

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)),

	&UVERBS_ATTR_PTR_IN(UVERBS_ATTR_CREATE_CQ_CQE,

	UVERBS_ATTR_PTR_IN(UVERBS_ATTR_CREATE_CQ_CQE,

			   UVERBS_ATTR_TYPE(u32),

			   UA_FLAGS(UVERBS_ATTR_SPEC_F_MANDATORY)),

	&UVERBS_ATTR_PTR_IN(UVERBS_ATTR_CREATE_CQ_USER_HANDLE,

	UVERBS_ATTR_PTR_IN(UVERBS_ATTR_CREATE_CQ_USER_HANDLE,

			   UVERBS_ATTR_TYPE(u64),

			   UA_FLAGS(UVERBS_ATTR_SPEC_F_MANDATORY)),

	&UVERBS_ATTR_FD(UVERBS_ATTR_CREATE_CQ_COMP_CHANNEL,

	UVERBS_ATTR_FD(UVERBS_ATTR_CREATE_CQ_COMP_CHANNEL,

		       UVERBS_OBJECT_COMP_CHANNEL,

		       UVERBS_ACCESS_READ),

	&UVERBS_ATTR_PTR_IN(UVERBS_ATTR_CREATE_CQ_COMP_VECTOR, UVERBS_ATTR_TYPE(u32),

	UVERBS_ATTR_PTR_IN(UVERBS_ATTR_CREATE_CQ_COMP_VECTOR,

			   UVERBS_ATTR_TYPE(u32),

			   UA_FLAGS(UVERBS_ATTR_SPEC_F_MANDATORY)),

	&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),

	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_ATTR_UHW());
@@ -196,20 +200,22 @@ static int UVERBS_HANDLER(UVERBS_METHOD_CQ_DESTROY)(struct ib_device *ib_dev, 
			      sizeof(resp));

}



DECLARE_UVERBS_NAMED_METHOD(UVERBS_METHOD_CQ_DESTROY,

	&UVERBS_ATTR_IDR(UVERBS_ATTR_DESTROY_CQ_HANDLE, UVERBS_OBJECT_CQ,

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)),

	&UVERBS_ATTR_PTR_OUT(UVERBS_ATTR_DESTROY_CQ_RESP,

	UVERBS_ATTR_PTR_OUT(UVERBS_ATTR_DESTROY_CQ_RESP,

			    UVERBS_ATTR_TYPE(struct ib_uverbs_destroy_cq_resp),

			    UA_FLAGS(UVERBS_ATTR_SPEC_F_MANDATORY)));



DECLARE_UVERBS_NAMED_OBJECT(UVERBS_OBJECT_CQ,

			    &UVERBS_TYPE_ALLOC_IDR_SZ(sizeof(struct ib_ucq_object),

						      uverbs_free_cq),

DECLARE_UVERBS_NAMED_OBJECT(

	UVERBS_OBJECT_CQ,

	UVERBS_TYPE_ALLOC_IDR_SZ(sizeof(struct ib_ucq_object), uverbs_free_cq),



#if IS_ENABLED(CONFIG_INFINIBAND_EXP_LEGACY_VERBS_NEW_UAPI)

	&UVERBS_METHOD(UVERBS_METHOD_CQ_CREATE),

	&UVERBS_METHOD(UVERBS_METHOD_CQ_DESTROY)

#endif

);

drivers/infiniband/core/uverbs_std_types_dm.c

+20 −17
Original line number Diff line number Diff line
@@ -85,24 +85,27 @@ static int UVERBS_HANDLER(UVERBS_METHOD_DM_ALLOC)(struct ib_device *ib_dev, 
	return 0;

}



DECLARE_UVERBS_NAMED_METHOD(UVERBS_METHOD_DM_ALLOC,

	&UVERBS_ATTR_IDR(UVERBS_ATTR_ALLOC_DM_HANDLE, UVERBS_OBJECT_DM,

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)),

	&UVERBS_ATTR_PTR_IN(UVERBS_ATTR_ALLOC_DM_LENGTH,

	UVERBS_ATTR_PTR_IN(UVERBS_ATTR_ALLOC_DM_LENGTH,

			   UVERBS_ATTR_TYPE(u64),

			   UA_FLAGS(UVERBS_ATTR_SPEC_F_MANDATORY)),

	&UVERBS_ATTR_PTR_IN(UVERBS_ATTR_ALLOC_DM_ALIGNMENT,

	UVERBS_ATTR_PTR_IN(UVERBS_ATTR_ALLOC_DM_ALIGNMENT,

			   UVERBS_ATTR_TYPE(u32),

			   UA_FLAGS(UVERBS_ATTR_SPEC_F_MANDATORY)));



DECLARE_UVERBS_NAMED_METHOD_DESTROY(UVERBS_METHOD_DM_FREE,

	&UVERBS_ATTR_IDR(UVERBS_ATTR_FREE_DM_HANDLE,

DECLARE_UVERBS_NAMED_METHOD_DESTROY(

	UVERBS_METHOD_DM_FREE,

	UVERBS_ATTR_IDR(UVERBS_ATTR_FREE_DM_HANDLE,

			UVERBS_OBJECT_DM,

			UVERBS_ACCESS_DESTROY,

			UA_FLAGS(UVERBS_ATTR_SPEC_F_MANDATORY)));



DECLARE_UVERBS_NAMED_OBJECT(UVERBS_OBJECT_DM,

			    &UVERBS_TYPE_ALLOC_IDR(uverbs_free_dm),

			    UVERBS_TYPE_ALLOC_IDR(uverbs_free_dm),

			    &UVERBS_METHOD(UVERBS_METHOD_DM_ALLOC),

			    &UVERBS_METHOD(UVERBS_METHOD_DM_FREE));

drivers/infiniband/core/uverbs_std_types_flow_action.c

+57 −46
Original line number Diff line number Diff line
@@ -385,49 +385,60 @@ static const struct uverbs_attr_spec uverbs_flow_action_esp_replay[] = { 
	},

};



DECLARE_UVERBS_NAMED_METHOD(UVERBS_METHOD_FLOW_ACTION_ESP_CREATE,

	&UVERBS_ATTR_IDR(UVERBS_ATTR_CREATE_FLOW_ACTION_ESP_HANDLE,

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,

			UA_FLAGS(UVERBS_ATTR_SPEC_F_MANDATORY)),

	&UVERBS_ATTR_PTR_IN(UVERBS_ATTR_FLOW_ACTION_ESP_ATTRS,

			    UVERBS_ATTR_STRUCT(struct ib_uverbs_flow_action_esp, hard_limit_pkts),

	UVERBS_ATTR_PTR_IN(UVERBS_ATTR_FLOW_ACTION_ESP_ATTRS,

			   UVERBS_ATTR_STRUCT(struct ib_uverbs_flow_action_esp,

					      hard_limit_pkts),

			   UA_FLAGS(UVERBS_ATTR_SPEC_F_MANDATORY |

				    UVERBS_ATTR_SPEC_F_MIN_SZ_OR_ZERO)),

	&UVERBS_ATTR_PTR_IN(UVERBS_ATTR_FLOW_ACTION_ESP_ESN, UVERBS_ATTR_TYPE(__u32)),

	&UVERBS_ATTR_ENUM_IN(UVERBS_ATTR_FLOW_ACTION_ESP_KEYMAT,

	UVERBS_ATTR_PTR_IN(UVERBS_ATTR_FLOW_ACTION_ESP_ESN,

			   UVERBS_ATTR_TYPE(__u32)),

	UVERBS_ATTR_ENUM_IN(UVERBS_ATTR_FLOW_ACTION_ESP_KEYMAT,

			    uverbs_flow_action_esp_keymat,

			    UA_FLAGS(UVERBS_ATTR_SPEC_F_MANDATORY)),

	&UVERBS_ATTR_ENUM_IN(UVERBS_ATTR_FLOW_ACTION_ESP_REPLAY,

	UVERBS_ATTR_ENUM_IN(UVERBS_ATTR_FLOW_ACTION_ESP_REPLAY,

			    uverbs_flow_action_esp_replay),

	&UVERBS_ATTR_PTR_IN(UVERBS_ATTR_FLOW_ACTION_ESP_ENCAP,

			    UVERBS_ATTR_STRUCT(struct ib_uverbs_flow_action_esp_encap, type)));



DECLARE_UVERBS_NAMED_METHOD(UVERBS_METHOD_FLOW_ACTION_ESP_MODIFY,

	&UVERBS_ATTR_IDR(UVERBS_ATTR_MODIFY_FLOW_ACTION_ESP_HANDLE,

	UVERBS_ATTR_PTR_IN(

		UVERBS_ATTR_FLOW_ACTION_ESP_ENCAP,

		UVERBS_ATTR_STRUCT(struct ib_uverbs_flow_action_esp_encap,

				   type)));



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,

			UA_FLAGS(UVERBS_ATTR_SPEC_F_MANDATORY)),

	&UVERBS_ATTR_PTR_IN(UVERBS_ATTR_FLOW_ACTION_ESP_ATTRS,

			    UVERBS_ATTR_STRUCT(struct ib_uverbs_flow_action_esp, hard_limit_pkts),

	UVERBS_ATTR_PTR_IN(UVERBS_ATTR_FLOW_ACTION_ESP_ATTRS,

			   UVERBS_ATTR_STRUCT(struct ib_uverbs_flow_action_esp,

					      hard_limit_pkts),

			   UA_FLAGS(UVERBS_ATTR_SPEC_F_MIN_SZ_OR_ZERO)),

	&UVERBS_ATTR_PTR_IN(UVERBS_ATTR_FLOW_ACTION_ESP_ESN, UVERBS_ATTR_TYPE(__u32)),

	&UVERBS_ATTR_ENUM_IN(UVERBS_ATTR_FLOW_ACTION_ESP_KEYMAT,

	UVERBS_ATTR_PTR_IN(UVERBS_ATTR_FLOW_ACTION_ESP_ESN,

			   UVERBS_ATTR_TYPE(__u32)),

	UVERBS_ATTR_ENUM_IN(UVERBS_ATTR_FLOW_ACTION_ESP_KEYMAT,

			    uverbs_flow_action_esp_keymat),

	&UVERBS_ATTR_ENUM_IN(UVERBS_ATTR_FLOW_ACTION_ESP_REPLAY,

	UVERBS_ATTR_ENUM_IN(UVERBS_ATTR_FLOW_ACTION_ESP_REPLAY,

			    uverbs_flow_action_esp_replay),

	&UVERBS_ATTR_PTR_IN(UVERBS_ATTR_FLOW_ACTION_ESP_ENCAP,

			    UVERBS_ATTR_STRUCT(struct ib_uverbs_flow_action_esp_encap, type)));



DECLARE_UVERBS_NAMED_METHOD_DESTROY(UVERBS_METHOD_FLOW_ACTION_DESTROY,

	&UVERBS_ATTR_IDR(UVERBS_ATTR_DESTROY_FLOW_ACTION_HANDLE,

	UVERBS_ATTR_PTR_IN(

		UVERBS_ATTR_FLOW_ACTION_ESP_ENCAP,

		UVERBS_ATTR_STRUCT(struct ib_uverbs_flow_action_esp_encap,

				   type)));



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,

			UA_FLAGS(UVERBS_ATTR_SPEC_F_MANDATORY)));



DECLARE_UVERBS_NAMED_OBJECT(UVERBS_OBJECT_FLOW_ACTION,

			    &UVERBS_TYPE_ALLOC_IDR(uverbs_free_flow_action),

DECLARE_UVERBS_NAMED_OBJECT(

	UVERBS_OBJECT_FLOW_ACTION,

	UVERBS_TYPE_ALLOC_IDR(uverbs_free_flow_action),

	&UVERBS_METHOD(UVERBS_METHOD_FLOW_ACTION_ESP_CREATE),

	&UVERBS_METHOD(UVERBS_METHOD_FLOW_ACTION_DESTROY),

	&UVERBS_METHOD(UVERBS_METHOD_FLOW_ACTION_ESP_MODIFY));