Skip to contentSkip to conversation

net/mlx5: fix the port match in sample flow

PATCH In review Jiawei Wang 3 participants 3 messages Mar 7, 2022 – Mar 10, 2022 Network drivers

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 net/mlx5: fix the port match in sample flow

If there are an explicit port match and sample action in the same flow, mlx5 PMD pushes the explicit port match in the prefix subflow, and uses the tag item match in the suffix subflow.

The explicit port match was translated into source vport match so the sample suffix subflow lost this match after flow split.

This patch copies the explicit port match to the sample suffix subflow, and the latter gets the correct source vport value in the flow matcher.

Fixes b4c0ddbfcc58 ("net/mlx5: split sample flow into two sub-flows")
---
 drivers/net/mlx5/mlx5_flow.c | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)
drivers/net/mlx5/mlx5_flow.c +9 -2
index 179cc3b303..34b8f97a14 100644
@@ -5543,7 +5543,7 @@ flow_check_match_action(const struct rte_flow_action actions[],
 	return flag ? actions_n + 1 : 0;
 }
 
-#define SAMPLE_SUFFIX_ITEM 2
+#define SAMPLE_SUFFIX_ITEM 3
 
 /**
  * Split the sample flow.
@@ -5584,6 +5584,7 @@ flow_check_match_action(const struct rte_flow_action actions[],
 static int
 flow_sample_split_prep(struct rte_eth_dev *dev,
 		       int add_tag,
+		       const struct rte_flow_item items[],
 		       struct rte_flow_item sfx_items[],
 		       const struct rte_flow_action actions[],
 		       struct rte_flow_action actions_sfx[],
@@ -5650,6 +5651,12 @@ flow_sample_split_prep(struct rte_eth_dev *dev,
 			.data = tag_id,
 		};
 		/* Prepare the suffix subflow items. */
+		for (; items->type != RTE_FLOW_ITEM_TYPE_END; items++) {
+			if (items->type == RTE_FLOW_ITEM_TYPE_PORT_ID) {
+				memcpy(sfx_items, items, sizeof(*sfx_items));
+				sfx_items++;
+			}
+		}
 		tag_spec = (void *)(sfx_items + SAMPLE_SUFFIX_ITEM);
 		tag_spec->data = tag_id;
 		tag_spec->id = set_tag->id;
@@ -6257,7 +6264,7 @@ flow_create_split_sample(struct rte_eth_dev *dev,
 			jump_table = attr->group * MLX5_FLOW_TABLE_FACTOR +
 				     next_ft_step;
 		pre_actions = sfx_actions + actions_n;
-		tag_id = flow_sample_split_prep(dev, add_tag, sfx_items,
+		tag_id = flow_sample_split_prep(dev, add_tag, items, sfx_items,
 						actions, sfx_actions,
 						pre_actions, actions_n,
 						sample_action_pos,
Signature · 1 line
2.18.1
Acked-by on v1 1/1
#1 lore raw
Quoted 16 lines

-----Original Message-----
From: Jiawei(Jonny) Wang <[email protected]>
Sent: Monday, March 7, 2022 4:11
To: Slava Ovsiienko <[email protected]>; Matan Azrad <[email protected]>; Ori Kam <[email protected]>
Cc: [email protected]; Raslan Darawsheh <[email protected]>; [email protected]
Subject: [PATCH] net/mlx5: fix the port match in sample flow

If there are an explicit port match and sample action in the same flow, mlx5 PMD pushes the explicit port match in the prefix subflow, and uses the tag item match in the suffix subflow.

The explicit port match was translated into source vport match so the sample suffix subflow lost this match after flow split.

Quoted 7 lines

This patch copies the explicit port match to the sample suffix subflow, and the latter gets the correct source vport value in the flow matcher.

Fixes b4c0ddbfcc58 ("net/mlx5: split sample flow into two sub-flows")
#2 lore raw
In reply to Jiawei Wang

Hi,

Quoted 16 lines

-----Original Message-----
From: Jiawei(Jonny) Wang <[email protected]>
Sent: Monday, March 7, 2022 4:11 AM
To: Slava Ovsiienko <[email protected]>; Matan Azrad <[email protected]>; Ori Kam <[email protected]>
Cc: [email protected]; Raslan Darawsheh <[email protected]>; [email protected]
Subject: [PATCH] net/mlx5: fix the port match in sample flow

If there are an explicit port match and sample action in the same flow, mlx5 PMD pushes the explicit port match in the prefix subflow, and uses the tag item match in the suffix subflow.

The explicit port match was translated into source vport match so the sample suffix subflow lost this match after flow split.

Quoted 7 lines

This patch copies the explicit port match to the sample suffix subflow, and the latter gets the correct source vport value in the flow matcher.

Fixes b4c0ddbfcc58 ("net/mlx5: split sample flow into two sub-flows")

Patch applied to next-net-mlx,

Kindest regards,
Raslan Darawsheh