[dpdk-stable] patch 'net/mlx5: fix tunnel flow priority' 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/29/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 818e232a825a26d67a798cfa93566880857c82c7 Mon Sep 17 00:00:00 2001
From: Matan Azrad <matan at 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 at mellanox.com>
Acked-by: Ori Kam <orika at mellanox.com>
---
 drivers/net/mlx5/mlx5_flow_dv.c | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c
index 0d902f89fe..57d3b1357d 100644
--- a/drivers/net/mlx5/mlx5_flow_dv.c
+++ b/drivers/net/mlx5/mlx5_flow_dv.c
@@ -7295,6 +7295,8 @@ cnt_err:
 		case RTE_FLOW_ITEM_TYPE_GRE:
 			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;
 		case RTE_FLOW_ITEM_TYPE_GRE_KEY:
@@ -7305,27 +7307,37 @@ cnt_err:
 		case RTE_FLOW_ITEM_TYPE_NVGRE:
 			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;
 		case RTE_FLOW_ITEM_TYPE_VXLAN:
 			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;
 		case RTE_FLOW_ITEM_TYPE_VXLAN_GPE:
 			flow_dv_translate_item_vxlan_gpe(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_GPE;
 			break;
 		case RTE_FLOW_ITEM_TYPE_GENEVE:
 			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;
 		case RTE_FLOW_ITEM_TYPE_MPLS:
 			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;
 		case RTE_FLOW_ITEM_TYPE_MARK:
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-02-27 09:31:56.139405981 +0000
+++ 0009-net-mlx5-fix-tunnel-flow-priority.patch	2020-02-27 09:31:55.679945463 +0000
@@ -1,8 +1,10 @@
-From 050bfe033c2dcaff1f6cfb3110aa90bf80071513 Mon Sep 17 00:00:00 2001
+From 818e232a825a26d67a798cfa93566880857c82c7 Mon Sep 17 00:00:00 2001
 From: Matan Azrad <matan at 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.
 
@@ -27,19 +29,18 @@
 configured.
 
 Fixes: d4a405186b73 ("net/mlx5: support tunnel RSS level")
-Cc: stable at dpdk.org
 
 Signed-off-by: Matan Azrad <matan at mellanox.com>
 Acked-by: Ori Kam <orika at mellanox.com>
 ---
- drivers/net/mlx5/mlx5_flow_dv.c | 14 ++++++++++++++
- 1 file changed, 14 insertions(+)
+ drivers/net/mlx5/mlx5_flow_dv.c | 12 ++++++++++++
+ 1 file changed, 12 insertions(+)
 
 diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c
-index a9bb0b4f10..a8c8a585a4 100644
+index 0d902f89fe..57d3b1357d 100644
 --- a/drivers/net/mlx5/mlx5_flow_dv.c
 +++ b/drivers/net/mlx5/mlx5_flow_dv.c
-@@ -7620,6 +7620,8 @@ cnt_err:
+@@ -7295,6 +7295,8 @@ cnt_err:
  		case RTE_FLOW_ITEM_TYPE_GRE:
  			flow_dv_translate_item_gre(match_mask, match_value,
  						   items, tunnel);
@@ -48,7 +49,7 @@
  			last_item = MLX5_FLOW_LAYER_GRE;
  			break;
  		case RTE_FLOW_ITEM_TYPE_GRE_KEY:
-@@ -7630,27 +7632,37 @@ cnt_err:
+@@ -7305,27 +7307,37 @@ cnt_err:
  		case RTE_FLOW_ITEM_TYPE_NVGRE:
  			flow_dv_translate_item_nvgre(match_mask, match_value,
  						     items, tunnel);
@@ -86,15 +87,6 @@
  			last_item = MLX5_FLOW_LAYER_MPLS;
  			break;
  		case RTE_FLOW_ITEM_TYPE_MARK:
-@@ -7692,6 +7704,8 @@ cnt_err:
- 		case RTE_FLOW_ITEM_TYPE_GTP:
- 			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;
- 			break;
- 		default:
 -- 
 2.20.1