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

Commit b823dd6d authored by Mark Bloch's avatar Mark Bloch Committed by Jason Gunthorpe
Browse files

RDMA/mlx5: Refactor raw flow creation 



Move struct mlx5_flow_act to be passed from the method entry point,
this will allow to add support for flow action for the raw create flow
path.

Signed-off-by: default avatarMark Bloch <markb@mellanox.com>
Reviewed-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 501f14e3

drivers/infiniband/hw/mlx5/flow.c

+3 −1
Original line number Diff line number Diff line
@@ -61,6 +61,7 @@ static const struct uverbs_attr_spec mlx5_ib_flow_type[] = { 
static int UVERBS_HANDLER(MLX5_IB_METHOD_CREATE_FLOW)(

	struct ib_uverbs_file *file, struct uverbs_attr_bundle *attrs)

{

	struct mlx5_flow_act flow_act = {.flow_tag = MLX5_FS_DEFAULT_FLOW_TAG};

	struct mlx5_ib_flow_handler *flow_handler;

	struct mlx5_ib_flow_matcher *fs_matcher;

	void *devx_obj;
@@ -123,7 +124,8 @@ static int UVERBS_HANDLER(MLX5_IB_METHOD_CREATE_FLOW)( 
				    MLX5_IB_ATTR_CREATE_FLOW_MATCH_VALUE);

	fs_matcher = uverbs_attr_get_obj(attrs,

					 MLX5_IB_ATTR_CREATE_FLOW_MATCHER);

	flow_handler = mlx5_ib_raw_fs_rule_add(dev, fs_matcher, cmd_in, inlen,

	flow_handler = mlx5_ib_raw_fs_rule_add(dev, fs_matcher, &flow_act,

					       cmd_in, inlen,

					       dest_id, dest_type);

	if (IS_ERR(flow_handler))

		return PTR_ERR(flow_handler);

drivers/infiniband/hw/mlx5/main.c

+7 −5
Original line number Diff line number Diff line
@@ -3754,10 +3754,10 @@ _create_raw_flow_rule(struct mlx5_ib_dev *dev, 
		      struct mlx5_ib_flow_prio *ft_prio,

		      struct mlx5_flow_destination *dst,

		      struct mlx5_ib_flow_matcher  *fs_matcher,

		      struct mlx5_flow_act *flow_act,

		      void *cmd_in, int inlen)

{

	struct mlx5_ib_flow_handler *handler;

	struct mlx5_flow_act flow_act = {.flow_tag = MLX5_FS_DEFAULT_FLOW_TAG};

	struct mlx5_flow_spec *spec;

	struct mlx5_flow_table *ft = ft_prio->flow_table;

	int err = 0;
@@ -3776,9 +3776,8 @@ _create_raw_flow_rule(struct mlx5_ib_dev *dev, 
	       fs_matcher->mask_len);

	spec->match_criteria_enable = fs_matcher->match_criteria_enable;



	flow_act.action |= MLX5_FLOW_CONTEXT_ACTION_FWD_DEST;

	handler->rule = mlx5_add_flow_rules(ft, spec,

					    &flow_act, dst, 1);

					    flow_act, dst, 1);



	if (IS_ERR(handler->rule)) {

		err = PTR_ERR(handler->rule);
@@ -3840,6 +3839,7 @@ static bool raw_fs_is_multicast(struct mlx5_ib_flow_matcher *fs_matcher, 
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_flow_act *flow_act,

			void *cmd_in, int inlen, int dest_id,

			int dest_type)

{
@@ -3872,13 +3872,15 @@ mlx5_ib_raw_fs_rule_add(struct mlx5_ib_dev *dev, 
	if (dest_type == MLX5_FLOW_DESTINATION_TYPE_TIR) {

		dst->type = dest_type;

		dst->tir_num = dest_id;

		flow_act->action |= MLX5_FLOW_CONTEXT_ACTION_FWD_DEST;

	} else {

		dst->type = MLX5_FLOW_DESTINATION_TYPE_FLOW_TABLE_NUM;

		dst->ft_num = dest_id;

		flow_act->action |= MLX5_FLOW_CONTEXT_ACTION_FWD_DEST;

	}



	handler = _create_raw_flow_rule(dev, ft_prio, dst, fs_matcher, cmd_in,

					inlen);

	handler = _create_raw_flow_rule(dev, ft_prio, dst, fs_matcher, flow_act,

					cmd_in, inlen);



	if (IS_ERR(handler)) {

		err = PTR_ERR(handler);

drivers/infiniband/hw/mlx5/mlx5_ib.h

+3 −1
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ 
#include <rdma/ib_smi.h>

#include <linux/mlx5/driver.h>

#include <linux/mlx5/cq.h>

#include <linux/mlx5/fs.h>

#include <linux/mlx5/qp.h>

#include <linux/mlx5/srq.h>

#include <linux/mlx5/fs.h>
@@ -1253,7 +1254,8 @@ void mlx5_ib_devx_destroy(struct mlx5_ib_dev *dev, 
const struct uverbs_object_tree_def *mlx5_ib_get_devx_tree(void);

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

	struct mlx5_flow_act *flow_act, 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);

int mlx5_ib_get_flow_trees(const struct uverbs_object_tree_def **root);

void mlx5_ib_destroy_flow_action_raw(struct mlx5_ib_flow_action *maction);