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 A831C43B7D for ; Tue, 5 Mar 2024 10:59:15 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 0FBEF42E62; Tue, 5 Mar 2024 10:59:14 +0100 (CET) Received: from NAM04-BN8-obe.outbound.protection.outlook.com (mail-bn8nam04on2072.outbound.protection.outlook.com [40.107.100.72]) by mails.dpdk.org (Postfix) with ESMTP id 693FA4014F for ; Tue, 5 Mar 2024 10:59:13 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=msWxAX4rSxH0AJWWOWMufb6e1HUymsVOuSUQFQ4GN9q3goEwICKbXmGpuAw/8t/mbUWyrymsE0NYkxr+fvqspmErhFgLB0+67//5tx7StHLTB/tKJNYetPXjbyIn+dfCC0KLJTLiSDE6QEfZ+YOoQVEwlTpUc0r3Xs1VYE1M3yJAqMTXDF5HWXoHsAiHjIXykgXbWN2vJ5rPjccZb/YQxgG2icj7mksE0WuZITTa8g/dN3Rwtc3MWbfa9mP7seBhXv5AiHJdmJrt9EP/yWmkO5r9hMwq3mfL0/8rX4hNrRaX5lwbZPY4n2U65EhxZD/5rLGs+vD0tggEsUjCfbhtxw== 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=WGmF8dSW+9nrOwxhwMIBkK3zUuadYj4BxpqUDDe9yno=; b=AVXKb18WniYw+PlhkKiWm5yCuwBIJb4sTAUS1JXZT+IF4qnIMxl6doN2Ci7alwnDSYnn0Q6b7r0N7YsDMCPBIwYviqXI7wjKVeWGtEqliQJJcrM+KNLxHq3d6+FQsK8ylyXnFyiP8Qob/6iZVdrll5unRd4eV80L7wDTN9TMkozEPONQCfSe+Axz2SMfeXdJBRvDlyK2yqKXD0i6jrL910kl2kIJrEv3Axhaa27IdqarW0rY2ojUPWi4S1jf9P962NE3lOzTOeq0NQSFQszfHxsvaUFCI/bftX+ZoRmWQalxtzIoperS7A3ITpyFM6XuOUEERqx3TR9+lDy0VN2rDQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) smtp.rcpttodomain=marvell.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=WGmF8dSW+9nrOwxhwMIBkK3zUuadYj4BxpqUDDe9yno=; b=GgGNtu+5IeTJbr8sOo2kQlr9tXS0Z+rr5pFTHhoEOPswvN+Yd0YxW4wx6fBWRKlOueZSxt6mwaPzRzNC+xmTlwGBO8Em+VhOzbC3RppxdJz+ohb8H0sg+tznlrqAMNjypUjzkINTcGs0E+2INVNEZqDgEJnRO3INJCtw/ZqogQviKWLWKgZOF12IML2jzL6K4+ZisrDCYneGtq9Mpd3fL9Tb64TOMn9lFvlRsfdPUwxTEwaPz4n+r809ajK+G30hgB9G6YagWqr3ys5qj/9Wvb1sMqP2Km+uWjkX3w6/RbbyiPLuvQiFhS00xBVh39cyzFrYtLaZUzvOP1fTNj+72A== Received: from SN7PR04CA0105.namprd04.prod.outlook.com (2603:10b6:806:122::20) by DS0PR12MB9058.namprd12.prod.outlook.com (2603:10b6:8:c6::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7339.39; Tue, 5 Mar 2024 09:59:10 +0000 Received: from SA2PEPF0000150B.namprd04.prod.outlook.com (2603:10b6:806:122:cafe::cb) by SN7PR04CA0105.outlook.office365.com (2603:10b6:806:122::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7339.39 via Frontend Transport; Tue, 5 Mar 2024 09:59:10 +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 SA2PEPF0000150B.mail.protection.outlook.com (10.167.242.43) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7362.11 via Frontend Transport; Tue, 5 Mar 2024 09:59:10 +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.986.41; Tue, 5 Mar 2024 01:58:56 -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.1258.12; Tue, 5 Mar 2024 01:58:54 -0800 From: Xueming Li To: Harman Kalra CC: dpdk stable Subject: patch 'common/cnxk: fix VLAN check for inner header' has been queued to stable release 23.11.1 Date: Tue, 5 Mar 2024 17:47:44 +0800 Message-ID: <20240305094757.439387-124-xuemingl@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240305094757.439387-1-xuemingl@nvidia.com> References: <20240305094757.439387-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-TrafficTypeDiagnostic: SA2PEPF0000150B:EE_|DS0PR12MB9058:EE_ X-MS-Office365-Filtering-Correlation-Id: e54bc30b-9dd7-4ecc-308c-08dc3cfae7b8 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: w0z7CuhOAUKimdXh3ySwjNQvEMESFktfEl+RoYUP12mVuZTwWKvVf2m40rOChglxJ1d5V/vJOz09pZBqzbTWohjIuAyLmOsO2JqpEVLrPrhiKJ0M9KxLC9PZahVktO90nyRIHRmaPBEFZtLH+vSOQveAqrSgoXZR+gQIUWTKk3Ot29n/gvrIBMHNrLz+D57V2gBPYbtasYcykH1WLq+N5fVy4L0h5ij0Xhl1mbfky78woJmWvJfDhaqXTGIPqV3Vcj4z2DkuS/phsdTjGa6Mp/0ZEk6UzkAW9kmlLRuY8bSoouyDt4BCif/Dq5ASquGYPF0vzXl1TglVqtkKhjsppTsgtg9+vk6cwpn69pW5/jHGKlVxrXWsoMbyAEo+lD5UYXwH0zotO5IsDT7dSUFCeNCiLZTesXaUI52+WkDF7VXRFHncGwhKlFEddj8ugbYRKkJzXPUFE0m4BSGHZV+qGL1piJG+NHMLzBEdeQ/jlNtpZRsaiYpDACdhNN0Xo05JmzEWmsBTKhHN/3wA35ebdiKilR7Tqi3Cw8VyPgrcM0hWkwjPSonvYEryx/+lDzU22hSKQsUhD6po7moZsP10b4ARdEAm3OIKfgHeQqgTzjMS0KxyRow5V1SiBILFxU+sq9l9ZVmD5rrXg9/1NxFMrLbGBGGZRLrnUnNFmjERHpgCRjcg+AmgNb+Wa+mmF4vuYcQ/kr3GUW4KXi5OZyrTHCHeyB7sWKL9gtxmt22CEuqg4OrZzOtMisn+G8xF1WcI 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:(13230031)(36860700004)(82310400014)(376005); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Mar 2024 09:59:10.5460 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: e54bc30b-9dd7-4ecc-308c-08dc3cfae7b8 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: SA2PEPF0000150B.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS0PR12MB9058 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.1 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 03/31/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=ecdb679c52824c52c0a652a7c0e2936973be8730 Thanks. Xueming Li --- >From ecdb679c52824c52c0a652a7c0e2936973be8730 Mon Sep 17 00:00:00 2001 From: Harman Kalra Date: Thu, 21 Dec 2023 12:08:11 +0530 Subject: [PATCH] common/cnxk: fix VLAN check for inner header Cc: Xueming Li [ upstream commit 4f52aafa5901e653e536eb3126b818d78d7be1bc ] Adding the has vlan check in inner headers i.e in LF layer. If has_vlan is 0 it should be masked out while installing flow rule. Fixes: c34ea71b878d ("common/cnxk: add NPC parsing API") Signed-off-by: Harman Kalra --- drivers/common/cnxk/roc_npc_parse.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/drivers/common/cnxk/roc_npc_parse.c b/drivers/common/cnxk/roc_npc_parse.c index ecd1b3e13b..3c288070fb 100644 --- a/drivers/common/cnxk/roc_npc_parse.c +++ b/drivers/common/cnxk/roc_npc_parse.c @@ -1092,6 +1092,7 @@ npc_parse_lf(struct npc_parse_state *pst) { const struct roc_npc_item_info *pattern, *last_pattern; char hw_mask[NPC_MAX_EXTRACT_HW_LEN]; + const struct roc_npc_flow_item_eth *eth_item; struct npc_parse_item_info info; int lid, lt, lflags; int nr_vlans = 0; @@ -1108,10 +1109,12 @@ npc_parse_lf(struct npc_parse_state *pst) lt = NPC_LT_LF_TU_ETHER; lflags = 0; + eth_item = pst->pattern->spec; + /* No match support for vlan tags */ info.def_mask = NULL; info.hw_mask = NULL; - info.len = pst->pattern->size; + info.len = sizeof(eth_item->hdr); info.spec = NULL; info.mask = NULL; info.hw_hdr_len = 0; @@ -1142,12 +1145,15 @@ npc_parse_lf(struct npc_parse_state *pst) } info.hw_mask = &hw_mask; - info.len = pst->pattern->size; + info.len = sizeof(eth_item->hdr); info.hw_hdr_len = 0; npc_get_hw_supp_mask(pst, &info, lid, lt); info.spec = NULL; info.mask = NULL; + if (eth_item && eth_item->has_vlan) + pst->set_vlan_ltype_mask = true; + rc = npc_parse_item_basic(pst->pattern, &info); if (rc != 0) return rc; -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-03-05 17:39:34.663285022 +0800 +++ 0123-common-cnxk-fix-VLAN-check-for-inner-header.patch 2024-03-05 17:39:30.963566499 +0800 @@ -1 +1 @@ -From 4f52aafa5901e653e536eb3126b818d78d7be1bc Mon Sep 17 00:00:00 2001 +From ecdb679c52824c52c0a652a7c0e2936973be8730 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 4f52aafa5901e653e536eb3126b818d78d7be1bc ] @@ -10 +12,0 @@ -Cc: stable@dpdk.org @@ -18 +20 @@ -index 9ceb707ebb..571d6b8e5d 100644 +index ecd1b3e13b..3c288070fb 100644 @@ -21 +23 @@ -@@ -1097,6 +1097,7 @@ npc_parse_lf(struct npc_parse_state *pst) +@@ -1092,6 +1092,7 @@ npc_parse_lf(struct npc_parse_state *pst) @@ -29 +31 @@ -@@ -1113,10 +1114,12 @@ npc_parse_lf(struct npc_parse_state *pst) +@@ -1108,10 +1109,12 @@ npc_parse_lf(struct npc_parse_state *pst) @@ -43 +45 @@ -@@ -1147,12 +1150,15 @@ npc_parse_lf(struct npc_parse_state *pst) +@@ -1142,12 +1145,15 @@ npc_parse_lf(struct npc_parse_state *pst)