[dpdk-stable] patch 'net/mlx5: fix meter header modify before decap' has been queued to stable release 19.11.1

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 19.11.1

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 02/19/20. 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.

Thanks.

Luca Boccassi

---
>From e32739c056ce736ff67511b964181229e6a86d75 Mon Sep 17 00:00:00 2001
From: Suanming Mou <suanmingm at mellanox.com>
Date: Thu, 6 Feb 2020 06:14:25 +0200
Subject: [PATCH] net/mlx5: fix meter header modify before decap

[ upstream commit 431f199883e5b7eeea87a2f9f0272daf3354c1da ]

The meter flows are split into three subflows each, the prefix subflow
with meter action color the packet, the meter subflow filters out the
colored packets, the suffix subflow applies all the remaining actions
to the passed packets. The tag header modify action is added to the
prefix subflow to make the suffix subflow to match the packets from the
prefix subflow.

Currently, the tag header modify action is added at the beginning in the
prefix subflow even before decap action. The header modify action does
not make sense to the later decap action, so the flow create will be
validated as incorrect flow rule and failed.

Move the tag header modify action just before meter action in the prefix
subflow to make the flow with decap action to do the decap first, then
do the tag and meter to fix that issue.

Fixes: 9ea9b049a960 ("net/mlx5: split meter flow")

Reported-by: Tonghao Zhang <xiangxia.m.yue at gmail.com>
Signed-off-by: Suanming Mou <suanmingm at mellanox.com>
Acked-by: Viacheslav Ovsiienko <viacheslavo at mellanox.com>
Acked-by: Matan Azrad <matan at mellanox.com>
---
 drivers/net/mlx5/mlx5_flow.c | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c
index 45df610a91..07979a09cb 100644
--- a/drivers/net/mlx5/mlx5_flow.c
+++ b/drivers/net/mlx5/mlx5_flow.c
@@ -3471,21 +3471,25 @@ flow_meter_split_prep(struct rte_eth_dev *dev,
 		 struct rte_flow_action actions_sfx[],
 		 struct rte_flow_action actions_pre[])
 {
-	struct rte_flow_action *tag_action;
+	struct rte_flow_action *tag_action = NULL;
 	struct mlx5_rte_flow_action_set_tag *set_tag;
 	struct rte_flow_error error;
 	const struct rte_flow_action_raw_encap *raw_encap;
 	const struct rte_flow_action_raw_decap *raw_decap;
 	uint32_t tag_id;
 
-	/* Add the extra tag action first. */
-	tag_action = actions_pre;
-	tag_action->type = MLX5_RTE_FLOW_ACTION_TYPE_TAG;
-	actions_pre++;
 	/* Prepare the actions for prefix and suffix flow. */
 	for (; actions->type != RTE_FLOW_ACTION_TYPE_END; actions++) {
 		switch (actions->type) {
 		case RTE_FLOW_ACTION_TYPE_METER:
+			/* Add the extra tag action first. */
+			tag_action = actions_pre;
+			tag_action->type = MLX5_RTE_FLOW_ACTION_TYPE_TAG;
+			actions_pre++;
+			memcpy(actions_pre, actions,
+			       sizeof(struct rte_flow_action));
+			actions_pre++;
+			break;
 		case RTE_FLOW_ACTION_TYPE_VXLAN_DECAP:
 		case RTE_FLOW_ACTION_TYPE_NVGRE_DECAP:
 			memcpy(actions_pre, actions,
@@ -3540,6 +3544,7 @@ flow_meter_split_prep(struct rte_eth_dev *dev,
 	 */
 	tag_id = flow_qrss_get_id(dev);
 	set_tag->data = rte_cpu_to_be_32(tag_id);
+	assert(tag_action);
 	tag_action->conf = set_tag;
 	return tag_id;
 }
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-02-17 17:00:16.139870279 +0000
+++ 0029-net-mlx5-fix-meter-header-modify-before-decap.patch	2020-02-17 17:00:15.347951022 +0000
@@ -1,8 +1,10 @@
-From 431f199883e5b7eeea87a2f9f0272daf3354c1da Mon Sep 17 00:00:00 2001
+From e32739c056ce736ff67511b964181229e6a86d75 Mon Sep 17 00:00:00 2001
 From: Suanming Mou <suanmingm at mellanox.com>
 Date: Thu, 6 Feb 2020 06:14:25 +0200
 Subject: [PATCH] net/mlx5: fix meter header modify before decap
 
+[ upstream commit 431f199883e5b7eeea87a2f9f0272daf3354c1da ]
+
 The meter flows are split into three subflows each, the prefix subflow
 with meter action color the packet, the meter subflow filters out the
 colored packets, the suffix subflow applies all the remaining actions
@@ -20,7 +22,6 @@
 do the tag and meter to fix that issue.
 
 Fixes: 9ea9b049a960 ("net/mlx5: split meter flow")
-Cc: stable at dpdk.org
 
 Reported-by: Tonghao Zhang <xiangxia.m.yue at gmail.com>
 Signed-off-by: Suanming Mou <suanmingm at mellanox.com>
@@ -31,10 +32,10 @@
  1 file changed, 10 insertions(+), 5 deletions(-)
 
 diff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c
-index e05d7994e2..25482010d8 100644
+index 45df610a91..07979a09cb 100644
 --- a/drivers/net/mlx5/mlx5_flow.c
 +++ b/drivers/net/mlx5/mlx5_flow.c
-@@ -3476,21 +3476,25 @@ flow_meter_split_prep(struct rte_eth_dev *dev,
+@@ -3471,21 +3471,25 @@ flow_meter_split_prep(struct rte_eth_dev *dev,
  		 struct rte_flow_action actions_sfx[],
  		 struct rte_flow_action actions_pre[])
  {
@@ -65,10 +66,10 @@
  		case RTE_FLOW_ACTION_TYPE_VXLAN_DECAP:
  		case RTE_FLOW_ACTION_TYPE_NVGRE_DECAP:
  			memcpy(actions_pre, actions,
-@@ -3545,6 +3549,7 @@ flow_meter_split_prep(struct rte_eth_dev *dev,
+@@ -3540,6 +3544,7 @@ flow_meter_split_prep(struct rte_eth_dev *dev,
  	 */
  	tag_id = flow_qrss_get_id(dev);
- 	set_tag->data = tag_id << MLX5_MTR_COLOR_BITS;
+ 	set_tag->data = rte_cpu_to_be_32(tag_id);
 +	assert(tag_action);
  	tag_action->conf = set_tag;
  	return tag_id;