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

Commit 075572d4 authored by Boris Pismenny's avatar Boris Pismenny Committed by Saeed Mahameed
Browse files

IB/mlx5: Pass mlx5_flow_act struct instead of multiple arguments 



Group and pass all function arguments of parse_flow_attr call in one
common struct mlx5_flow_act.

This patch passes all the action arguments of parse_flow_attr in one common
struct mlx5_flow_act. It allows us to scale the number of actions without adding
new arguments to the function.

Signed-off-by: default avatarMatan Barak <matanb@mellanox.com>
Signed-off-by: default avatarBoris Pismenny <borisp@mellanox.com>
Signed-off-by: default avatarSaeed Mahameed <saeedm@mellanox.com>
Acked-by: default avatarJason Gunthorpe <jgg@mellanox.com>
parent 04e87170

drivers/infiniband/hw/mlx5/main.c

+8 −12
Original line number Diff line number Diff line
@@ -2316,7 +2316,7 @@ static void set_tos(void *outer_c, void *outer_v, u8 mask, u8 val) 
#define IPV6_VERSION 6

static int parse_flow_attr(struct mlx5_core_dev *mdev, u32 *match_c,

			   u32 *match_v, const union ib_flow_spec *ib_spec,

			   u32 *tag_id, bool *is_drop)

			   struct mlx5_flow_act *action)

{

	void *misc_params_c = MLX5_ADDR_OF(fte_match_param, match_c,

					   misc_parameters);
@@ -2534,13 +2534,13 @@ static int parse_flow_attr(struct mlx5_core_dev *mdev, u32 *match_c, 
		if (ib_spec->flow_tag.tag_id >= BIT(24))

			return -EINVAL;



		*tag_id = ib_spec->flow_tag.tag_id;

		action->flow_tag = ib_spec->flow_tag.tag_id;

		break;

	case IB_FLOW_SPEC_ACTION_DROP:

		if (FIELDS_NOT_SUPPORTED(ib_spec->drop,

					 LAST_DROP_FIELD))

			return -EOPNOTSUPP;

		*is_drop = true;

		action->action |= MLX5_FLOW_CONTEXT_ACTION_DROP;

		break;

	default:

		return -EINVAL;
@@ -2793,13 +2793,11 @@ static struct mlx5_ib_flow_handler *_create_flow_rule(struct mlx5_ib_dev *dev, 
{

	struct mlx5_flow_table	*ft = ft_prio->flow_table;

	struct mlx5_ib_flow_handler *handler;

	struct mlx5_flow_act flow_act = {0};

	struct mlx5_flow_act flow_act = {.flow_tag = MLX5_FS_DEFAULT_FLOW_TAG};

	struct mlx5_flow_spec *spec;

	struct mlx5_flow_destination *rule_dst = dst;

	const void *ib_flow = (const void *)flow_attr + sizeof(*flow_attr);

	unsigned int spec_index;

	u32 flow_tag = MLX5_FS_DEFAULT_FLOW_TAG;

	bool is_drop = false;

	int err = 0;

	int dest_num = 1;
@@ -2818,7 +2816,7 @@ static struct mlx5_ib_flow_handler *_create_flow_rule(struct mlx5_ib_dev *dev, 
	for (spec_index = 0; spec_index < flow_attr->num_of_specs; spec_index++) {

		err = parse_flow_attr(dev->mdev, spec->match_criteria,

				      spec->match_value,

				      ib_flow, &flow_tag, &is_drop);

				      ib_flow, &flow_act);

		if (err < 0)

			goto free;
@@ -2841,8 +2839,7 @@ static struct mlx5_ib_flow_handler *_create_flow_rule(struct mlx5_ib_dev *dev, 
	}



	spec->match_criteria_enable = get_match_criteria_enable(spec->match_criteria);

	if (is_drop) {

		flow_act.action = MLX5_FLOW_CONTEXT_ACTION_DROP;

	if (flow_act.action & MLX5_FLOW_CONTEXT_ACTION_DROP) {

		rule_dst = NULL;

		dest_num = 0;

	} else {
@@ -2850,15 +2847,14 @@ static struct mlx5_ib_flow_handler *_create_flow_rule(struct mlx5_ib_dev *dev, 
		    MLX5_FLOW_CONTEXT_ACTION_FWD_NEXT_PRIO;

	}



	if (flow_tag != MLX5_FS_DEFAULT_FLOW_TAG &&

	if (flow_act.flow_tag != MLX5_FS_DEFAULT_FLOW_TAG &&

	    (flow_attr->type == IB_FLOW_ATTR_ALL_DEFAULT ||

	     flow_attr->type == IB_FLOW_ATTR_MC_DEFAULT)) {

		mlx5_ib_warn(dev, "Flow tag %u and attribute type %x isn't allowed in leftovers\n",

			     flow_tag, flow_attr->type);

			     flow_act.flow_tag, flow_attr->type);

		err = -EINVAL;

		goto free;

	}

	flow_act.flow_tag = flow_tag;

	handler->rule = mlx5_add_flow_rules(ft, spec,

					    &flow_act,

					    rule_dst, dest_num);