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

Commit c59450c4 authored by Yishai Hadas's avatar Yishai Hadas Committed by Jason Gunthorpe
Browse files

IB/mlx5: Expose DEVX tree 



Expose DEVX tree to be used by upper layers.

Signed-off-by: default avatarYishai Hadas <yishaih@mellanox.com>
Signed-off-by: default avatarLeon Romanovsky <leonro@mellanox.com>
Signed-off-by: default avatarJason Gunthorpe <jgg@mellanox.com>
parent f6fe01b7

drivers/infiniband/hw/mlx5/devx.c

+5 −0
Original line number Diff line number Diff line
@@ -1100,3 +1100,8 @@ static 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));



const struct uverbs_object_tree_def *mlx5_ib_get_devx_tree(void)

{

	return &devx_objects;

}

drivers/infiniband/hw/mlx5/main.c

+6 −1
Original line number Diff line number Diff line
@@ -5264,7 +5264,7 @@ ADD_UVERBS_ATTRIBUTES_SIMPLE(mlx5_ib_flow_action, UVERBS_OBJECT_FLOW_ACTION, 
						 UVERBS_ATTR_TYPE(u64),

						 UA_FLAGS(UVERBS_ATTR_SPEC_F_MANDATORY)));



#define NUM_TREES	2

#define NUM_TREES	3

static int populate_specs_root(struct mlx5_ib_dev *dev)

{

	const struct uverbs_object_tree_def *default_root[NUM_TREES + 1] = {
@@ -5279,6 +5279,11 @@ static int populate_specs_root(struct mlx5_ib_dev *dev) 
	    !WARN_ON(num_trees >= ARRAY_SIZE(default_root)))

		default_root[num_trees++] = &mlx5_ib_dm;



	if (MLX5_CAP_GEN_64(dev->mdev, general_obj_types) &

			    MLX5_GENERAL_OBJ_TYPES_CAP_UCTX &&

	    !WARN_ON(num_trees >= ARRAY_SIZE(default_root)))

		default_root[num_trees++] = mlx5_ib_get_devx_tree();



	dev->ib_dev.specs_root =

		uverbs_alloc_spec_tree(num_trees, default_root);

drivers/infiniband/hw/mlx5/mlx5_ib.h

+3 −0
Original line number Diff line number Diff line
@@ -1221,12 +1221,15 @@ int mlx5_ib_devx_create(struct mlx5_ib_dev *dev, 
			struct mlx5_ib_ucontext *context);

void mlx5_ib_devx_destroy(struct mlx5_ib_dev *dev,

			  struct mlx5_ib_ucontext *context);

const struct uverbs_object_tree_def *mlx5_ib_get_devx_tree(void);

#else

static inline int

mlx5_ib_devx_create(struct mlx5_ib_dev *dev,

		    struct mlx5_ib_ucontext *context) { return -EOPNOTSUPP; };

static inline void mlx5_ib_devx_destroy(struct mlx5_ib_dev *dev,

					struct mlx5_ib_ucontext *context) {}

static inline const struct uverbs_object_tree_def *

mlx5_ib_get_devx_tree(void) { return NULL; }

#endif

static inline void init_query_mad(struct ib_smp *mad)

{