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

Commit a9db0ecf authored by Matan Barak's avatar Matan Barak Committed by Saeed Mahameed
Browse files

{net,IB}/mlx5: Add has_tag to mlx5_flow_act 



The has_tag member will indicate whether a tag action was specified
in flow specification.

A flow tag 0 = MLX5_FS_DEFAULT_FLOW_TAG is assumed a valid flow tag
that is currently used by mlx5 RDMA driver, whereas in HW flow_tag = 0
means that the user doesn't care about flow_tag.  HW always provide
a flow_tag = 0 if all flow tags requested on a specific flow are 0.

So we need a way (in the driver) to differentiate between a user really
requesting flow_tag = 0 and a user who does not care, in order to be
able to report conflicting flow tags on a specific flow.

Signed-off-by: default avatarMatan Barak <matanb@mellanox.com>
Reviewed-by: default avatarAviad Yehezkel <aviadye@mellanox.com>
Signed-off-by: default avatarSaeed Mahameed <saeedm@mellanox.com>
parent 075572d4

drivers/infiniband/hw/mlx5/main.c

+2 −1
Original line number Diff line number Diff line
@@ -2535,6 +2535,7 @@ static int parse_flow_attr(struct mlx5_core_dev *mdev, u32 *match_c, 
			return -EINVAL;



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

		action->has_flow_tag = true;

		break;

	case IB_FLOW_SPEC_ACTION_DROP:

		if (FIELDS_NOT_SUPPORTED(ib_spec->drop,
@@ -2847,7 +2848,7 @@ static struct mlx5_ib_flow_handler *_create_flow_rule(struct mlx5_ib_dev *dev, 
		    MLX5_FLOW_CONTEXT_ACTION_FWD_NEXT_PRIO;

	}



	if (flow_act.flow_tag != MLX5_FS_DEFAULT_FLOW_TAG &&

	if (flow_act.has_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",

drivers/net/ethernet/mellanox/mlx5/core/en_tc.c

+1 −0
Original line number Diff line number Diff line
@@ -675,6 +675,7 @@ mlx5e_tc_add_nic_flow(struct mlx5e_priv *priv, 
	struct mlx5_flow_destination dest[2] = {};

	struct mlx5_flow_act flow_act = {

		.action = attr->action,

		.has_flow_tag = true,

		.flow_tag = attr->flow_tag,

		.encap_id = 0,

	};

drivers/net/ethernet/mellanox/mlx5/core/fs_core.c

+1 −1
Original line number Diff line number Diff line
@@ -1443,7 +1443,7 @@ static int check_conflicting_ftes(struct fs_fte *fte, const struct mlx5_flow_act 
		return -EEXIST;

	}



	if (fte->flow_tag != flow_act->flow_tag) {

	if (flow_act->has_flow_tag && fte->flow_tag != flow_act->flow_tag) {

		mlx5_core_warn(get_dev(&fte->node),

			       "FTE flow tag %u already exists with different flow tag %u\n",

			       fte->flow_tag,

include/linux/mlx5/fs.h

+1 −0
Original line number Diff line number Diff line
@@ -141,6 +141,7 @@ void mlx5_destroy_flow_group(struct mlx5_flow_group *fg); 


struct mlx5_flow_act {

	u32 action;

	bool has_flow_tag;

	u32 flow_tag;

	u32 encap_id;

	u32 modify_id;