From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <stable-bounces@dpdk.org>
Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124])
by inbox.dpdk.org (Postfix) with ESMTP id 472C3A0548
for <public@inbox.dpdk.org>; Sun, 28 Nov 2021 16:00:04 +0100 (CET)
Received: from [217.70.189.124] (localhost [127.0.0.1])
by mails.dpdk.org (Postfix) with ESMTP id 2E8384068E;
Sun, 28 Nov 2021 16:00:04 +0100 (CET)
Received: from NAM02-BN1-obe.outbound.protection.outlook.com
(mail-bn1nam07on2067.outbound.protection.outlook.com [40.107.212.67])
by mails.dpdk.org (Postfix) with ESMTP id DE57240FDF
for <stable@dpdk.org>; Sun, 28 Nov 2021 16:00:02 +0100 (CET)
ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none;
b=XHQBGO7r3V3snfCYDDa71K3zSQpaiBDw3JUZlNamWjb78h6IiIHFNafa8ssHVUu7JaY9pqRcAhdHCdrXcRk32NfV/SVoj/zj0ESTO5afh1pf9Fsv3asXvp+/F1volesc7dfO2USx/y3EhdHfvJMFT7MISbH0TXjs0KOWBcY4uXBV2Ct+HiUGTe+YnAEdJ0tTlclEZEO2pvfCFI6urrBWo5IFdISzJ/oCav1j06HFL9IbG61eBLQIa9SPpiwc61iI3SOheCB3kVf/p4o7HOzPejdl7lDARjIB0/EGm+j48yRRLeFtPTBK6P+GngLq5zsa/8Gx636dgg1J+TwHa0RD1A==
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=JL47DVWq4lHcQe6yljqOx6fmeHjluAP0g37btEUpvTc=;
b=belpt4SOrycQRwdV2rnBKiu1G1XK8cA+N+vZyZO5G4AQ1iiJ1NxAl5/AA3LMfV5i+ikq9o902HCjQL5FoYwsg8bZx1U0NYemUhAWTfKAU3Myx7qYPyP7fzNBIRNXW3U297vYTQVmlSMeMc2NEPTDDXuo6x3xBBFyqI5v8Di0/E2LzoubhZV2ZqfKRuWWjQ4Z6JwShHaSqWZp0RLNSoO/6PnxNoPcKrsOhjOl4Hd1gZ84ZhaCqvZI667IpI6Bz46mAv5paptXRfsf5wlYMDZchMxjRCOBdtWvIYzsni2qaJREZogjDBcUloKpLys7Z1O7Uu/EE5qFO4xeB712QfGIRw==
ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is
216.228.112.34) smtp.rcpttodomain=dpdk.org smtp.mailfrom=nvidia.com;
dmarc=pass (p=quarantine sp=quarantine 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=JL47DVWq4lHcQe6yljqOx6fmeHjluAP0g37btEUpvTc=;
b=njDh7XtUBOWZ20wVd5h8Cuu/N9RTP6ZhtCT4YB1P6iBjBCPH2WlxVu9NippW1lgcEiGU7FcSTfw2PolK349Gf7gL2f0ww+G3sf/OHXUdDOqfqo64eYxScyNhupo3AKRNYWkEHicCwczboeixV0747O5QQ0XJflghWdgivKGqBSZmXyXX44u3IY2rWMdd70O2xBbVTr+29GppS6qBL0H4j6ZlcS4bqGPHdDyvwval6HaKJmSJ4n2RORWxNArBioJ9/lUMHrOp73ICJeqNiYxk459pFWk4DLVGw+evKWRKM72xJLSdy6JAegEjN+fGVt+XXZVfdNdCp23HNnwIiAIjEw==
Received: from BN9PR03CA0524.namprd03.prod.outlook.com (2603:10b6:408:131::19)
by DM6PR12MB3611.namprd12.prod.outlook.com (2603:10b6:5:3c::17) with
Microsoft SMTP Server (version=TLS1_2,
cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4734.23; Sun, 28 Nov
2021 15:00:01 +0000
Received: from BN8NAM11FT040.eop-nam11.prod.protection.outlook.com
(2603:10b6:408:131:cafe::e1) by BN9PR03CA0524.outlook.office365.com
(2603:10b6:408:131::19) with Microsoft SMTP Server (version=TLS1_2,
cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4734.23 via Frontend
Transport; Sun, 28 Nov 2021 15:00:01 +0000
X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.112.34)
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
216.228.112.34 as permitted sender) receiver=protection.outlook.com;
client-ip=216.228.112.34; helo=mail.nvidia.com;
Received: from mail.nvidia.com (216.228.112.34) by
BN8NAM11FT040.mail.protection.outlook.com (10.13.177.166) with Microsoft SMTP
Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id
15.20.4734.22 via Frontend Transport; Sun, 28 Nov 2021 15:00:00 +0000
Received: from nvidia.com (172.20.187.6) by HQMAIL107.nvidia.com
(172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1497.18; Sun, 28 Nov
2021 14:59:59 +0000
From: Xueming Li <xuemingl@nvidia.com>
To: Gregory Etelson <getelson@nvidia.com>
CC: Luca Boccassi <bluca@debian.org>, Viacheslav Ovsiienko
<viacheslavo@nvidia.com>, dpdk stable <stable@dpdk.org>
Subject: patch 'net/mlx5: fix RSS expansion scheme for GRE header' has been
queued to stable release 20.11.4
Date: Sun, 28 Nov 2021 22:53:50 +0800
Message-ID: <20211128145423.3974892-47-xuemingl@nvidia.com>
X-Mailer: git-send-email 2.34.0
In-Reply-To: <20211128145423.3974892-1-xuemingl@nvidia.com>
References: <20211110063216.2744012-1-xuemingl@nvidia.com>
<20211128145423.3974892-1-xuemingl@nvidia.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
X-Originating-IP: [172.20.187.6]
X-ClientProxiedBy: HQMAIL101.nvidia.com (172.20.187.10) To
HQMAIL107.nvidia.com (172.20.187.13)
X-EOPAttributedMessage: 0
X-MS-PublicTrafficType: Email
X-MS-Office365-Filtering-Correlation-Id: 1433e2ce-6264-43d7-c662-08d9b27fc07c
X-MS-TrafficTypeDiagnostic: DM6PR12MB3611:
X-Microsoft-Antispam-PRVS: <DM6PR12MB3611723B49EEBD42D1B2787BA1659@DM6PR12MB3611.namprd12.prod.outlook.com>
X-MS-Oob-TLC-OOBClassifiers: OLM:10000;
X-MS-Exchange-SenderADCheck: 1
X-MS-Exchange-AntiSpam-Relay: 0
X-Microsoft-Antispam: BCL:0;
X-Microsoft-Antispam-Message-Info: nLacc9ZV0rOfa797EOmCmPRGW4hPlOk103TURfJE4d08mtlNMJC0JBfY8VmfWNRLsXaf2nusWCTznWgR5IRVIaEyEcKBiaSjCtY2Fw++RmJ8LMKLUmJ12GgLWMUAeBbDOe9Zzk+NUqRE+G1GMQfpD+Sgei+/4446EIvm32wwWc+S1Zi3yBTaHgP8G6DBwHxGRIxZzOb0OARRVGCE7Ukq0h4emlIi1X5qliOA6vs9fZwbCdnS+OdIioLudjbGrXgf1MOj54tQrCnVKnf6CL01HIp+OIdU4xcrFb4NrsVUqF9zGy8cVHoois+cqrk3lEam9OcOyCO2qXHC8HD5rdeE25bX2SDLgX6QKoGWtTZISrB5aYKRw4pyX1/ZxKF4LkH2ZKmb9nX2a1v4HBttue3bIxJjVLX0zgV5DVpzPKFEIQSHp+PPA7DqplDXC2macWQSiqFIT0rWeTOHVJbntoncvrCahFJrV1h1Rm9wpZTejbL/0mBvrzFme2nyuwmFuWjljBoRLvNIzuJrB5Ts3HhIeUZM+U+jbLOSwF5akI4YsM9TAqtI678fiJtBciWqE+o7aUq+JE7UL1HPBI6CCLxRKl9lt3uZGapi0FfKSIwJSaI21Ybl1OMdPKO+XYaYtxqhOIYBmy2+ASDQhmjZyMX3PBJ/Jb017Insk3nS+skcBv41vmmykoSzaMcG2rBZNBLLmDl3oif1sqbIxh9ioMFmfTpISCe46/72zi6ef5kjGuIVMDwVfjIQo7iJ5cnxJo5kRB0j7SgPxZkYQG4wz5SW+2cMo+1GXzsiDnzNFReCsQT+QHGqZlHwxjfFhVzmxeIu1qhRMqugxTFfHTEyLOFicg==
X-Forefront-Antispam-Report: CIP:216.228.112.34; CTRY:US; LANG:en; SCL:1; SRV:;
IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:schybrid03.nvidia.com; CAT:NONE;
SFS:(4636009)(36840700001)(46966006)(55016003)(186003)(16526019)(4001150100001)(82310400004)(4326008)(36860700001)(86362001)(6286002)(8676002)(508600001)(53546011)(2616005)(426003)(2906002)(26005)(7696005)(966005)(70206006)(356005)(54906003)(37006003)(336012)(6636002)(316002)(6862004)(1076003)(36756003)(5660300002)(83380400001)(6666004)(8936002)(7636003)(47076005)(70586007);
DIR:OUT; SFP:1101;
X-OriginatorOrg: Nvidia.com
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Nov 2021 15:00:00.7880 (UTC)
X-MS-Exchange-CrossTenant-Network-Message-Id: 1433e2ce-6264-43d7-c662-08d9b27fc07c
X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a
X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.112.34];
Helo=[mail.nvidia.com]
X-MS-Exchange-CrossTenant-AuthSource: BN8NAM11FT040.eop-nam11.prod.protection.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Anonymous
X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR12MB3611
X-BeenThere: stable@dpdk.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: patches for DPDK stable branches <stable.dpdk.org>
List-Unsubscribe: <https://mails.dpdk.org/options/stable>,
<mailto:stable-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://mails.dpdk.org/archives/stable/>
List-Post: <mailto:stable@dpdk.org>
List-Help: <mailto:stable-request@dpdk.org?subject=help>
List-Subscribe: <https://mails.dpdk.org/listinfo/stable>,
<mailto:stable-request@dpdk.org?subject=subscribe>
Errors-To: stable-bounces@dpdk.org
Hi,
FYI, your patch has been queued to stable release 20.11.4
Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 11/30/21. 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/b87d31178d809ee6b778ff05d670f8abbcafa984
Thanks.
Xueming Li <xuemingl@nvidia.com>
---
>From b87d31178d809ee6b778ff05d670f8abbcafa984 Mon Sep 17 00:00:00 2001
From: Gregory Etelson <getelson@nvidia.com>
Date: Sun, 14 Nov 2021 17:36:14 +0200
Subject: [PATCH] net/mlx5: fix RSS expansion scheme for GRE header
Cc: Xueming Li <xuemingl@nvidia.com>
[ upstream commit a21d616b99ffc5810a4b5333e5efdf1ddff21405 ]
RFC-2784 allows any valid Ethernet type in GRE protocol type field.
Add Ethernet to GRE RSS expansion.
Fixes: f4b901a46aec ("net/mlx5: add flow GRE item")
Signed-off-by: Gregory Etelson <getelson@nvidia.com>
Acked-by: Viacheslav Ovsiienko <viacheslavo@nvidia.com>
---
drivers/net/mlx5/mlx5_flow.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c
index 21f018dd1d..2533a9102e 100644
--- a/drivers/net/mlx5/mlx5_flow.c
+++ b/drivers/net/mlx5/mlx5_flow.c
@@ -585,7 +585,8 @@ static const struct mlx5_flow_expand_node mlx5_support_expansion[] = {
.type = RTE_FLOW_ITEM_TYPE_VXLAN_GPE,
},
[MLX5_EXPANSION_GRE] = {
- .next = MLX5_FLOW_EXPAND_RSS_NEXT(MLX5_EXPANSION_IPV4,
+ .next = MLX5_FLOW_EXPAND_RSS_NEXT(MLX5_EXPANSION_ETH,
+ MLX5_EXPANSION_IPV4,
MLX5_EXPANSION_IPV6,
MLX5_EXPANSION_GRE_KEY,
MLX5_EXPANSION_MPLS),
--
2.34.0
---
Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- - 2021-11-28 22:41:05.708802346 +0800
+++ 0046-net-mlx5-fix-RSS-expansion-scheme-for-GRE-header.patch 2021-11-28 22:41:03.346873831 +0800
@@ -1 +1 @@
-From a21d616b99ffc5810a4b5333e5efdf1ddff21405 Mon Sep 17 00:00:00 2001
+From b87d31178d809ee6b778ff05d670f8abbcafa984 Mon Sep 17 00:00:00 2001
@@ -4,0 +5,3 @@
+Cc: Xueming Li <xuemingl@nvidia.com>
+
+[ upstream commit a21d616b99ffc5810a4b5333e5efdf1ddff21405 ]
@@ -11 +13,0 @@
-Cc: stable@dpdk.org
@@ -20 +22 @@
-index 205fe19cdd..43598f92ee 100644
+index 21f018dd1d..2533a9102e 100644
@@ -23 +25 @@
-@@ -654,7 +654,8 @@ static const struct mlx5_flow_expand_node mlx5_support_expansion[] = {
+@@ -585,7 +585,8 @@ static const struct mlx5_flow_expand_node mlx5_support_expansion[] = {