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 D1E94457A1 for ; Mon, 12 Aug 2024 15:00:47 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id CCD5E40654; Mon, 12 Aug 2024 15:00:47 +0200 (CEST) Received: from NAM04-DM6-obe.outbound.protection.outlook.com (mail-dm6nam04on2040.outbound.protection.outlook.com [40.107.102.40]) by mails.dpdk.org (Postfix) with ESMTP id 694C240654 for ; Mon, 12 Aug 2024 15:00:46 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=YvN5EgOPuswGWGqRJP6YJYh85leVKxDO8fXGDJvP14cLW2tiQQu8w1s6SGLma7w8LAN+qNDJCNozoB7CX0Ede7JqUb4VceNTFPZPNOnhh+h/8QJIpSHHZ9oGl0Q7m27Hf2BW/vaezG1u5ouDazsSWLH9P+HQpySYrCkKdqFO+SVuplUZin50DUGAcV8iIVHwpEo07hbtz3kik+eWdlwHKkLFJvz3rQxC87XKiZkpGmonFIyM1Em+NaQ+7ZPxLeDFNmmp/m8NUCpSpXRsfgiwSnEMywDJmnV+232lY/YX0rvp2lqdUEDW2nnEafnf2CoSMCAiEh7mrkbc08b+lGKS7w== 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=yn+K5cGex0de4fSMbgMTNTpIRojV3y2j8raT8N80V2s=; b=tVn9yzmeo2ZKJNugehuAXjfNYK/oyqSAH/PHlcXhtxOyWsQfGbiNWVlVOYArnNKLvaUKlFA6QI7NK17sd2H460hIuDU00q+1XvSW9la2gMNZpOc3x4DDYV9MHFprNmmM5cUDxqq5uBrtUQbPycSzFAO4bqWCr3opk0ohEypYltl4B1iU3vBT0RfSoCoA77+mMz/XibRlWT8VXXPMOl9Cqj1bZmLHZyAq8hopt4YVyTmlTOeLxWW6DBTJdH+p8vjfK70z6kg3n0j64HmyEKeb5zZfILTFuiYqWb5ROo1xCmBkmQIp5war7y0k5KVgZmvGlnsFWEXZ8NMxBRZrLWvFVg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) smtp.rcpttodomain=corigine.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=yn+K5cGex0de4fSMbgMTNTpIRojV3y2j8raT8N80V2s=; b=OfP0dM0Dz+JI+FHkUi95rkQF+yoOOJOicBlX/Vp9CoeS38SVdMm0LiPNDZnQNDmlrdD2cv3eP5BjjKLDWDjSG4y+RwjuUZj9OvF9QG0p1jdAs9Q7rriz2S3M+2/bczFQyq2236Gw+iONrrYLmhVgn6HoL3ZaHO1EV5QRhvRQhi/Zq61fiGsovufNUUdt0WA+r1+eMLVmxKpM5yIcjt0Mxc6b/C3Z9NM4PDz5NxsJ1Ac/83eNcelyXbHYRcfvzHdFl/Wb1rw9mA/KqqLlwdFvuUq0VBLUiuQKKGSXEIkSnnBPIkAUyRFgPEhWGR+D+5iBFIjfMI9TcOb0RM+tL3SnKA== Received: from BY5PR04CA0009.namprd04.prod.outlook.com (2603:10b6:a03:1d0::19) by PH0PR12MB7815.namprd12.prod.outlook.com (2603:10b6:510:28a::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7849.20; Mon, 12 Aug 2024 13:00:40 +0000 Received: from CO1PEPF000042AA.namprd03.prod.outlook.com (2603:10b6:a03:1d0:cafe::9d) by BY5PR04CA0009.outlook.office365.com (2603:10b6:a03:1d0::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7849.20 via Frontend Transport; Mon, 12 Aug 2024 13:00:40 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.161) 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.161 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.161; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.161) by CO1PEPF000042AA.mail.protection.outlook.com (10.167.243.39) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7828.19 via Frontend Transport; Mon, 12 Aug 2024 13:00:40 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.67) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.4; Mon, 12 Aug 2024 06:00:20 -0700 Received: from nvidia.com (10.126.230.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; Mon, 12 Aug 2024 06:00:18 -0700 From: Xueming Li To: Peng Zhang CC: , Chaoyong He , Long Wu , dpdk stable Subject: patch 'net/nfp: remove unneeded logic for VLAN layer' has been queued to stable release 23.11.2 Date: Mon, 12 Aug 2024 20:49:38 +0800 Message-ID: <20240812125035.389667-102-xuemingl@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240812125035.389667-1-xuemingl@nvidia.com> References: <20240712110153.309690-23-xuemingl@nvidia.com> <20240812125035.389667-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.230.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: CO1PEPF000042AA:EE_|PH0PR12MB7815:EE_ X-MS-Office365-Filtering-Correlation-Id: 98c12f40-5d98-42d3-f527-08dcbacec49c X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|36860700013|1800799024|376014|82310400026; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?gk4aXiP/r9p/IHd9pXGPfl9FTHldWXkzLWEWeRDGty1L6JxTJ47S34AvCzOi?= =?us-ascii?Q?n76Ef75f76iXK5EJyGrmMhSmjkO1bRy41C4Ncbu7/ogwz3pXPzeh0VPB5YdX?= =?us-ascii?Q?SveTFd/zxWQcM+ZoEAJLwYsJYF+zQ9HI+Ym3/rAM7wK8FsrcXVG+GcrXQdUW?= =?us-ascii?Q?ZhY6rz136nzSn5/z4pXkO9vA8QOXnJ85q327GI61rdj2d/O/Kk7ltpT/rFZT?= =?us-ascii?Q?VkQQCGACAdpsbT9Y7gAYg6L8NX2Llq9Y1rV1vX3+SqwhX0HHVAVcT1hDjdPb?= =?us-ascii?Q?Z3qeoCZpNQKhk6riH4ertqjdnNnKH7dvNJP6uxc8fjT3KOcGElBcXzUcvCtt?= =?us-ascii?Q?/r2dPQ8oOHmNaGGx8HT03RzyUjTtTCNDuQcvKv2nyyb3pRyoBZeF220LNBDo?= =?us-ascii?Q?V7ZeMU6TmRYiy42evMWSn22ugKuG82s4BpR9MuB+yBc8pDxAGekLWQuQM2gm?= =?us-ascii?Q?I7ahCpikro/y25HqqKZSGpxj26DNAqDbxq5fOGULDmCYYq+LHHSn0JUQ66+V?= =?us-ascii?Q?mp0yOb7RxnFBMJpxx/Fy0p5r5ysbOdUgBdMqF40GRxhSzBEyrh989sqEfwaG?= =?us-ascii?Q?ExZ8TB0iptEZzpIRFdTWbpiXUu7s6fBj4SBOXAGN4P6mr9OkMmMExiQtyGvz?= =?us-ascii?Q?JabcqNU8S6V1YIe8R2D6TnCoxKwFWRT95Sl7sx+s/+CJcyRy/lF28ehxIzuE?= =?us-ascii?Q?amznFIP5y3aTrr3P1xF0B/p5xqDMguiG8JkmR8dsuGD+cC9r1Kpj7NfU8vL7?= =?us-ascii?Q?PH5nBI4YzkV0MLr+R0kv2VZt0edQu4QVKREco1lAydiFP68ilYy9qersGYL+?= =?us-ascii?Q?dgAhqvYJL/+AIpu1yn45UmeAuJO7PZGboUKMVEPpFJTj+DZzPGg3ZEm644/U?= =?us-ascii?Q?z/epSv2DOgzA43vAGa73jgAiNpS6uws+Ys4FMHSGd3LcqVKDwZsN1Uejpgst?= =?us-ascii?Q?B2Vl1TgjAQ3zQ1LERyqXPoFbGMLTr043/19JnmIWe3N9MIMOaBUK63JRL0nw?= =?us-ascii?Q?oyDV2+ZSRwRBG5IDFlG09Tl0t5Lctu/xc90IgEUhP7mKa4/zODoqndGRIYCu?= =?us-ascii?Q?Xy45ikn7XyXy14h7B3ynZifl0aM0Fx9nMyocBa2kIucp087erBx8JAU+Fx3A?= =?us-ascii?Q?PiHjaJNtA10Hhtv5acmyoxJAT3PYhqWvBGwTWA6HBaufpYRbAMmdqRpOs4+n?= =?us-ascii?Q?oaxtaGgRBlKLIJwg2N8jdbxUDWgckGgWuazJuvUgar+jWtaj7oAmP6bihkLC?= =?us-ascii?Q?jvBuM4S2Ycj58OmnFTqcHVqZPVqFfWaCapgzLEe974YaJJdankzjBDXFuYbd?= =?us-ascii?Q?ehAF/KG0LnbXSKaYD2S9dMZdZW2m7hiUMOdymMAxlL4fFe/iUtDCXeAs3zUF?= =?us-ascii?Q?7Vsl/hPA44aThLtilTiYHTepuT3i1OWFh3IzaHTZDk1fGwPsMA=3D=3D?= X-Forefront-Antispam-Report: CIP:216.228.117.161; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge2.nvidia.com; CAT:NONE; SFS:(13230040)(36860700013)(1800799024)(376014)(82310400026); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Aug 2024 13:00:40.2386 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 98c12f40-5d98-42d3-f527-08dcbacec49c 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.161]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: CO1PEPF000042AA.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH0PR12MB7815 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.2 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 08/14/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=ea7085704a60700fc259763e1414beffa8ee3cfc Thanks. Xueming Li --- >From ea7085704a60700fc259763e1414beffa8ee3cfc Mon Sep 17 00:00:00 2001 From: Peng Zhang Date: Mon, 24 Jun 2024 09:57:20 +0800 Subject: [PATCH] net/nfp: remove unneeded logic for VLAN layer Cc: Xueming Li [ upstream commit c3cf736fb9f77ffb1ce841c5fca26522e2d5fd9e ] The logic in NFDk datapath can make sure there only one layer VLAN, so remove the unneeded logic here and make it clean and easy to understand. Fixes: 7c82b8626af8 ("net/nfp: support VLAN insert with NFDk") Signed-off-by: Peng Zhang Reviewed-by: Chaoyong He Reviewed-by: Long Wu --- drivers/net/nfp/nfdk/nfp_nfdk_dp.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/drivers/net/nfp/nfdk/nfp_nfdk_dp.c b/drivers/net/nfp/nfdk/nfp_nfdk_dp.c index 6a9e7ec042..772c847b9d 100644 --- a/drivers/net/nfp/nfdk/nfp_nfdk_dp.c +++ b/drivers/net/nfp/nfdk/nfp_nfdk_dp.c @@ -178,7 +178,6 @@ nfp_net_nfdk_set_meta_data(struct rte_mbuf *pkt, uint32_t cap_extend; struct nfp_net_hw *hw; uint32_t header_offset; - uint8_t vlan_layer = 0; uint8_t ipsec_layer = 0; struct nfp_net_meta_raw meta_data; @@ -223,13 +222,8 @@ nfp_net_nfdk_set_meta_data(struct rte_mbuf *pkt, meta += NFP_NET_META_FIELD_SIZE) { switch (meta_type & NFP_NET_META_FIELD_MASK) { case NFP_NET_META_VLAN: - if (vlan_layer > 0) { - PMD_DRV_LOG(ERR, "At most 1 layers of vlan is supported"); - return -EINVAL; - } nfp_net_set_meta_vlan(&meta_data, pkt, layer); - vlan_layer++; break; case NFP_NET_META_IPSEC: if (ipsec_layer > 2) { -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-08-12 20:44:05.743014142 +0800 +++ 0101-net-nfp-remove-unneeded-logic-for-VLAN-layer.patch 2024-08-12 20:44:02.385069351 +0800 @@ -1 +1 @@ -From c3cf736fb9f77ffb1ce841c5fca26522e2d5fd9e Mon Sep 17 00:00:00 2001 +From ea7085704a60700fc259763e1414beffa8ee3cfc Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit c3cf736fb9f77ffb1ce841c5fca26522e2d5fd9e ] @@ -11 +13,0 @@ -Cc: stable@dpdk.org @@ -21 +23 @@ -index 3ba97e23a9..8b8c191b82 100644 +index 6a9e7ec042..772c847b9d 100644 @@ -24,2 +26,2 @@ -@@ -180,7 +180,6 @@ nfp_net_nfdk_set_meta_data(struct rte_mbuf *pkt, - uint32_t meta_type; +@@ -178,7 +178,6 @@ nfp_net_nfdk_set_meta_data(struct rte_mbuf *pkt, + uint32_t cap_extend; @@ -32 +34 @@ -@@ -223,12 +222,7 @@ nfp_net_nfdk_set_meta_data(struct rte_mbuf *pkt, +@@ -223,13 +222,8 @@ nfp_net_nfdk_set_meta_data(struct rte_mbuf *pkt, @@ -40 +42,2 @@ - nfp_net_meta_set_vlan(&meta_data, pkt, layer); + + nfp_net_set_meta_vlan(&meta_data, pkt, layer);