[dpdk-stable] patch 'net/mlx5: fix tunnel flow priority' has been queued to LTS release 18.11.7

[Kevin Traynor <ktraynor@redhat.com>]

Hi,

FYI, your patch has been queued to LTS release 18.11.7

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/02/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.

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

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable-queue/commit/06766aca3e52c7681a270f5030e2c6bb852037fd

Thanks.

Kevin.

---
From 06766aca3e52c7681a270f5030e2c6bb852037fd Mon Sep 17 00:00:00 2001
From: Matan Azrad <matan@mellanox.com>
Date: Thu, 13 Feb 2020 13:03:25 +0000
Subject: [PATCH] net/mlx5: fix tunnel flow priority

[ upstream commit 050bfe033c2dcaff1f6cfb3110aa90bf80071513 ]

The PMD manages internally the priority of the flows in addition to the
user configured priority.

So, 2 flows with the same user priority may get different priority.

The method:
As much as the flow is more specific it gets higher priority
(higher means first to be matched).

In addition, When the user creates a RSS flow the PMD splits the flows
according to the flow RSS layers as the HW requests for RSS TIR.
The internal priority for each flow is decided by the flow last layer.
L2, L3 and L4 (L2 low and L4 high).

The tunnel layer was wrongly decided to be L4 all the time, even when
the flow is configured with inner-RSS.

Hence, the first RSS split which takes the tunnel layer priority all the
time will be matched before the more specific splits.

Change the priority of tunnel layer to be L2 when inner-RSS is
configured.

Fixes: d4a405186b73 ("net/mlx5: support tunnel RSS level")

Signed-off-by: Matan Azrad <matan@mellanox.com>
Acked-by: Ori Kam <orika@mellanox.com>
---
 drivers/net/mlx5/mlx5_flow_dv.c | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c
index a6c9137079..bc24c7cd56 100644
--- a/drivers/net/mlx5/mlx5_flow_dv.c
+++ b/drivers/net/mlx5/mlx5_flow_dv.c
@@ -2219,4 +2219,6 @@ flow_dv_translate(struct rte_eth_dev *dev,
 			flow_dv_translate_item_gre(match_mask, match_value,
 						   items, tunnel);
+			matcher.priority = flow->rss.level >= 2 ?
+				    MLX5_PRIORITY_MAP_L2 : MLX5_PRIORITY_MAP_L4;
 			last_item = MLX5_FLOW_LAYER_GRE;
 			break;
@@ -2224,4 +2226,6 @@ flow_dv_translate(struct rte_eth_dev *dev,
 			flow_dv_translate_item_nvgre(match_mask, match_value,
 						     items, tunnel);
+			matcher.priority = flow->rss.level >= 2 ?
+				    MLX5_PRIORITY_MAP_L2 : MLX5_PRIORITY_MAP_L4;
 			last_item = MLX5_FLOW_LAYER_GRE;
 			break;
@@ -2229,4 +2233,6 @@ flow_dv_translate(struct rte_eth_dev *dev,
 			flow_dv_translate_item_vxlan(match_mask, match_value,
 						     items, tunnel);
+			matcher.priority = flow->rss.level >= 2 ?
+				    MLX5_PRIORITY_MAP_L2 : MLX5_PRIORITY_MAP_L4;
 			last_item = MLX5_FLOW_LAYER_VXLAN;
 			break;
@@ -2235,4 +2241,6 @@ flow_dv_translate(struct rte_eth_dev *dev,
 							 match_value, items,
 							 tunnel);
+			matcher.priority = flow->rss.level >= 2 ?
+				    MLX5_PRIORITY_MAP_L2 : MLX5_PRIORITY_MAP_L4;
 			last_item = MLX5_FLOW_LAYER_VXLAN_GPE;
 			break;
@@ -2240,4 +2248,6 @@ flow_dv_translate(struct rte_eth_dev *dev,
 			flow_dv_translate_item_mpls(match_mask, match_value,
 						    items, last_item, tunnel);
+			matcher.priority = flow->rss.level >= 2 ?
+				    MLX5_PRIORITY_MAP_L2 : MLX5_PRIORITY_MAP_L4;
 			last_item = MLX5_FLOW_LAYER_MPLS;
 			break;
-- 
2.21.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-02-27 17:26:24.022545483 +0000
+++ 0006-net-mlx5-fix-tunnel-flow-priority.patch	2020-02-27 17:26:23.627831576 +0000
@@ -1 +1 @@
-From 050bfe033c2dcaff1f6cfb3110aa90bf80071513 Mon Sep 17 00:00:00 2001
+From 06766aca3e52c7681a270f5030e2c6bb852037fd Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 050bfe033c2dcaff1f6cfb3110aa90bf80071513 ]
+
@@ -30 +31,0 @@
-Cc: stable@dpdk.org
@@ -35,2 +36,2 @@
- drivers/net/mlx5/mlx5_flow_dv.c | 14 ++++++++++++++
- 1 file changed, 14 insertions(+)
+ drivers/net/mlx5/mlx5_flow_dv.c | 10 ++++++++++
+ 1 file changed, 10 insertions(+)
@@ -39 +40 @@
-index a9bb0b4f10..a8c8a585a4 100644
+index a6c9137079..bc24c7cd56 100644
@@ -42 +43 @@
-@@ -7621,4 +7621,6 @@ cnt_err:
+@@ -2219,4 +2219,6 @@ flow_dv_translate(struct rte_eth_dev *dev,
@@ -49 +50 @@
-@@ -7631,4 +7633,6 @@ cnt_err:
+@@ -2224,4 +2226,6 @@ flow_dv_translate(struct rte_eth_dev *dev,
@@ -56 +57 @@
-@@ -7636,4 +7640,6 @@ cnt_err:
+@@ -2229,4 +2233,6 @@ flow_dv_translate(struct rte_eth_dev *dev,
@@ -63 +64 @@
-@@ -7642,4 +7648,6 @@ cnt_err:
+@@ -2235,4 +2241,6 @@ flow_dv_translate(struct rte_eth_dev *dev,
@@ -70,8 +71 @@
-@@ -7647,4 +7655,6 @@ cnt_err:
- 			flow_dv_translate_item_geneve(match_mask, match_value,
- 						      items, tunnel);
-+			matcher.priority = flow->rss.level >= 2 ?
-+				    MLX5_PRIORITY_MAP_L2 : MLX5_PRIORITY_MAP_L4;
- 			last_item = MLX5_FLOW_LAYER_GENEVE;
- 			break;
-@@ -7652,4 +7662,6 @@ cnt_err:
+@@ -2240,4 +2248,6 @@ flow_dv_translate(struct rte_eth_dev *dev,
@@ -83,7 +76,0 @@
- 			break;
-@@ -7693,4 +7705,6 @@ cnt_err:
- 			flow_dv_translate_item_gtp(match_mask, match_value,
- 						   items, tunnel);
-+			matcher.priority = flow->rss.level >= 2 ?
-+				    MLX5_PRIORITY_MAP_L2 : MLX5_PRIORITY_MAP_L4;
- 			last_item = MLX5_FLOW_LAYER_GTP;