[dpdk-stable] patch 'net/mlx5: fix L3 VXLAN RSS expansion' 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 17d61f47de846dc3901cabfef961afc5e48cb7a6 Mon Sep 17 00:00:00 2001
From: Matan Azrad <matan at mellanox.com>
Date: Wed, 19 Feb 2020 08:29:36 +0000
Subject: [PATCH] net/mlx5: fix L3 VXLAN RSS expansion

[ upstream commit cd04052475995caffc1d59a199260b86f32242cc ]

The RSS expansion feature was introduced to split RSS flows according to
the adjustment between the RSS types and the flow items.

The expansion function gets an item tree for the above adjustment from
the caller which reflects the HW needs.

The standard vxlan header next protocol is always Ethernet while there
are some Mellanox customers who use their own method to allow L3
headers after the vxlan tunnel header.

The expansion tree of mlx5 PMD didn't expect to get L3 headers after the
vxlan header what caused a failure in flow creation when inner RSS is
requested on L3 after vxlan flow.

Add IPV4 and IPV6 as optional headers after vxlan in the RSS expansion
tree to allow L3 tunnel support for vxlan.

Fixes: f4f06e361516 ("net/mlx5: add flow VXLAN item")

Signed-off-by: Matan Azrad <matan at mellanox.com>
Acked-by: Viacheslav Ovsiienko <viacheslavo at mellanox.com>
---
 drivers/net/mlx5/mlx5_flow.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c
index b2ab5491ce..a7ddc161c8 100644
--- a/drivers/net/mlx5/mlx5_flow.c
+++ b/drivers/net/mlx5/mlx5_flow.c
@@ -165,7 +165,9 @@ static const struct rte_flow_expand_node mlx5_support_expansion[] = {
 		.rss_types = ETH_RSS_NONFRAG_IPV6_TCP,
 	},
 	[MLX5_EXPANSION_VXLAN] = {
-		.next = RTE_FLOW_EXPAND_RSS_NEXT(MLX5_EXPANSION_ETH),
+		.next = RTE_FLOW_EXPAND_RSS_NEXT(MLX5_EXPANSION_ETH,
+						 MLX5_EXPANSION_IPV4,
+						 MLX5_EXPANSION_IPV6),
 		.type = RTE_FLOW_ITEM_TYPE_VXLAN,
 	},
 	[MLX5_EXPANSION_VXLAN_GPE] = {
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-02-27 09:31:56.456237294 +0000
+++ 0019-net-mlx5-fix-L3-VXLAN-RSS-expansion.patch	2020-02-27 09:31:55.739945903 +0000
@@ -1,8 +1,10 @@
-From cd04052475995caffc1d59a199260b86f32242cc Mon Sep 17 00:00:00 2001
+From 17d61f47de846dc3901cabfef961afc5e48cb7a6 Mon Sep 17 00:00:00 2001
 From: Matan Azrad <matan at mellanox.com>
 Date: Wed, 19 Feb 2020 08:29:36 +0000
 Subject: [PATCH] net/mlx5: fix L3 VXLAN RSS expansion
 
+[ upstream commit cd04052475995caffc1d59a199260b86f32242cc ]
+
 The RSS expansion feature was introduced to split RSS flows according to
 the adjustment between the RSS types and the flow items.
 
@@ -21,7 +23,6 @@
 tree to allow L3 tunnel support for vxlan.
 
 Fixes: f4f06e361516 ("net/mlx5: add flow VXLAN item")
-Cc: stable at dpdk.org
 
 Signed-off-by: Matan Azrad <matan at mellanox.com>
 Acked-by: Viacheslav Ovsiienko <viacheslavo at mellanox.com>
@@ -30,10 +31,10 @@
  1 file changed, 3 insertions(+), 1 deletion(-)
 
 diff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c
-index eb6bd274e5..ce5adede30 100644
+index b2ab5491ce..a7ddc161c8 100644
 --- a/drivers/net/mlx5/mlx5_flow.c
 +++ b/drivers/net/mlx5/mlx5_flow.c
-@@ -167,7 +167,9 @@ static const struct rte_flow_expand_node mlx5_support_expansion[] = {
+@@ -165,7 +165,9 @@ static const struct rte_flow_expand_node mlx5_support_expansion[] = {
  		.rss_types = ETH_RSS_NONFRAG_IPV6_TCP,
  	},
  	[MLX5_EXPANSION_VXLAN] = {