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

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

IB/mlx5: Enable driver uapi commands for flow steering 



Expose the mlx5 flow steering parsing trees, exposing the functionality to
user space.

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 6346f0bf

drivers/infiniband/hw/mlx5/flow.c

+10 −0
Original line number Original line Diff line number Diff line
@@ -242,3 +242,13 @@ DECLARE_UVERBS_NAMED_OBJECT(MLX5_IB_OBJECT_FLOW_MATCHER, 




DECLARE_UVERBS_OBJECT_TREE(flow_objects,

DECLARE_UVERBS_OBJECT_TREE(flow_objects,

			   &UVERBS_OBJECT(MLX5_IB_OBJECT_FLOW_MATCHER));

			   &UVERBS_OBJECT(MLX5_IB_OBJECT_FLOW_MATCHER));



int mlx5_ib_get_flow_trees(const struct uverbs_object_tree_def **root)

{

	int i = 0;



	root[i++] = &flow_objects;

	root[i++] = &mlx5_ib_fs;



	return i;

}

drivers/infiniband/hw/mlx5/main.c

+3 −1
Original line number Original line Diff line number Diff line
@@ -5535,7 +5535,7 @@ ADD_UVERBS_ATTRIBUTES_SIMPLE( 
			   UVERBS_ATTR_TYPE(u64),

			   UVERBS_ATTR_TYPE(u64),

			   UA_MANDATORY));

			   UA_MANDATORY));





#define NUM_TREES	3

#define NUM_TREES	5

static int populate_specs_root(struct mlx5_ib_dev *dev)

static int populate_specs_root(struct mlx5_ib_dev *dev)

{

{

	const struct uverbs_object_tree_def *default_root[NUM_TREES + 1] = {

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

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

		default_root[num_trees++] = mlx5_ib_get_devx_tree();

		default_root[num_trees++] = mlx5_ib_get_devx_tree();





	num_trees += mlx5_ib_get_flow_trees(default_root + num_trees);



	dev->ib_dev.driver_specs_root =

	dev->ib_dev.driver_specs_root =

		uverbs_alloc_spec_tree(num_trees, default_root);

		uverbs_alloc_spec_tree(num_trees, default_root);

drivers/infiniband/hw/mlx5/mlx5_ib.h

+6 −6
Original line number Original line Diff line number Diff line
@@ -1236,6 +1236,7 @@ struct mlx5_ib_flow_handler *mlx5_ib_raw_fs_rule_add( 
	struct mlx5_ib_dev *dev, struct mlx5_ib_flow_matcher *fs_matcher,

	struct mlx5_ib_dev *dev, struct mlx5_ib_flow_matcher *fs_matcher,

	void *cmd_in, int inlen, int dest_id, int dest_type);

	void *cmd_in, int inlen, int dest_id, int dest_type);

bool mlx5_ib_devx_is_flow_dest(void *obj, int *dest_id, int *dest_type);

bool mlx5_ib_devx_is_flow_dest(void *obj, int *dest_id, int *dest_type);

int mlx5_ib_get_flow_trees(const struct uverbs_object_tree_def **root);

#else

#else

static inline int

static inline int

mlx5_ib_devx_create(struct mlx5_ib_dev *dev,

mlx5_ib_devx_create(struct mlx5_ib_dev *dev,
@@ -1244,17 +1245,16 @@ static inline void mlx5_ib_devx_destroy(struct mlx5_ib_dev *dev, 
					struct mlx5_ib_ucontext *context) {}

					struct mlx5_ib_ucontext *context) {}

static inline const struct uverbs_object_tree_def *

static inline const struct uverbs_object_tree_def *

mlx5_ib_get_devx_tree(void) { return NULL; }

mlx5_ib_get_devx_tree(void) { return NULL; }

static inline struct mlx5_ib_flow_handler *mlx5_ib_raw_fs_rule_add(

	struct mlx5_ib_dev *dev, struct mlx5_ib_flow_matcher *fs_matcher,

	void *cmd_in, int inlen, int dest_id, int dest_type)

{

	return ERR_PTR(-EOPNOTSUPP);

}

static inline bool mlx5_ib_devx_is_flow_dest(void *obj, int *dest_id,

static inline bool mlx5_ib_devx_is_flow_dest(void *obj, int *dest_id,

					     int *dest_type)

					     int *dest_type)

{

{

	return false;

	return false;

}

}

static inline int

mlx5_ib_get_flow_trees(const struct uverbs_object_tree_def **root)

{

	return 0;

}

#endif

#endif

static inline void init_query_mad(struct ib_smp *mad)

static inline void init_query_mad(struct ib_smp *mad)

{

{