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 D625F4625C for ; Tue, 18 Feb 2025 13:44:32 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id D05EB402A0; Tue, 18 Feb 2025 13:44:32 +0100 (CET) Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on2051.outbound.protection.outlook.com [40.107.220.51]) by mails.dpdk.org (Postfix) with ESMTP id 72664402A0 for ; Tue, 18 Feb 2025 13:44:31 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=AqyIHHgnksUZcZ+7spXnVzfXS9/nfyWB+eAPwlOr8W4rTshF8JHQyjyNOrJythawQDhsP/8zEPCALsQAnBGhvx99s2Ms2688wLy1+SeFAe5xyC0EdfMgSDiXmVbj+q2VYhFy9+C4wd1J9fD3ubiAOAeyBKqfFNpRaU1yHyhzGCcnm5kqqpG1hwOUFCMrYUY0/CUZQy0uI67XYhQj552OxN18+B3fAZ/KePylb6t9oOpHlYtiCb3XYcDSL499JtMIzfbsKm4z4H0Z5WOvz2/LfxLVM9IV0piM9N27T+zktTOlXcwcNSYF4wtjlocRmiUBVBL9pjPyTV3OqAyuueBnTg== 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=xLmGVWA0pN2CRK0wBYJpSuLG759MHAeIn8Ftr5Sh+a0=; b=A3hpG3aeUh0loXZTPZItfL+Cg4mDjrT6YQhIS6MOlmVqADFG/Kfi3lnmVaL89h37ioOubae7odQnlnrtqrydD1oqEbTMuwztalvLNT/fLPLBbXh4AfNoO1OwJEEdvGFSFrMoIK2GPuSidz4MWntoDhyhUMs3gBcdM2tmAJuZqKWgrI4XS5QdwUGdVwzmoawtTJhfB6HbLaJpNC3gsDHV1nkjgrCAQIBxGZyEipvaxO11/623t/AumR4jtlAVlsenY81OdZT6Qh7I/GTVdBY3dBZvkL33CxyTPyPHQe8juWNF6KkNghMn4s/hLbTaRCvLv+C36wpUBfGcXOtM9GfMZA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) smtp.rcpttodomain=networkplumber.org 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=xLmGVWA0pN2CRK0wBYJpSuLG759MHAeIn8Ftr5Sh+a0=; b=bqceo6+FYMs8yT0eclPnzSAL5CPGBOS5HjT83FT9l6816+7Ofy5pk3t5MSNVHHU9KsD+6AmYjeCiXBPHQoe08VUEWkOI0nXjjHYSMmj8Gu0AyMYuA5HEzCKKyGxCdRtCuZTmoG/+wUILLNaR4dVjVGf/qnuCb+dpUQkrpGY9J9aG/7ov2jiuDkWOUG0e0F7o4rnJbRmOtO9lsJYJdebFFA0KGZ8pIxOnXRQ4kQvWpiLSZvzT6RGht1BpiZUm6cipP3u/n8DzONlOXw5yERdmQCbzFlR1+DzPGduGHtbVGB/PiBUGutpQcKFUg/pCEjIBiqjuZHMcYkpIQGCbOUsi2Q== Received: from BY5PR17CA0058.namprd17.prod.outlook.com (2603:10b6:a03:167::35) by MN6PR12MB8590.namprd12.prod.outlook.com (2603:10b6:208:47c::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8445.18; Tue, 18 Feb 2025 12:44:27 +0000 Received: from SJ1PEPF00002323.namprd03.prod.outlook.com (2603:10b6:a03:167:cafe::fd) by BY5PR17CA0058.outlook.office365.com (2603:10b6:a03:167::35) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8445.18 via Frontend Transport; Tue, 18 Feb 2025 12:44:27 +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 SJ1PEPF00002323.mail.protection.outlook.com (10.167.242.85) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8466.11 via Frontend Transport; Tue, 18 Feb 2025 12:44:27 +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; Tue, 18 Feb 2025 04:44:19 -0800 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.14; Tue, 18 Feb 2025 04:44:17 -0800 From: Xueming Li To: Stephen Hemminger CC: , dpdk stable Subject: patch 'examples/l3fwd: fix socket ID check' has been queued to stable release 23.11.4 Date: Tue, 18 Feb 2025 20:35:20 +0800 Message-ID: <20250218123523.36836-86-xuemingl@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250218123523.36836-1-xuemingl@nvidia.com> References: <20250218123523.36836-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: SJ1PEPF00002323:EE_|MN6PR12MB8590:EE_ X-MS-Office365-Filtering-Correlation-Id: da9fac41-5116-4d44-6e88-08dd5019fb34 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|82310400026|1800799024|36860700013|376014|7053199007|13003099007; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?oHqB+ck7eesLlgWbMXf10W4/C80pLamso6rGPnrbL6L5KxbN5JruS9A53Bli?= =?us-ascii?Q?8pVOn+1iNr05FK8va3PLfPPQf2ketopdhLlKmvi1DqFIkDE++mjy3zb879S3?= =?us-ascii?Q?vEy0BDItnExwXw2iym8cBs7svqUqKtJU6Wy4qIbjavLD6mHcon4gsKjeoFvk?= =?us-ascii?Q?KSzZsdkW43x1GQ40T7TmbxJdtSeVBTZEXxg/dxkVrCIEgaP9Nu+cUIQYZGWD?= =?us-ascii?Q?x1Zw0UR4czQcnteIm9AJA4rnxgVUdqjATpcgdbxS93RlVD49o73nPF/CqJu3?= =?us-ascii?Q?yqJztcFwfcktUBhP8/y9B0Wkb2plSi0n8bapOotrdNKtSq41TIUQiZsb/Wyu?= =?us-ascii?Q?g2+3UgaX5whVOLN0kg17S/p03ryGEr2FZsaeu1cOkGlmQq4xAWUiq+ZnQ7s7?= =?us-ascii?Q?lIEGT1+dEJGpitq4esLLWmCI9LG21B4XohOo8pmZBaw0DrGbHU/c+/D76kYs?= =?us-ascii?Q?pH+rRl25FqjsT3MLbKV4cN6YWMlz3aJUI+s2XmitPxcAH1V8pLr7SfzRoODo?= =?us-ascii?Q?t4Ib2Sg7drja6qTHaz2yekz8DVN7eQ46E1PMpmcIn4kFpvIQ4MUoUTfswuut?= =?us-ascii?Q?785sQmUl3nOZfED/z3T+QY/3CIeAgJ5TOywgsTPh5u8MWOMQ7+y4eaqufvrB?= =?us-ascii?Q?xJf97FI7sTI9KgnlgcbNutIjBBhg11KHJqxCttcX1B9ykkj+PJUrSyEOL/SZ?= =?us-ascii?Q?2AKgrMMi+cNTjzr1bEC8KEZg+A5G1viICY8zHb31JUirL0C/6kem59/mhk9b?= =?us-ascii?Q?TX8ry/sHX7k2GVAqHUn+f3pg4uGzLK2WOsJ7YRnnPMB4U7dBOMMWueVaeWw3?= =?us-ascii?Q?jAKFFCfnH1EGluYt/ovbF2BnbHATLcBVSQFNZvmmY5kgGJHS8CpPVLTUMzWP?= =?us-ascii?Q?75RbkVPA1BYeQjph1fwNN5ea5DbbNhqOh50gd33ht2Ns60G0fvk7/xp2s6yb?= =?us-ascii?Q?HomA7+cjTf4oWJAT5PkFrCTqbV9ByqXRRsPAXEF4/n5rH/mhtk6pVue0vDil?= =?us-ascii?Q?0riH3FCXM1rz5FAsykjmcWQD1aHOuIyVrCoOZK2yFaqL8fXbbwQSyyZIWTMR?= =?us-ascii?Q?NIgk68Ytq11wJkhFaa7Xh4F5V706PKypHocXmYUlkpt1br96v/0x8Pjk0ZHH?= =?us-ascii?Q?vjpSFJ/aVMoGMUWyC5Tui37XS3Y5hIAd5djqh6BVayOm8eEBrh0z2DtJ9dBT?= =?us-ascii?Q?jvossOxz7lS+3wydB+i0w7N0NxA2A1KuHVWhcm0Bi0dnP/XwDFudH4+neEWm?= =?us-ascii?Q?hBSPRCH5AXs6CMY4bdGzvChpKEI7L+rJtel0EWTKA3CCp/dGf9+CstzZZWcQ?= =?us-ascii?Q?mmJJAHS4ZhcNmnx+j78diEVRQb41/MOTGVwfB7+4ENVVvKai9o3cB1DIjXYP?= =?us-ascii?Q?mpIsWRBC7qjetrdYGCI7JCvbV1/1rqXQCSWjlDgLmsEWaHxlY84ihnABovCX?= =?us-ascii?Q?Z06eERFPF7ALaxIhUSaFgpz8oZpkj8Jja6JO0dXghrz0D7ztbJzIhQsZBJQU?= =?us-ascii?Q?DK/lYypTfuY2dvQ=3D?= 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)(13003099007); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Feb 2025 12:44:27.5087 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: da9fac41-5116-4d44-6e88-08dd5019fb34 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: SJ1PEPF00002323.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN6PR12MB8590 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.4 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. 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=69dc0d8ed261b364449f78cb1ad2e727e0c3fc10 Thanks. Xueming Li --- >From 69dc0d8ed261b364449f78cb1ad2e727e0c3fc10 Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Wed, 5 Feb 2025 08:23:19 -0800 Subject: [PATCH] examples/l3fwd: fix socket ID check Cc: Xueming Li [ upstream commit a7216f081767c7259dd3fba5eda0ca7b0bcb4595 ] The expression: if ((socketid = rte_lcore_to_socket_id(lcore) != 0) && gets evaluated as socketid = (rte_lcore_to_socket_id(lcore) != 0) which is not what was intended. This is goes all the way back to first release. Link: https://pvs-studio.com/en/blog/posts/cpp/1183/ Fixes: af75078fece3 ("first public release") Signed-off-by: Stephen Hemminger --- examples/l3fwd-power/main.c | 4 ++-- examples/l3fwd/main.c | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/examples/l3fwd-power/main.c b/examples/l3fwd-power/main.c index 7640b5a9a3..b11336e0b9 100644 --- a/examples/l3fwd-power/main.c +++ b/examples/l3fwd-power/main.c @@ -1411,8 +1411,8 @@ check_lcore_params(void) "mask\n", lcore); return -1; } - if ((socketid = rte_lcore_to_socket_id(lcore) != 0) && - (numa_on == 0)) { + socketid = rte_lcore_to_socket_id(lcore); + if (socketid != 0 && numa_on == 0) { printf("warning: lcore %u is on socket %d with numa " "off\n", lcore, socketid); } diff --git a/examples/l3fwd/main.c b/examples/l3fwd/main.c index a239869ada..56d295d76f 100644 --- a/examples/l3fwd/main.c +++ b/examples/l3fwd/main.c @@ -307,8 +307,9 @@ check_lcore_params(void) printf("error: lcore %u is not enabled in lcore mask\n", lcore); return -1; } - if ((socketid = rte_lcore_to_socket_id(lcore) != 0) && - (numa_on == 0)) { + + socketid = rte_lcore_to_socket_id(lcore); + if (socketid != 0 && numa_on == 0) { printf("warning: lcore %u is on socket %d with numa off\n", lcore, socketid); } -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-02-18 19:39:03.643829128 +0800 +++ 0085-examples-l3fwd-fix-socket-ID-check.patch 2025-02-18 19:39:00.738244029 +0800 @@ -1 +1 @@ -From a7216f081767c7259dd3fba5eda0ca7b0bcb4595 Mon Sep 17 00:00:00 2001 +From 69dc0d8ed261b364449f78cb1ad2e727e0c3fc10 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit a7216f081767c7259dd3fba5eda0ca7b0bcb4595 ] @@ -16 +18,0 @@ -Cc: stable@dpdk.org @@ -25 +27 @@ -index d279e664b3..e27b8531b5 100644 +index 7640b5a9a3..b11336e0b9 100644 @@ -28 +30 @@ -@@ -1412,8 +1412,8 @@ check_lcore_params(void) +@@ -1411,8 +1411,8 @@ check_lcore_params(void) @@ -40 +42 @@ -index 994b7dd8e5..ae3b4f6439 100644 +index a239869ada..56d295d76f 100644 @@ -43 +45 @@ -@@ -311,8 +311,9 @@ check_lcore_params(void) +@@ -307,8 +307,9 @@ check_lcore_params(void)