From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 7CD90A00C5 for ; Wed, 20 Jul 2022 10:24:47 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 78F3D40697; Wed, 20 Jul 2022 10:24:47 +0200 (CEST) Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on2049.outbound.protection.outlook.com [40.107.220.49]) by mails.dpdk.org (Postfix) with ESMTP id 81BD041101 for ; Wed, 20 Jul 2022 10:24:45 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=jqHFbDSLMspwniWvMGQHmN/8VT/1ok9ew/FwhLUThjpAI873YqjCkNINd4yFALqUh7z3k0LwZ1Q7OEf6nikvnzjnK9liogEcco1zp4KZ5rDYEWLlyysDS0Ley/4MRyv1qc5fbaecgrjl0wxQULwbliYdxxExAlE8k3xbmGAdK2a04P8WvV73ME9NGdQpxK6lD1dUtFfnpAFz40/ZKeRc3l1KBSl5UXQe2qnjqVdhtgvvCOMoV76ezP6SC2Qd3J6ScbLlDB/tGO7jawIQjDuj3ZcXVAsa5ugNFFH3PiEUDzpG4Ssftdq+djnoAxt82+4LVEjJxywGkpJYv4gOZg8GIg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=UZsaYi7rN6vyhylMnwwhWbkVrQcOsRdjIpcJQdMfV4Q=; b=Th5fFCh/NaKhvGsBXn5B2td8RFHm4TYN6KOwN6aW0sVTH/KFR0N3v617kyQS54Ws7OGe1T8PXcFCqCc1TrrkH/ujyLwG1hPnsVWy/wnzhWvuOP3ipP7Vszm/wZoIhK7SnI/vaAW9NT6fvA9LouY1pMzwEkTL/VyBhK5rnSvKgEtWU6OCejeNK4+Fy3EpcoBm9G6t6dii18KE7INtjv8HkJoLRy9aj+BYyYeuCHzQ+w1hfeYvfi2YiRknjPV6FOlhnPEfduZqJG70h9kkolAE8apk+MsES/ODeIojaFG6+xzlp+ZuKnDNZ21xYZ8USP2cV8TfvNQjAeT1upgmWQWc3Q== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 12.22.5.235) smtp.rcpttodomain=dpdk.org smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=UZsaYi7rN6vyhylMnwwhWbkVrQcOsRdjIpcJQdMfV4Q=; b=sRmF7N8y76ooV6fW7EwsALxMQacS0JBZBaiVxFOlrffWwfc9Dss/TIIMTpGJfdMka/TbmCHh+bD2V/E189PuFp30Gc78fIAxM/vWKBQi8O24YFL0OVbWNc8T6JNwihvwXJyDc4Dd4Rnw2TicBfVjOe7m4wKaJ5DnNufz1R6VaZqNnSVbObReQ3rJuCwDv7zZcXX+M6OK2tUSKzPunixUYtenpI2z93ALHb5ByLynxdIiwdIXTPpJTefgAnA9NMnXhrGM3deiZfS1F+sPc25ILOge9vHc6KC4spSVODCqLuMhHFMepKWDUy9AiU/T3Duvi63JLv9xuVyXl0VemeGTrw== Received: from MW4P220CA0019.NAMP220.PROD.OUTLOOK.COM (2603:10b6:303:115::24) by MN2PR12MB3376.namprd12.prod.outlook.com (2603:10b6:208:c2::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5438.21; Wed, 20 Jul 2022 08:24:43 +0000 Received: from CO1NAM11FT029.eop-nam11.prod.protection.outlook.com (2603:10b6:303:115:cafe::3c) by MW4P220CA0019.outlook.office365.com (2603:10b6:303:115::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5438.14 via Frontend Transport; Wed, 20 Jul 2022 08:24:43 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 12.22.5.235) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 12.22.5.235 as permitted sender) receiver=protection.outlook.com; client-ip=12.22.5.235; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (12.22.5.235) by CO1NAM11FT029.mail.protection.outlook.com (10.13.174.214) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.5458.17 via Frontend Transport; Wed, 20 Jul 2022 08:24:42 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by DRHQMAIL107.nvidia.com (10.27.9.16) with Microsoft SMTP Server (TLS) id 15.0.1497.32; Wed, 20 Jul 2022 08:24:42 +0000 Received: from nvidia.com (10.126.231.35) by rnnvmail201.nvidia.com (10.129.68.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.26; Wed, 20 Jul 2022 01:24:40 -0700 From: Xueming Li To: Gregory Etelson CC: , Matan Azrad , dpdk stable Subject: patch 'net/mlx5: fix RSS expansion for patterns with ICMP item' has been queued to stable release 20.11.6 Date: Wed, 20 Jul 2022 11:21:02 +0300 Message-ID: <20220720082132.3954126-33-xuemingl@nvidia.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20220720082132.3954126-1-xuemingl@nvidia.com> References: <20220621080301.2315720-1-xuemingl@nvidia.com> <20220720082132.3954126-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.231.35] X-ClientProxiedBy: rnnvmail202.nvidia.com (10.129.68.7) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 2693d70a-53b9-482d-885b-08da6a294c20 X-MS-TrafficTypeDiagnostic: MN2PR12MB3376:EE_ X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?Yz83FfwGRIrvcrZ64vQuQyISMQUWrG4S0zVPsdQmAFW1nvfMk4mLOoPkqrBR?= =?us-ascii?Q?jco2x5gRYp9e0tauu+C2/7QJK7+4k3j5lZFTXEeMwBQrs0QyAaTt5ml/coFB?= =?us-ascii?Q?gAgIH8gs9DYoqyV37uW+KvVms15ZCF5G1LwwebyFVPNPFcl7P3ODc+Slle1V?= =?us-ascii?Q?reSU4lS4ycRIs8A2G8pSVnWY9tETjfd38PnkTDPds4MvdbCOHuraW1wYG+4n?= =?us-ascii?Q?EXUuEePhKezyyFeW2CvozAA5Aj5XxSRKz5lIqObdvn623bI0edYjYgxUvDrr?= =?us-ascii?Q?HVvSODjBdW3m+07n4qcspSlgnKQqAVRnEc7h/I0/1CEGe2JKREaRZ5mzE2eM?= =?us-ascii?Q?DVoUazn2Q3Gcvh7z38k6zPwqu+PVpvy/sovbiw2gfwMJyHcBI/jcqx7a2G75?= =?us-ascii?Q?1hDfAbfEKYCurzaT92WZT6hx8a6uPxKkEK0SR5xjctOoowfkXk9bYMhhCv07?= =?us-ascii?Q?2Y49AfYro9glGcwStlc+yy8Xpc90Qvx1306FDeoxOlSq17Gu2Uk7t4cUuqT6?= =?us-ascii?Q?h98bZxp6YaIPQAPPIVYTLgJiD4YLyDznGdd2ed/9x7P+U71llT3irGG6ER9c?= =?us-ascii?Q?v04pbzLW8ZGOt23p77zSjRTZBW+PnrS2OsCWQsvPB4/tioO++r/HC5DjEkvY?= =?us-ascii?Q?dof4x0n4VHWydLw+ywIYHTacyli3a1mUMEc1I/UbTZJ5Io6uiFoINZ6ejL/P?= =?us-ascii?Q?VtY5lQ4WZ3lbe7vWphn2W9Mn4f/7lXDFiTkuIyL8/FK5AL6polDAsWcAaSQM?= =?us-ascii?Q?r8aAnu48Snk70q3Nk667vq10+6qcg6BFPNPuyDP5uHEBmfQUXKs9NGQtDtJt?= =?us-ascii?Q?ud4SQBXobkUPjC7OiZ3VYo+BCUO5Z3YlobovfRolZcC1v5A7xPErV6Yb0CX2?= =?us-ascii?Q?YhnqKyCp4AwTq5lp0T8hIDYFdIeraEc4GVgcBWya09is/tzwj8+YGWsk0QWQ?= =?us-ascii?Q?I9a07euexwNx/Z6prjB34A=3D=3D?= X-Forefront-Antispam-Report: CIP:12.22.5.235; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:InfoNoRecords; CAT:NONE; SFS:(13230016)(4636009)(39860400002)(136003)(396003)(376002)(346002)(36840700001)(46966006)(40470700004)(6636002)(6666004)(1076003)(82740400003)(81166007)(83380400001)(186003)(41300700001)(426003)(336012)(47076005)(2906002)(2616005)(966005)(478600001)(6286002)(40480700001)(26005)(36860700001)(8936002)(5660300002)(82310400005)(4326008)(86362001)(37006003)(316002)(70586007)(40460700003)(55016003)(356005)(6862004)(54906003)(7696005)(53546011)(8676002)(70206006)(16526019)(36756003)(36900700001); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Jul 2022 08:24:42.8344 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 2693d70a-53b9-482d-885b-08da6a294c20 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[12.22.5.235]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: CO1NAM11FT029.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR12MB3376 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org 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 --- >From f371572a7670ed7d52a25173af7fb463cbb4ee53 Mon Sep 17 00:00:00 2001 From: Gregory Etelson Date: Fri, 17 Jun 2022 08:22:38 +0300 Subject: [PATCH] net/mlx5: fix RSS expansion for patterns with ICMP item Cc: Xueming Li [ 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 Acked-by: Matan Azrad --- 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 + +[ upstream commit 57d6a458a8b8d2f41598b6f8f8d9459b34d1dd8f ] @@ -16 +18,0 @@ -Cc: stable@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),