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 6CCF441D8D for ; Mon, 27 Feb 2023 08:09:12 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 68618410D3; Mon, 27 Feb 2023 08:09:12 +0100 (CET) Received: from NAM10-MW2-obe.outbound.protection.outlook.com (mail-mw2nam10on2071.outbound.protection.outlook.com [40.107.94.71]) by mails.dpdk.org (Postfix) with ESMTP id 5A06241140 for ; Mon, 27 Feb 2023 08:09:11 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=nrDSv0zdHOkSiraaN+la7VmPoAXKjxdYf/FXIzOowukJ5g549vwdLNthjfyUln3nf1YCMfudsP8xWOLTtovn/jhANrdUh3zHM3dZD9kCK88O33mJpX2zoyrmzvXy46/99yffQG1LxnE6hvLBW9/MKw2LKyYGRY5kU28FPsUwYVNqAptcs+RXiJ9rdUo2dSd7dwk97ggVyu8yCPWDe4PNMn1Q1t/IepgfhTAH+olU5TuMfVzh4ZqyVVyT7/HiV8eHBHiN9I1kc4CgRX44DTB94NJYtJjOX3b1gWU5AF5kkibvwU1OC3HOjPkPrkOxVktp71JG8j0No1M61lrBfsU6lA== 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=8fRW7bxsuwXRIQUPBklHlfbQqmusDmc/LXdL9YWmQ00=; b=IXb9r/fiUkZFkC5DWeL/Sibw03Gq0rhAREKzak+USq8CiypZCqI6FzZIHBKR+Ok2KqICFXBcWdvc0PtC0QtAarW00A8+lHti9Bo30QMNGDBdG/efwu4P1xbY4IAeG0d5ye4khjZf8PQYujBR7iUi2B2h1dLbecYMkOi5JUM7UxSYUx+bPHqfLdRasyInhB5kmk20KYKtrhyJKA6xR+0n+sYB71QenuAuntmmZ/vVWktR/QiM1Jx57hBWxwOTq4I62dbSJ6Kq1Gl+H7IhSqrUnWMpvwMF7B8itmIMV5ilhzBhAWS2oXTA/VqfduBDzVaXSrzkGgAC58+yyJzPLQ8cJA== 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 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=8fRW7bxsuwXRIQUPBklHlfbQqmusDmc/LXdL9YWmQ00=; b=XrlMPqVvrdsqG5O12lPHtzDcKVdkx87kQHgI+90o+Sdu8iYvgYLG9BGvPpMOgcVBwN3NAJHyx3obYIohcHY3cwjPSW3rwhxLEnN2Ss24GAheZFOqOWMzCc53IB/pNoo/dDZOcar5q+iJxwrRmZwfO8k2Nh81l/2xL3fdJ9cn9QObSW9zXFfyLEK//M7KaCqZ0CwGMcNN8z1xI360cSe2fAGo4mGLVao2MRwyDiLowFRFnYfxtV+VBWnWZnr+RXSVKTXEvPPW4pKfKhBHyVfIhDHYgWNVobfhJeU7YynWbNa+C+WWQzJ2fGnjPnicDRcAkIkkud7BQ5dp6JoNKKHmYw== Received: from BN9PR03CA0382.namprd03.prod.outlook.com (2603:10b6:408:f7::27) by BL3PR12MB6572.namprd12.prod.outlook.com (2603:10b6:208:38f::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6134.24; Mon, 27 Feb 2023 07:09:09 +0000 Received: from BN8NAM11FT036.eop-nam11.prod.protection.outlook.com (2603:10b6:408:f7:cafe::a2) by BN9PR03CA0382.outlook.office365.com (2603:10b6:408:f7::27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6134.29 via Frontend Transport; Mon, 27 Feb 2023 07:09:09 +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 BN8NAM11FT036.mail.protection.outlook.com (10.13.177.168) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6156.16 via Frontend Transport; Mon, 27 Feb 2023 07:09:08 +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.36; Sun, 26 Feb 2023 23:09:01 -0800 Received: from nvidia.com (10.126.230.37) 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.37; Sun, 26 Feb 2023 23:08:59 -0800 From: Xueming Li To: Kiran Kumar K CC: Satheesh Paul , dpdk stable Subject: patch 'common/cnxk: fix IPv6 extension matching' has been queued to stable release 22.11.2 Date: Mon, 27 Feb 2023 14:59:41 +0800 Message-ID: <20230227070107.15664-73-xuemingl@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230227070107.15664-1-xuemingl@nvidia.com> References: <20230227062349.13764-1-xuemingl@nvidia.com> <20230227070107.15664-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.230.37] 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: BN8NAM11FT036:EE_|BL3PR12MB6572:EE_ X-MS-Office365-Filtering-Correlation-Id: 2c275321-2992-420e-6f8f-08db18918579 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 9jOrk2qCDtyM9IzUUDoJlBh2WMyu+0sn7oWcGeXbegrXSMKKdzH1j1UUAsc7W6gLVdjPWOH2SSALDUGZ5pOZiAM58oC1W1xgy9wnxiCkiO8bpx6OYvPeRjK3Y1XHWANZRNAClaDFbu+SE5vaHHRp35C52KcBE3rINNuwavAnp4JrdcWM8OO7m8y2Cnsig6ykbk8HHU//sUUWTXoZeks8PrMkn8+CgttSJKhKFcANy96DQacVQ+AjbKkPtgEQwuDXrkQSMvE4Vmqegl9rNo8ClQnxFqhj8FxNJ3Y3JR+d6YH4SJ84/gITAoitt1fxNoEwmwLO4efkWLoysHT6PcASdwAjQO58hVohNmQ087IDwJqr51NVS/Iavw4LGDWsOSQ+Nz0O9R+hLrmtaz5Q1D/ewJyPFtRZbD7covQRtV4x22FnnQo8dPlruHfiUWkUC9cOaXTDUyTW2VFbn4A775G+mRMABLifxo6pzDvMoT/CzqM7J34Vn3dsg7YzEvaaTFIDzW6pa13Q+JUUx85IkHmp9ldaIEBV0/BfHFqvPeLn4MlkQNwF6E8N6tTDisgihyfY0yikAi4gU8bGRkcKMCZ5V8HFfei/eYs0HNgVUh/qYBL/pnaJ97kM9eTuimGZayca9RsRFSl7BxTjLg8p/f1HM9GGry6wPY8OuV1zq2dASmv+AEgcstDvb31ZABg8A6/+5adz9k1JEjsKG5Rh66E75eM3/8dJOvDQyGeSdBq3MqqxiuvDUhLdro1qTlLR4q8q6fLnh3wpP7SWXx1Ah/WTrZMDAgcYRBK27pHzulmsIp1FIqX2kn2mGgh16raSJ2Aa 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:(13230025)(4636009)(346002)(376002)(39860400002)(136003)(396003)(451199018)(46966006)(40470700004)(36840700001)(82310400005)(2906002)(7636003)(82740400003)(5660300002)(7696005)(356005)(966005)(336012)(478600001)(36756003)(53546011)(55016003)(6286002)(16526019)(426003)(47076005)(26005)(86362001)(186003)(70586007)(40480700001)(54906003)(316002)(6916009)(70206006)(6666004)(83380400001)(8676002)(40460700003)(1076003)(2616005)(4326008)(34020700004)(41300700001)(36860700001)(8936002); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Feb 2023 07:09:08.9678 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 2c275321-2992-420e-6f8f-08db18918579 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: BN8NAM11FT036.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL3PR12MB6572 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 22.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 03/01/23. 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=22.11-staging This queued commit can be viewed at: https://git.dpdk.org/dpdk-stable/commit/?h=22.11-staging&id=4060bba354cd9a09cacdb8c1482a258d25adabec Thanks. Xueming Li --- >From 4060bba354cd9a09cacdb8c1482a258d25adabec Mon Sep 17 00:00:00 2001 From: Kiran Kumar K Date: Thu, 12 Jan 2023 12:06:20 +0530 Subject: [PATCH] common/cnxk: fix IPv6 extension matching Cc: Xueming Li [ upstream commit a9b37dece978538aea728842af23be940a82485d ] While configuring IPv6 flow, IPv6 ext ltype should be matched along with IPv6. Adding changes to fix this issue. Fixes: 474e275b1bc6 ("common/cnxk: support extensions attributes in IPv6 item") Signed-off-by: Kiran Kumar K Reviewed-by: Satheesh Paul --- drivers/common/cnxk/roc_npc_mcam.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/drivers/common/cnxk/roc_npc_mcam.c b/drivers/common/cnxk/roc_npc_mcam.c index a725cabc57..ceb0a733f0 100644 --- a/drivers/common/cnxk/roc_npc_mcam.c +++ b/drivers/common/cnxk/roc_npc_mcam.c @@ -701,15 +701,16 @@ npc_set_ipv6ext_ltype_mask(struct npc_parse_state *pst) * because for AH and ESP, LC LFLAG is zero and we don't want to match * zero in LFLAG. */ - lcflag_offset = - __builtin_popcount(pst->npc->keyx_supp_nmask[pst->nix_intf] & - ((1ULL << NPC_LFLAG_LC_OFFSET) - 1)); - lcflag_offset *= 4; - - mask = (0xfULL << lcflag_offset); - val = pst->flow->mcam_data[0] & mask; - if (val) - pst->flow->mcam_mask[0] |= mask; + if (pst->npc->keyx_supp_nmask[pst->nix_intf] & (1ULL << NPC_LFLAG_LC_OFFSET)) { + lcflag_offset = __builtin_popcount(pst->npc->keyx_supp_nmask[pst->nix_intf] & + ((1ULL << NPC_LFLAG_LC_OFFSET) - 1)); + lcflag_offset *= 4; + + mask = (0xfULL << lcflag_offset); + val = pst->flow->mcam_data[0] & mask; + if (val) + pst->flow->mcam_mask[0] |= mask; + } } int -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-02-27 14:08:43.257499900 +0800 +++ 0074-common-cnxk-fix-IPv6-extension-matching.patch 2023-02-27 14:08:40.799237000 +0800 @@ -1 +1 @@ -From a9b37dece978538aea728842af23be940a82485d Mon Sep 17 00:00:00 2001 +From 4060bba354cd9a09cacdb8c1482a258d25adabec Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit a9b37dece978538aea728842af23be940a82485d ] @@ -10 +12,0 @@ -Cc: stable@dpdk.org @@ -19 +21 @@ -index c419ce3a4c..0abd8872b1 100644 +index a725cabc57..ceb0a733f0 100644 @@ -22 +24 @@ -@@ -727,15 +727,16 @@ npc_set_ipv6ext_ltype_mask(struct npc_parse_state *pst) +@@ -701,15 +701,16 @@ npc_set_ipv6ext_ltype_mask(struct npc_parse_state *pst)