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

Commit dfb13955 authored by Matan Barak's avatar Matan Barak Committed by Jason Gunthorpe
Browse files

IB/uverbs: Expose parsing tree of all common objects to providers 



The ioctl() based uverbs is based on merging feature trees. This teaches
the generic parser how to parse methods according to the provider's
support. In order to support merging with the common objects, exporting
the common-object-tree to the provider drivers.

Reviewed-by: default avatarYishai Hadas <yishaih@mellanox.com>
Signed-off-by: default avatarMatan Barak <matanb@mellanox.com>
Signed-off-by: default avatarLeon Romanovsky <leonro@mellanox.com>
Signed-off-by: default avatarJason Gunthorpe <jgg@mellanox.com>
parent c66db311

drivers/infiniband/core/uverbs.h

+15 −0
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ 
#include <rdma/ib_verbs.h>

#include <rdma/ib_umem.h>

#include <rdma/ib_user_verbs.h>

#include <rdma/uverbs_std_types.h>



#define UVERBS_MODULE_NAME ib_uverbs

#include <rdma/uverbs_named_ioctl.h>
@@ -250,6 +251,20 @@ struct ib_uverbs_flow_spec { 
	};

};



extern const struct uverbs_object_def UVERBS_OBJECT(UVERBS_OBJECT_DEVICE);

extern const struct uverbs_object_def UVERBS_OBJECT(UVERBS_OBJECT_PD);

extern const struct uverbs_object_def UVERBS_OBJECT(UVERBS_OBJECT_MR);

extern const struct uverbs_object_def UVERBS_OBJECT(UVERBS_OBJECT_COMP_CHANNEL);

extern const struct uverbs_object_def UVERBS_OBJECT(UVERBS_OBJECT_CQ);

extern const struct uverbs_object_def UVERBS_OBJECT(UVERBS_OBJECT_QP);

extern const struct uverbs_object_def UVERBS_OBJECT(UVERBS_OBJECT_AH);

extern const struct uverbs_object_def UVERBS_OBJECT(UVERBS_OBJECT_MW);

extern const struct uverbs_object_def UVERBS_OBJECT(UVERBS_OBJECT_SRQ);

extern const struct uverbs_object_def UVERBS_OBJECT(UVERBS_OBJECT_FLOW);

extern const struct uverbs_object_def UVERBS_OBJECT(UVERBS_OBJECT_WQ);

extern const struct uverbs_object_def UVERBS_OBJECT(UVERBS_OBJECT_RWQ_IND_TBL);

extern const struct uverbs_object_def UVERBS_OBJECT(UVERBS_OBJECT_XRCD);



#define IB_UVERBS_DECLARE_CMD(name)					\

	ssize_t ib_uverbs_##name(struct ib_uverbs_file *file,		\

				 struct ib_device *ib_dev,              \

drivers/infiniband/core/uverbs_std_types.c

+20 −14
Original line number Diff line number Diff line
@@ -453,7 +453,7 @@ DECLARE_UVERBS_NAMED_OBJECT(UVERBS_OBJECT_PD, 


DECLARE_UVERBS_NAMED_OBJECT(UVERBS_OBJECT_DEVICE, NULL);



DECLARE_UVERBS_OBJECT_TREE(uverbs_default_objects,

static DECLARE_UVERBS_OBJECT_TREE(uverbs_default_objects,

				  &UVERBS_OBJECT(UVERBS_OBJECT_DEVICE),

				  &UVERBS_OBJECT(UVERBS_OBJECT_PD),

				  &UVERBS_OBJECT(UVERBS_OBJECT_MR),
@@ -467,3 +467,9 @@ DECLARE_UVERBS_OBJECT_TREE(uverbs_default_objects, 
				  &UVERBS_OBJECT(UVERBS_OBJECT_WQ),

				  &UVERBS_OBJECT(UVERBS_OBJECT_RWQ_IND_TBL),

				  &UVERBS_OBJECT(UVERBS_OBJECT_XRCD));



const struct uverbs_object_tree_def *uverbs_default_get_objects(void)

{

	return &uverbs_default_objects;

}

EXPORT_SYMBOL_GPL(uverbs_default_get_objects);

include/rdma/uverbs_std_types.h

+2 −21
Original line number Diff line number Diff line
@@ -37,29 +37,10 @@ 
#include <rdma/uverbs_ioctl.h>

#include <rdma/ib_user_ioctl_verbs.h>



#if IS_ENABLED(CONFIG_INFINIBAND_USER_ACCESS)



#define UVERBS_OBJECT(id)	uverbs_object_##id



extern const struct uverbs_object_def UVERBS_OBJECT(UVERBS_OBJECT_DEVICE);

extern const struct uverbs_object_def UVERBS_OBJECT(UVERBS_OBJECT_PD);

extern const struct uverbs_object_def UVERBS_OBJECT(UVERBS_OBJECT_MR);

extern const struct uverbs_object_def UVERBS_OBJECT(UVERBS_OBJECT_COMP_CHANNEL);

extern const struct uverbs_object_def UVERBS_OBJECT(UVERBS_OBJECT_CQ);

extern const struct uverbs_object_def UVERBS_OBJECT(UVERBS_OBJECT_QP);

extern const struct uverbs_object_def UVERBS_OBJECT(UVERBS_OBJECT_AH);

extern const struct uverbs_object_def UVERBS_OBJECT(UVERBS_OBJECT_MW);

extern const struct uverbs_object_def UVERBS_OBJECT(UVERBS_OBJECT_SRQ);

extern const struct uverbs_object_def UVERBS_OBJECT(UVERBS_OBJECT_FLOW);

extern const struct uverbs_object_def UVERBS_OBJECT(UVERBS_OBJECT_WQ);

extern const struct uverbs_object_def UVERBS_OBJECT(UVERBS_OBJECT_RWQ_IND_TBL);

extern const struct uverbs_object_def UVERBS_OBJECT(UVERBS_OBJECT_XRCD);



extern const struct uverbs_object_tree_def uverbs_default_objects;

static inline const struct uverbs_object_tree_def *uverbs_default_get_objects(void)

{

	return &uverbs_default_objects;

}

#if IS_ENABLED(CONFIG_INFINIBAND_USER_ACCESS)

const struct uverbs_object_tree_def *uverbs_default_get_objects(void);

#else

static inline const struct uverbs_object_tree_def *uverbs_default_get_objects(void)

{