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 9BB4D45E41 for ; Sat, 7 Dec 2024 09:01:40 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 91E3140281; Sat, 7 Dec 2024 09:01:40 +0100 (CET) Received: from NAM12-BN8-obe.outbound.protection.outlook.com (mail-bn8nam12on2043.outbound.protection.outlook.com [40.107.237.43]) by mails.dpdk.org (Postfix) with ESMTP id 453D240281 for ; Sat, 7 Dec 2024 09:01:39 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=GhQteGVjN8yv7QVqrmHaLLLnjCsmlLbkWNrGNv9JJgAYFS/xKBYQJclli4ZrY+lFCbvfK/ca3zLZpaVuvcqNEAz/gSRcqN3pnVsm39dK7xE1veSLpYYI6Z3aGzhkSC1ZkRD/xOM3FnHB3+Oz2aS/vnE1MlYCZGPd61OfrN0p1qnpaux88pJs+l0PsggNnEe/XsxCsHHdWeJP8rEvt/N5oQdmBTkKZeQdzc4vgMwrZsHKVZz36PobJWFziL8NTzbjdSekUtqq4Mqtu8d71DUzcEOqJ/LYrEo3F/wL/WcIZDFEXHF1YdBdChvKJeiOEaY3sljNnHNSSYUb91rSZ5KU3g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=qr2I0B2xQra0Mo2WNAJXehP5U2tWGFKJASPOyU7SPUo=; b=H6lmofroEQAzGSamhFLTDjFGtsp7YioRo08eKS2F7Sac0fSMhct5GdPHE/69g9uovMjn8TDjZhsQPoxS3GEcU84D/gF8Z42N+QX5UoT6rhQOeKOOZ2/e09so501pzprpcy68dOMsNcx2b8xha2tNokx0hJL4BRiCACQzUQM9amDw/MFt5xVC+kuVg4d2p/dExGrDyqPNLZF1DzpErML+dakzlwXuUzFgPn+YHZRF5V326tDzynxngbYV9fUszc4gSU3Emjc7secVhdTqJ12KYrv9m6/kLrDC9oHwkR3SuSkleyfsKy3d4zB5f9vODGPY5H8W/cNwbGCbQJDA+ER8/w== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) smtp.rcpttodomain=huawei.com 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 (0) 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=qr2I0B2xQra0Mo2WNAJXehP5U2tWGFKJASPOyU7SPUo=; b=CiF3JzF45s7okMcPKp4rIpf2JapwKBvASOzrJT3+tcc0LMpuW7V3Za3Qbsowz/VOAP2bx+AGUKybSZKanGsiw/WmVAkhZZzZ10eR56gXpAeugzbCjGnQhAm8gOd7M0jLT3EK+nEEAo2bjQeyXZzN/T70GRLoj87TN+2dwZQSQsjbxn7achd/XTMnBKopDhkyXWmCL5Jf/UlK3BdcW9uayZG4EID8AeydLJrmK0FURKUN8aC/Z+J+vSS1OrhguSbuRpm/k4AJo18w3htaxWfiUWzM2MZcU+YlZ8I3mOAXBKW9mInql9ojFtJYmwiIfMgVvoNOJqSBqWCVMA+R7i/tZA== Received: from PH7P220CA0115.NAMP220.PROD.OUTLOOK.COM (2603:10b6:510:32d::32) by DM4PR12MB6010.namprd12.prod.outlook.com (2603:10b6:8:6a::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8207.19; Sat, 7 Dec 2024 08:01:36 +0000 Received: from CY4PEPF0000E9D8.namprd05.prod.outlook.com (2603:10b6:510:32d:cafe::82) by PH7P220CA0115.outlook.office365.com (2603:10b6:510:32d::32) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8230.12 via Frontend Transport; Sat, 7 Dec 2024 08:01:36 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.160) 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.117.160 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.160; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.160) by CY4PEPF0000E9D8.mail.protection.outlook.com (10.167.241.71) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8230.7 via Frontend Transport; Sat, 7 Dec 2024 08:01:34 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.66) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.4; Sat, 7 Dec 2024 00:01:19 -0800 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.1544.4; Sat, 7 Dec 2024 00:01:17 -0800 From: Xueming Li To: Chengwen Feng CC: Xueming Li , Jie Hai , "dpdk stable" Subject: patch 'net/hns3: restrict tunnel flow rule to one header' has been queued to stable release 23.11.3 Date: Sat, 7 Dec 2024 15:59:20 +0800 Message-ID: <20241207080055.488538-3-xuemingl@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20241207080055.488538-1-xuemingl@nvidia.com> References: <20241111062847.216344-122-xuemingl@nvidia.com> <20241207080055.488538-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: rnnvmail201.nvidia.com (10.129.68.8) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CY4PEPF0000E9D8:EE_|DM4PR12MB6010:EE_ X-MS-Office365-Filtering-Correlation-Id: 92928b1f-978b-48d4-610c-08dd16955e5e X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|82310400026|1800799024|36860700013|376014|7053199007; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?MHpmVmmBxPvFO6tddcF1bHcCncmK6nOkJmIkooRfZn+bKGOmXOhnDjEa/v0C?= =?us-ascii?Q?S2uBgsBKQEqIdEFFXHG9B+r5kADBqbFHWtmUfnupWsfUuACQytIdtF4+5MJw?= =?us-ascii?Q?mNZUFWh6mmoxFqyXfSqfLmU7YGq2zgwyBxBM7w3gK1v99WAa21wMwawKzroX?= =?us-ascii?Q?V1NduMIHCVdIr6MRMq/u8wTuZNYXNP7mBVQsK9j/k/LuD4oudnl8Qj61I1WH?= =?us-ascii?Q?impx7q7UVbUnkLsVsHT0ZE4gvVvrixT4QVJ/ThYVP/kLur2QxKyJba/IXt+D?= =?us-ascii?Q?8DaBlVo+8PKyIicMpR30KzcxwFlbNyp0jjcgcJbOoeDCzTG94ntSvMNxBq+5?= =?us-ascii?Q?IjLep6CpD9cckDO2o3NAcmUDnBknh3yJ0cbUobIlwT9Pvxx722qtxhplzzl4?= =?us-ascii?Q?6T5f020JnZFCYZohmU4LpUm6+iG+IjmQj7/IyF1S2TNBMq79ARhPIzzSw8u3?= =?us-ascii?Q?D3AIh1V0NSqsRRcz3oiGrF4bm2iLpoaMwE3ZYR+4ZVixOn2segPcI3XX7Qbi?= =?us-ascii?Q?ht8srKz7wDMGneyO6r+MNXnIgKCLSt4Y37U9jDLKbkCcgBnCFCvULM7SChv9?= =?us-ascii?Q?HfSJXc6H5a04MC7mCJOwf6LjX1XBBOmA35YiR2lOrweoAF4tJG9m3Ny7YeSq?= =?us-ascii?Q?dca1RKFSq8+O2Cneq5mgpjXV9Gw+1cjJdN7RMd39JNAT3/KQ/bXlreu/M+qV?= =?us-ascii?Q?AMYsH9eOcit3AgOCu5hBbsREczYoJlHIZTy0CVkwzFBuSkmn97qjvo//2Bn3?= =?us-ascii?Q?0TtDslYOev8RXdVo5MO7tZc7pJ1JKD23vPjOxxPi7Z52sT2DDxDIoB+nIgVG?= =?us-ascii?Q?TfeWcCEuFCPHd/671QhmpnRxIJPo1M5a2tDKEncQwHiR/Z6hifQCr6nawTFq?= =?us-ascii?Q?TFY4KL0Rg7d+uJaDJ3X8fua1RQa87v2xJ63JrTgLFj9n4fA6MvHYXe34pCJ5?= =?us-ascii?Q?k1SbNH14ocwQs9qG/f3L1E3mYAYis3/BubZh/NZXMTW+uX4yW/l30kfNv/xQ?= =?us-ascii?Q?e9i0rHOACqB8Zft/bNi+ajv0+8K6IY0qWz2LnXP2oblEj77KzNAzPVvZAK8q?= =?us-ascii?Q?sq9euAcH9ELNyatinROYJltxeHqNfZHaCZcnOKYdVsdx+jVG/wbZPza7sK6f?= =?us-ascii?Q?9E69VyIQZZyLOkDr8Zd/DP81a+f2EiNQUN92gSfawd3EvXR6nVM0AB2sYKqu?= =?us-ascii?Q?X388k5gNwubjHRnYWNjKmpEU4vCa7ItjsOXae7aaLTOf4+9eIGW0FcZWvd98?= =?us-ascii?Q?Xu+Dg4Qcf9LPEPVcENrHdWVxXMdaot+5dTxSkloxSUSAsdTf+INaF8O2KrmN?= =?us-ascii?Q?V0nSxYCLAYLbM/uR0oEurxLBWqTFufRuFZosB5cYB6fQr2ljXhfl42qjW8KF?= =?us-ascii?Q?rG7zD0LojXM8w6hGzfA+nolwQaUccDis0Ehia9EeN0P8PO2vmd2OghoK6/oB?= =?us-ascii?Q?fZVadW+lg63jVaSs+1+y6LclXaXtlhBh?= X-Forefront-Antispam-Report: CIP:216.228.117.160; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge1.nvidia.com; CAT:NONE; SFS:(13230040)(82310400026)(1800799024)(36860700013)(376014)(7053199007); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Dec 2024 08:01:34.4566 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 92928b1f-978b-48d4-610c-08dd16955e5e X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.117.160]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: CY4PEPF0000E9D8.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM4PR12MB6010 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 23.11.3 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 12/10/24. 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://git.dpdk.org/dpdk-stable/log/?h=23.11-staging This queued commit can be viewed at: https://git.dpdk.org/dpdk-stable/commit/?h=23.11-staging&id=8d0ca45d12f9b719c3c3e714024b24b11546acfe Thanks. Xueming Li --- >From 8d0ca45d12f9b719c3c3e714024b24b11546acfe Mon Sep 17 00:00:00 2001 From: Chengwen Feng Date: Fri, 18 Oct 2024 14:19:38 +0800 Subject: [PATCH] net/hns3: restrict tunnel flow rule to one header Cc: Xueming Li [ upstream commit 8887c207b9373a1875031c5346706f698322d66d ] The device's flow director supports a maximum of one tunnel header, if passed more than one tunnel header from rte-flow API, the driver should return error. Fixes: fcba820d9b9e ("net/hns3: support flow director") Signed-off-by: Chengwen Feng Signed-off-by: Jie Hai --- drivers/net/hns3/hns3_flow.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/drivers/net/hns3/hns3_flow.c b/drivers/net/hns3/hns3_flow.c index 7fbe65313c..a32fb10ddf 100644 --- a/drivers/net/hns3/hns3_flow.c +++ b/drivers/net/hns3/hns3_flow.c @@ -1182,6 +1182,11 @@ hns3_parse_tunnel(const struct rte_flow_item *item, struct hns3_fdir_rule *rule, "Tunnel packets must configure " "with mask"); + if (rule->key_conf.spec.tunnel_type != 0) + return rte_flow_error_set(error, EINVAL, + RTE_FLOW_ERROR_TYPE_ITEM, + item, "Too many tunnel headers!"); + switch (item->type) { case RTE_FLOW_ITEM_TYPE_VXLAN: case RTE_FLOW_ITEM_TYPE_VXLAN_GPE: -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-12-06 23:26:44.217150325 +0800 +++ 0002-net-hns3-restrict-tunnel-flow-rule-to-one-header.patch 2024-12-06 23:26:43.833044829 +0800 @@ -1 +1 @@ -From 8887c207b9373a1875031c5346706f698322d66d Mon Sep 17 00:00:00 2001 +From 8d0ca45d12f9b719c3c3e714024b24b11546acfe Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 8887c207b9373a1875031c5346706f698322d66d ] @@ -11 +13,0 @@ -Cc: stable@dpdk.org @@ -20 +22 @@ -index bf1eee506d..5586708a5d 100644 +index 7fbe65313c..a32fb10ddf 100644 @@ -23 +25 @@ -@@ -1221,6 +1221,11 @@ hns3_parse_tunnel(const struct rte_flow_item *item, struct hns3_fdir_rule *rule, +@@ -1182,6 +1182,11 @@ hns3_parse_tunnel(const struct rte_flow_item *item, struct hns3_fdir_rule *rule,