patch 'net/mlx5: fix RSS expansion for patterns with ICMP item' has been queued to stable release 20.11.6

Xueming Li xuemingl at nvidia.com
Wed Jul 20 10:21:02 CEST 2022
Previous message (by thread): patch 'net/mlx5: fix build with clang 14' has been queued to stable release 20.11.6
Next message (by thread): patch 'net/mlx5: fix stack buffer overflow in drop action' has been queued to stable release 20.11.6
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
Hi,

FYI, your patch has been queued to stable release 20.11.6

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

This queued commit can be viewed at:
https://github.com/steevenlee/dpdk/commit/f371572a7670ed7d52a25173af7fb463cbb4ee53

Thanks.

Xueming Li <xuemingl at nvidia.com>

---
>From f371572a7670ed7d52a25173af7fb463cbb4ee53 Mon Sep 17 00:00:00 2001
From: Gregory Etelson <getelson at nvidia.com>
Date: Fri, 17 Jun 2022 08:22:38 +0300
Subject: [PATCH] net/mlx5: fix RSS expansion for patterns with ICMP item
Cc: Xueming Li <xuemingl at nvidia.com>

[ upstream commit 57d6a458a8b8d2f41598b6f8f8d9459b34d1dd8f ]

MLX5 PMD RSS expansion implementation added L4 UDP or TCP
headers after ICMP.
For example:
ETH / IPv4 / ICMP expanded into  ETH / IPv4 / ICMP / {UDP | TCP}
ETH / IPv6 / ICMPv6 expanded into  ETH / IPv6 / ICMPv6 / {UDP | TCP}

The patch updates PMD expansion scheme to handle ICMP and ICMPv6 types
as non-expandable for RSS.

Fixes: c7870bfe09dc ("ethdev: move RSS expansion code to mlx5 driver")

Signed-off-by: Gregory Etelson <getelson at nvidia.com>
Acked-by: Matan Azrad <matan at nvidia.com>
---
 drivers/net/mlx5/mlx5_flow.c | 24 +++++++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

diff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c
index cee8bc3418..7a149ab761 100644
--- a/drivers/net/mlx5/mlx5_flow.c
+++ b/drivers/net/mlx5/mlx5_flow.c
@@ -148,6 +148,8 @@ mlx5_flow_is_rss_expandable_item(const struct rte_flow_item *item)
 	case RTE_FLOW_ITEM_TYPE_IPV6:
 	case RTE_FLOW_ITEM_TYPE_UDP:
 	case RTE_FLOW_ITEM_TYPE_TCP:
+	case RTE_FLOW_ITEM_TYPE_ICMP:
+	case RTE_FLOW_ITEM_TYPE_ICMP6:
 	case RTE_FLOW_ITEM_TYPE_VXLAN:
 	case RTE_FLOW_ITEM_TYPE_NVGRE:
 	case RTE_FLOW_ITEM_TYPE_GRE:
@@ -557,9 +559,11 @@ enum mlx5_expansion {
 	MLX5_EXPANSION_OUTER_IPV4,
 	MLX5_EXPANSION_OUTER_IPV4_UDP,
 	MLX5_EXPANSION_OUTER_IPV4_TCP,
+	MLX5_EXPANSION_OUTER_IPV4_ICMP,
 	MLX5_EXPANSION_OUTER_IPV6,
 	MLX5_EXPANSION_OUTER_IPV6_UDP,
 	MLX5_EXPANSION_OUTER_IPV6_TCP,
+	MLX5_EXPANSION_OUTER_IPV6_ICMP6,
 	MLX5_EXPANSION_VXLAN,
 	MLX5_EXPANSION_STD_VXLAN,
 	MLX5_EXPANSION_L3_VXLAN,
@@ -573,9 +577,11 @@ enum mlx5_expansion {
 	MLX5_EXPANSION_IPV4,
 	MLX5_EXPANSION_IPV4_UDP,
 	MLX5_EXPANSION_IPV4_TCP,
+	MLX5_EXPANSION_IPV4_ICMP,
 	MLX5_EXPANSION_IPV6,
 	MLX5_EXPANSION_IPV6_UDP,
 	MLX5_EXPANSION_IPV6_TCP,
+	MLX5_EXPANSION_IPV6_ICMP6,
 	MLX5_EXPANSION_IPV6_FRAG_EXT,
 	MLX5_EXPANSION_GTP,
 	MLX5_EXPANSION_GENEVE,
@@ -610,6 +616,7 @@ static const struct mlx5_flow_expand_node mlx5_support_expansion[] = {
 		.next = MLX5_FLOW_EXPAND_RSS_NEXT
 			(MLX5_EXPANSION_OUTER_IPV4_UDP,
 			 MLX5_EXPANSION_OUTER_IPV4_TCP,
+			 MLX5_EXPANSION_OUTER_IPV4_ICMP,
 			 MLX5_EXPANSION_GRE,
 			 MLX5_EXPANSION_NVGRE,
 			 MLX5_EXPANSION_IPV4,
@@ -631,10 +638,14 @@ static const struct mlx5_flow_expand_node mlx5_support_expansion[] = {
 		.type = RTE_FLOW_ITEM_TYPE_TCP,
 		.rss_types = ETH_RSS_NONFRAG_IPV4_TCP,
 	},
+	[MLX5_EXPANSION_OUTER_IPV4_ICMP] = {
+		.type = RTE_FLOW_ITEM_TYPE_ICMP,
+	},
 	[MLX5_EXPANSION_OUTER_IPV6] = {
 		.next = MLX5_FLOW_EXPAND_RSS_NEXT
 			(MLX5_EXPANSION_OUTER_IPV6_UDP,
 			 MLX5_EXPANSION_OUTER_IPV6_TCP,
+			 MLX5_EXPANSION_OUTER_IPV6_ICMP6,
 			 MLX5_EXPANSION_IPV4,
 			 MLX5_EXPANSION_IPV6,
 			 MLX5_EXPANSION_GRE,
@@ -656,6 +667,9 @@ static const struct mlx5_flow_expand_node mlx5_support_expansion[] = {
 		.type = RTE_FLOW_ITEM_TYPE_TCP,
 		.rss_types = ETH_RSS_NONFRAG_IPV6_TCP,
 	},
+	[MLX5_EXPANSION_OUTER_IPV6_ICMP6] = {
+		.type = RTE_FLOW_ITEM_TYPE_ICMP6,
+	},
 	[MLX5_EXPANSION_VXLAN] = {
 		.next = MLX5_FLOW_EXPAND_RSS_NEXT(MLX5_EXPANSION_ETH,
 						  MLX5_EXPANSION_IPV4,
@@ -715,7 +729,8 @@ static const struct mlx5_flow_expand_node mlx5_support_expansion[] = {
 	},
 	[MLX5_EXPANSION_IPV4] = {
 		.next = MLX5_FLOW_EXPAND_RSS_NEXT(MLX5_EXPANSION_IPV4_UDP,
-						  MLX5_EXPANSION_IPV4_TCP),
+						  MLX5_EXPANSION_IPV4_TCP,
+						  MLX5_EXPANSION_IPV4_ICMP),
 		.type = RTE_FLOW_ITEM_TYPE_IPV4,
 		.rss_types = ETH_RSS_IPV4 | ETH_RSS_FRAG_IPV4 |
 			ETH_RSS_NONFRAG_IPV4_OTHER,
@@ -728,9 +743,13 @@ static const struct mlx5_flow_expand_node mlx5_support_expansion[] = {
 		.type = RTE_FLOW_ITEM_TYPE_TCP,
 		.rss_types = ETH_RSS_NONFRAG_IPV4_TCP,
 	},
+	[MLX5_EXPANSION_IPV4_ICMP] = {
+		.type = RTE_FLOW_ITEM_TYPE_ICMP,
+	},
 	[MLX5_EXPANSION_IPV6] = {
 		.next = MLX5_FLOW_EXPAND_RSS_NEXT(MLX5_EXPANSION_IPV6_UDP,
 						  MLX5_EXPANSION_IPV6_TCP,
+						  MLX5_EXPANSION_IPV6_ICMP6,
 						  MLX5_EXPANSION_IPV6_FRAG_EXT),
 		.type = RTE_FLOW_ITEM_TYPE_IPV6,
 		.rss_types = ETH_RSS_IPV6 | ETH_RSS_FRAG_IPV6 |
@@ -747,6 +766,9 @@ static const struct mlx5_flow_expand_node mlx5_support_expansion[] = {
 	[MLX5_EXPANSION_IPV6_FRAG_EXT] = {
 		.type = RTE_FLOW_ITEM_TYPE_IPV6_FRAG_EXT,
 	},
+	[MLX5_EXPANSION_IPV6_ICMP6] = {
+		.type = RTE_FLOW_ITEM_TYPE_ICMP6,
+	},
 	[MLX5_EXPANSION_GTP] = {
 			.next = MLX5_FLOW_EXPAND_RSS_NEXT(MLX5_EXPANSION_IPV4,
 							  MLX5_EXPANSION_IPV6),
-- 
2.35.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2022-07-20 15:01:00.341781287 +0800
+++ 0033-net-mlx5-fix-RSS-expansion-for-patterns-with-ICMP-it.patch	2022-07-20 15:00:58.737667120 +0800
@@ -1 +1 @@
-From 57d6a458a8b8d2f41598b6f8f8d9459b34d1dd8f Mon Sep 17 00:00:00 2001
+From f371572a7670ed7d52a25173af7fb463cbb4ee53 Mon Sep 17 00:00:00 2001
@@ -4,0 +5,3 @@
+Cc: Xueming Li <xuemingl at nvidia.com>
+
+[ upstream commit 57d6a458a8b8d2f41598b6f8f8d9459b34d1dd8f ]
@@ -16 +18,0 @@
-Cc: stable at dpdk.org
@@ -25 +27 @@
-index 090de0366b..900ec8e4bc 100644
+index cee8bc3418..7a149ab761 100644
@@ -28 +30,2 @@
-@@ -150,6 +150,8 @@ mlx5_flow_is_rss_expandable_item(const struct rte_flow_item *item)
+@@ -148,6 +148,8 @@ mlx5_flow_is_rss_expandable_item(const struct rte_flow_item *item)
+ 	case RTE_FLOW_ITEM_TYPE_IPV6:
@@ -31 +33,0 @@
- 	case RTE_FLOW_ITEM_TYPE_ESP:
@@ -37 +39,2 @@
-@@ -563,10 +565,12 @@ enum mlx5_expansion {
+@@ -557,9 +559,11 @@ enum mlx5_expansion {
+ 	MLX5_EXPANSION_OUTER_IPV4,
@@ -40 +42,0 @@
- 	MLX5_EXPANSION_OUTER_IPV4_ESP,
@@ -45 +46,0 @@
- 	MLX5_EXPANSION_OUTER_IPV6_ESP,
@@ -50 +51,2 @@
-@@ -581,10 +585,12 @@ enum mlx5_expansion {
+@@ -573,9 +577,11 @@ enum mlx5_expansion {
+ 	MLX5_EXPANSION_IPV4,
@@ -53 +54,0 @@
- 	MLX5_EXPANSION_IPV4_ESP,
@@ -58 +58,0 @@
- 	MLX5_EXPANSION_IPV6_ESP,
@@ -63 +63,2 @@
-@@ -620,6 +626,7 @@ static const struct mlx5_flow_expand_node mlx5_support_expansion[] = {
+@@ -610,6 +616,7 @@ static const struct mlx5_flow_expand_node mlx5_support_expansion[] = {
+ 		.next = MLX5_FLOW_EXPAND_RSS_NEXT
@@ -66 +66,0 @@
- 			 MLX5_EXPANSION_OUTER_IPV4_ESP,
@@ -71,3 +71,3 @@
-@@ -645,11 +652,15 @@ static const struct mlx5_flow_expand_node mlx5_support_expansion[] = {
- 		.type = RTE_FLOW_ITEM_TYPE_ESP,
- 		.rss_types = RTE_ETH_RSS_ESP,
+@@ -631,10 +638,14 @@ static const struct mlx5_flow_expand_node mlx5_support_expansion[] = {
+ 		.type = RTE_FLOW_ITEM_TYPE_TCP,
+ 		.rss_types = ETH_RSS_NONFRAG_IPV4_TCP,
@@ -82 +81,0 @@
- 			 MLX5_EXPANSION_OUTER_IPV6_ESP,
@@ -87,3 +86,3 @@
-@@ -675,6 +686,9 @@ static const struct mlx5_flow_expand_node mlx5_support_expansion[] = {
- 		.type = RTE_FLOW_ITEM_TYPE_ESP,
- 		.rss_types = RTE_ETH_RSS_ESP,
+@@ -656,6 +667,9 @@ static const struct mlx5_flow_expand_node mlx5_support_expansion[] = {
+ 		.type = RTE_FLOW_ITEM_TYPE_TCP,
+ 		.rss_types = ETH_RSS_NONFRAG_IPV6_TCP,
@@ -97 +96,2 @@
-@@ -735,7 +749,8 @@ static const struct mlx5_flow_expand_node mlx5_support_expansion[] = {
+@@ -715,7 +729,8 @@ static const struct mlx5_flow_expand_node mlx5_support_expansion[] = {
+ 	},
@@ -100,3 +100,2 @@
- 						  MLX5_EXPANSION_IPV4_TCP,
--						  MLX5_EXPANSION_IPV4_ESP),
-+						  MLX5_EXPANSION_IPV4_ESP,
+-						  MLX5_EXPANSION_IPV4_TCP),
++						  MLX5_EXPANSION_IPV4_TCP,
@@ -105,5 +104,5 @@
- 		.rss_types = RTE_ETH_RSS_IPV4 | RTE_ETH_RSS_FRAG_IPV4 |
- 			RTE_ETH_RSS_NONFRAG_IPV4_OTHER,
-@@ -752,10 +767,14 @@ static const struct mlx5_flow_expand_node mlx5_support_expansion[] = {
- 		.type = RTE_FLOW_ITEM_TYPE_ESP,
- 		.rss_types = RTE_ETH_RSS_ESP,
+ 		.rss_types = ETH_RSS_IPV4 | ETH_RSS_FRAG_IPV4 |
+ 			ETH_RSS_NONFRAG_IPV4_OTHER,
+@@ -728,9 +743,13 @@ static const struct mlx5_flow_expand_node mlx5_support_expansion[] = {
+ 		.type = RTE_FLOW_ITEM_TYPE_TCP,
+ 		.rss_types = ETH_RSS_NONFRAG_IPV4_TCP,
@@ -117 +115,0 @@
- 						  MLX5_EXPANSION_IPV6_ESP,
@@ -121,2 +119,2 @@
- 		.rss_types = RTE_ETH_RSS_IPV6 | RTE_ETH_RSS_FRAG_IPV6 |
-@@ -776,6 +795,9 @@ static const struct mlx5_flow_expand_node mlx5_support_expansion[] = {
+ 		.rss_types = ETH_RSS_IPV6 | ETH_RSS_FRAG_IPV6 |
+@@ -747,6 +766,9 @@ static const struct mlx5_flow_expand_node mlx5_support_expansion[] = {
@@ -130,2 +128,2 @@
- 		.next = MLX5_FLOW_EXPAND_RSS_NEXT(MLX5_EXPANSION_IPV4,
- 						  MLX5_EXPANSION_IPV6),
+ 			.next = MLX5_FLOW_EXPAND_RSS_NEXT(MLX5_EXPANSION_IPV4,
+ 							  MLX5_EXPANSION_IPV6),
Previous message (by thread): patch 'net/mlx5: fix build with clang 14' has been queued to stable release 20.11.6
Next message (by thread): patch 'net/mlx5: fix stack buffer overflow in drop action' has been queued to stable release 20.11.6
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
More information about the stable mailing list