patch 'net/mlx5: fix port matching in sample flow rule' has been queued to stable release 20.11.5

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 20.11.5

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 03/19/22. So please
shout if anyone has objections.

Also note that after the patch there's a diff of the upstream commit vs the
patch applied to the branch. This will indicate if there was any rebasing
needed to apply to the stable branch. If there were code changes for rebasing
(ie: not only metadata diffs), please double check that the rebase was
correctly done.

Queued patches are on a temporary branch at:
https://github.com/bluca/dpdk-stable

This queued commit can be viewed at:
https://github.com/bluca/dpdk-stable/commit/1d25333ce0a0b615ee571078a7b3f270beb306d9

Thanks.

Luca Boccassi

---
>From 1d25333ce0a0b615ee571078a7b3f270beb306d9 Mon Sep 17 00:00:00 2001
From: Jiawei Wang <jiaweiw at nvidia.com>
Date: Mon, 7 Mar 2022 04:10:42 +0200
Subject: [PATCH] net/mlx5: fix port matching in sample flow rule

[ upstream commit 04c0d3f20f54618c2b62f353b31b5a2fb20d687a ]

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

Signed-off-by: Jiawei Wang <jiaweiw at nvidia.com>
Acked-by: Viacheslav Ovsiienko <viacheslavo at nvidia.com>
---
 drivers/net/mlx5/mlx5_flow.c | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c
index bed853e726..cee8bc3418 100644
--- a/drivers/net/mlx5/mlx5_flow.c
+++ b/drivers/net/mlx5/mlx5_flow.c
@@ -4714,7 +4714,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.
@@ -4753,6 +4753,7 @@ flow_check_match_action(const struct rte_flow_action actions[],
 static int
 flow_sample_split_prep(struct rte_eth_dev *dev,
 		       uint32_t fdb_tx,
+		       const struct rte_flow_item items[],
 		       struct rte_flow_item sfx_items[],
 		       const struct rte_flow_action actions[],
 		       struct rte_flow_action actions_sfx[],
@@ -4792,6 +4793,12 @@ flow_sample_split_prep(struct rte_eth_dev *dev,
 				  [MLX5_IPOOL_RSS_EXPANTION_FLOW_ID], &tag_id);
 		set_tag->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;
@@ -5263,7 +5270,7 @@ flow_create_split_sample(struct rte_eth_dev *dev,
 			sfx_items = (struct rte_flow_item *)((char *)sfx_actions
 					+ act_size);
 		pre_actions = sfx_actions + actions_n;
-		tag_id = flow_sample_split_prep(dev, fdb_tx, sfx_items,
+		tag_id = flow_sample_split_prep(dev, fdb_tx, items, sfx_items,
 						actions, sfx_actions,
 						pre_actions, actions_n,
 						sample_action_pos,
-- 
2.34.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2022-03-17 12:05:30.337012733 +0000
+++ 0001-net-mlx5-fix-port-matching-in-sample-flow-rule.patch	2022-03-17 12:05:30.300855283 +0000
@@ -1 +1 @@
-From 04c0d3f20f54618c2b62f353b31b5a2fb20d687a Mon Sep 17 00:00:00 2001
+From 1d25333ce0a0b615ee571078a7b3f270beb306d9 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 04c0d3f20f54618c2b62f353b31b5a2fb20d687a ]
+
@@ -17 +18,0 @@
-Cc: stable at dpdk.org
@@ -26 +27 @@
-index cd55bdc2c0..78cb38d42b 100644
+index bed853e726..cee8bc3418 100644
@@ -29 +30 @@
-@@ -5783,7 +5783,7 @@ flow_check_match_action(const struct rte_flow_action actions[],
+@@ -4714,7 +4714,7 @@ flow_check_match_action(const struct rte_flow_action actions[],
@@ -38 +39 @@
-@@ -5824,6 +5824,7 @@ flow_check_match_action(const struct rte_flow_action actions[],
+@@ -4753,6 +4753,7 @@ flow_check_match_action(const struct rte_flow_action actions[],
@@ -41 +42 @@
- 		       int add_tag,
+ 		       uint32_t fdb_tx,
@@ -46,3 +47,3 @@
-@@ -5951,6 +5952,12 @@ flow_sample_split_prep(struct rte_eth_dev *dev,
- 			.data = tag_id,
- 		};
+@@ -4792,6 +4793,12 @@ flow_sample_split_prep(struct rte_eth_dev *dev,
+ 				  [MLX5_IPOOL_RSS_EXPANTION_FLOW_ID], &tag_id);
+ 		set_tag->data = tag_id;
@@ -59,3 +60,3 @@
-@@ -6563,7 +6570,7 @@ flow_create_split_sample(struct rte_eth_dev *dev,
- 			jump_table = attr->group * MLX5_FLOW_TABLE_FACTOR +
- 				     next_ft_step;
+@@ -5263,7 +5270,7 @@ flow_create_split_sample(struct rte_eth_dev *dev,
+ 			sfx_items = (struct rte_flow_item *)((char *)sfx_actions
+ 					+ act_size);
@@ -63,2 +64,2 @@
--		tag_id = flow_sample_split_prep(dev, add_tag, sfx_items,
-+		tag_id = flow_sample_split_prep(dev, add_tag, items, sfx_items,
+-		tag_id = flow_sample_split_prep(dev, fdb_tx, sfx_items,
++		tag_id = flow_sample_split_prep(dev, fdb_tx, items, sfx_items,