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

Commit 0bd01f3d authored by Jason Gunthorpe's avatar Jason Gunthorpe
Browse files

RDMA/uverbs: Require all objects to have a driver destroy function 



If we can't destroy the object then we certainly shouldn't allow it be
created or used. Remove it from the uverbs_uapi in this case.

This also disables methods of other objects that have mandatory object
handle inputs - ie REG_DM_MR is now automatically removed if DM objects
cannot be created.

Typically drivers not supporting an interface will mark all of the
supporting functions as NULL, including destroy.

This is intended to automatically eliminate entire corner cases in the API
that are difficult to test.

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

drivers/infiniband/core/rdma_core.h

+5 −0
Original line number Diff line number Diff line
@@ -161,6 +161,11 @@ void uapi_compute_bundle_size(struct uverbs_api_ioctl_method *method_elm, 
			      unsigned int num_attrs);

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_dm[];

extern const struct uapi_definition uverbs_def_obj_flow_action[];

extern const struct uapi_definition uverbs_def_obj_intf[];

extern const struct uapi_definition uverbs_def_obj_mr[];



#endif /* RDMA_CORE_H */

drivers/infiniband/core/uverbs_std_types.c

+21 −15
Original line number Diff line number Diff line
@@ -264,20 +264,26 @@ 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_CHAIN_OBJ_TREE_NAMED(UVERBS_OBJECT_MR),

	UAPI_DEF_CHAIN_OBJ_TREE_NAMED(UVERBS_OBJECT_COMP_CHANNEL),

	UAPI_DEF_CHAIN_OBJ_TREE_NAMED(UVERBS_OBJECT_CQ),

	UAPI_DEF_CHAIN_OBJ_TREE_NAMED(UVERBS_OBJECT_QP),

	UAPI_DEF_CHAIN_OBJ_TREE_NAMED(UVERBS_OBJECT_AH),

	UAPI_DEF_CHAIN_OBJ_TREE_NAMED(UVERBS_OBJECT_MW),

	UAPI_DEF_CHAIN_OBJ_TREE_NAMED(UVERBS_OBJECT_SRQ),

	UAPI_DEF_CHAIN_OBJ_TREE_NAMED(UVERBS_OBJECT_FLOW),

	UAPI_DEF_CHAIN_OBJ_TREE_NAMED(UVERBS_OBJECT_WQ),

	UAPI_DEF_CHAIN_OBJ_TREE_NAMED(UVERBS_OBJECT_RWQ_IND_TBL),

	UAPI_DEF_CHAIN_OBJ_TREE_NAMED(UVERBS_OBJECT_XRCD),

	UAPI_DEF_CHAIN_OBJ_TREE_NAMED(UVERBS_OBJECT_FLOW_ACTION),

	UAPI_DEF_CHAIN_OBJ_TREE_NAMED(UVERBS_OBJECT_DM),

	UAPI_DEF_CHAIN_OBJ_TREE_NAMED(UVERBS_OBJECT_COUNTERS),

	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,

				      UAPI_DEF_OBJ_NEEDS_FN(dealloc_pd)),

	UAPI_DEF_CHAIN_OBJ_TREE_NAMED(UVERBS_OBJECT_QP,

				      UAPI_DEF_OBJ_NEEDS_FN(destroy_qp)),

	UAPI_DEF_CHAIN_OBJ_TREE_NAMED(UVERBS_OBJECT_AH,

				      UAPI_DEF_OBJ_NEEDS_FN(destroy_ah)),

	UAPI_DEF_CHAIN_OBJ_TREE_NAMED(UVERBS_OBJECT_MW,

				      UAPI_DEF_OBJ_NEEDS_FN(dealloc_mw)),

	UAPI_DEF_CHAIN_OBJ_TREE_NAMED(UVERBS_OBJECT_SRQ,

				      UAPI_DEF_OBJ_NEEDS_FN(destroy_srq)),

	UAPI_DEF_CHAIN_OBJ_TREE_NAMED(UVERBS_OBJECT_FLOW,

				      UAPI_DEF_OBJ_NEEDS_FN(destroy_flow)),

	UAPI_DEF_CHAIN_OBJ_TREE_NAMED(UVERBS_OBJECT_WQ,

				      UAPI_DEF_OBJ_NEEDS_FN(destroy_wq)),

	UAPI_DEF_CHAIN_OBJ_TREE_NAMED(

		UVERBS_OBJECT_RWQ_IND_TBL,

		UAPI_DEF_OBJ_NEEDS_FN(destroy_rwq_ind_table)),

	UAPI_DEF_CHAIN_OBJ_TREE_NAMED(UVERBS_OBJECT_XRCD,

				      UAPI_DEF_OBJ_NEEDS_FN(dealloc_xrcd)),

	{}

};

drivers/infiniband/core/uverbs_std_types_counters.c

+6 −0
Original line number Diff line number Diff line
@@ -149,3 +149,9 @@ DECLARE_UVERBS_NAMED_OBJECT(UVERBS_OBJECT_COUNTERS, 
			    &UVERBS_METHOD(UVERBS_METHOD_COUNTERS_CREATE),

			    &UVERBS_METHOD(UVERBS_METHOD_COUNTERS_DESTROY),

			    &UVERBS_METHOD(UVERBS_METHOD_COUNTERS_READ));



const struct uapi_definition uverbs_def_obj_counters[] = {

	UAPI_DEF_CHAIN_OBJ_TREE_NAMED(UVERBS_OBJECT_COUNTERS,

				      UAPI_DEF_OBJ_NEEDS_FN(destroy_counters)),

	{}

};

drivers/infiniband/core/uverbs_std_types_cq.c

+6 −0
Original line number Diff line number Diff line
@@ -207,3 +207,9 @@ DECLARE_UVERBS_NAMED_OBJECT( 
	&UVERBS_METHOD(UVERBS_METHOD_CQ_DESTROY)

#endif

);



const struct uapi_definition uverbs_def_obj_cq[] = {

	UAPI_DEF_CHAIN_OBJ_TREE_NAMED(UVERBS_OBJECT_CQ,

				      UAPI_DEF_OBJ_NEEDS_FN(destroy_cq)),

	{}

};

drivers/infiniband/core/uverbs_std_types_dm.c

+6 −0
Original line number Diff line number Diff line
@@ -109,3 +109,9 @@ DECLARE_UVERBS_NAMED_OBJECT(UVERBS_OBJECT_DM, 
			    UVERBS_TYPE_ALLOC_IDR(uverbs_free_dm),

			    &UVERBS_METHOD(UVERBS_METHOD_DM_ALLOC),

			    &UVERBS_METHOD(UVERBS_METHOD_DM_FREE));



const struct uapi_definition uverbs_def_obj_dm[] = {

	UAPI_DEF_CHAIN_OBJ_TREE_NAMED(UVERBS_OBJECT_DM,

				      UAPI_DEF_OBJ_NEEDS_FN(dealloc_dm)),

	{}

};