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 691D84625C for ; Tue, 18 Feb 2025 13:39:15 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 6269F402A0; Tue, 18 Feb 2025 13:39:15 +0100 (CET) Received: from NAM12-MW2-obe.outbound.protection.outlook.com (mail-mw2nam12on2068.outbound.protection.outlook.com [40.107.244.68]) by mails.dpdk.org (Postfix) with ESMTP id 83FD2402D8 for ; Tue, 18 Feb 2025 13:39:13 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=kjoru/rWO+hPmApp4E6EIaRBx3XxvC/xI/XtU75a2Kij8T1AcTOnLJ3qFxPL6AKQ4UipWL7Y7mMKS9c9e2njp1OdE5skMLjZEcKvCnKULfYBwu6C8kKYUiyANHmrW3hOgeCcZMmF6tL6T+iGEtMWkSpfHDdLsJ/KgnEdaHbLWhkB7Vq9anz+59w/4EaVOiAam5y602ZGkBOpQGnEup0AAlQBEadKid5lyXsLxZj83wE6995nHnHaSzctGGMAEez/B8/ClHpACiVWMZig3YxsG5/AUSLce/ExWTSuDHtcThuEnQME4UIfq7im9GG9AmX9G19rbHSGgDuXA5cHuHHQCg== 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=AUklrJ20GRPVBlB4RA8VrIuEulTszeEj6D6IeBprT6U=; b=ZETXhsTo4FjnG67+ssyZeUlUu3kAseRENMCBDe7Yde3SkVoapoaRZF5TYhcXYY1m4Tq6oQpWsvwzBSM+Roj8VAsVoigkeAyVvxfnE6GVUPHZ8yHKSNU5orelirJO8p1//X3N3mty3wJD/ARsd9BdGGuqYPwlOAFpR9I/ktzufuSMzDu/SVRaAfRUKX3qUzFpFXiIfk4kz/+MrLJl2+a3aufoa5JYlHLtUGRsIUS3SX2G1CZCUVhfmY7LYkJfA/+fVY4kificT+YbxH2It+Wv6YUomjNQIxhAC7prmWJaDDxnZphGv+T0sIfCR5AZl9nnERqUofRFpeCY+jLND8ndvw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) smtp.rcpttodomain=eurecom.fr 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=AUklrJ20GRPVBlB4RA8VrIuEulTszeEj6D6IeBprT6U=; b=V7EvofdHZqQmDNapozxXXFXMk+D1ZgFNK3YM57K6O71nLFJRTIS/ucvyp9N4KTMBBfL31ZcOh0xwwEbaQnIhpHAVBYVHNzbc0uZ29ZhksMn1Ks5k4LncK9m85Zhop6gLwayz0ihFaM1yQ9RC8zUeoFdXSu+GKPIqwaJEUO0YdcGBxDghMH8ZehKaX6m/4sYxCEUZ0jXALA+kAAjCPzIXTf0rNXa8EkfSVacwhT3mPYOUAqeWPLuvy4Aai6HPrfBfIKDkZX5ui4vlwFm5EwgAM3JRmUlWRI4MXWSZKJ/py1+vsYsOqznBDdLs5ccbTVYkBvXHElLPitGn9Z+tZJ1nFA== Received: from MN2PR11CA0015.namprd11.prod.outlook.com (2603:10b6:208:23b::20) by BY5PR12MB4099.namprd12.prod.outlook.com (2603:10b6:a03:20f::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8466.14; Tue, 18 Feb 2025 12:39:08 +0000 Received: from BN3PEPF0000B06F.namprd21.prod.outlook.com (2603:10b6:208:23b:cafe::84) by MN2PR11CA0015.outlook.office365.com (2603:10b6:208:23b::20) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8445.19 via Frontend Transport; Tue, 18 Feb 2025 12:39:08 +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 BN3PEPF0000B06F.mail.protection.outlook.com (10.167.243.74) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8489.2 via Frontend Transport; Tue, 18 Feb 2025 12:39:07 +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:38:56 -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:38:53 -0800 From: Xueming Li To: Ariel Otilibili CC: , Robin Jarry , Luca Vizzarro , dpdk stable Subject: patch 'use Python raw string notation' has been queued to stable release 23.11.4 Date: Tue, 18 Feb 2025 20:34:29 +0800 Message-ID: <20250218123523.36836-35-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: BN3PEPF0000B06F:EE_|BY5PR12MB4099:EE_ X-MS-Office365-Filtering-Correlation-Id: dcc6ca9a-4ec1-4e3c-93df-08dd50193c6b X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|376014|36860700013|82310400026|1800799024|7053199007|13003099007; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?Ov+n3K4Pv2hxdzeKquAZlWQLxEJcWtZ0jjHfQIPr32XopvGwaVkbGyy5BUrr?= =?us-ascii?Q?6jDr1HjK6Z+JheaHZgXbWxiiR35BRM00o9qEepNgzm/ONCpAjk7sFVDIB0p4?= =?us-ascii?Q?9hGDTFecSw8R8aRohXJrbz53lHN+DTIQGHG6Q21dfU4SKYmO7Hb1+lhSF0x0?= =?us-ascii?Q?RgSzyPq6osuT1HNZwjhdlLxendiUK4JNFD6vq0UDFIzfThM0VcQ5sGaSC69g?= =?us-ascii?Q?tNID4Y9NrCF0NAgh14i1Q0VTXVNVEZPY+35v2TjrVue8+kUhpr2wex6U0EvL?= =?us-ascii?Q?XZAWQoxAeVdDLKrlL8O//BzCCilBcaPaGOt+5yDNqeVbkPrzKVMlhU5ydI39?= =?us-ascii?Q?j4rVJ+hk12Rw/odXN+MWw0P3VQ8qVFgE9aBn/l8nBUFeSSkpuqH9CfMM3Lbs?= =?us-ascii?Q?2gynG08J0YJY8YRUqIRkTAupRd/coZ2jd7H1f8uN1FsmIe/ZUSsyDoO13Vzr?= =?us-ascii?Q?EHkt24h8TwCpLSOs2RZFc3svGxuEHyA/tfHQawcR1/yH+YSxs5lsU4JVHNWg?= =?us-ascii?Q?pkCiaB1X/hmvLQPD/LU9S229foW+psFTSjCvMFVegJbzuB7D0Ft7nPQHT1f+?= =?us-ascii?Q?SUuNZLHgkmpxGL7ie5jqkWdbZwjL0f+IkOLKon1SbDGBJijKH+PC/wFyMpi5?= =?us-ascii?Q?VKobprZoaBy6YyUxZv1YFp5c+fP8y94P5PMP0P9DT71YO7bvOejKwZbrgn05?= =?us-ascii?Q?R1j+OgQD8SRd6dKgcLFKCz5nOHVL+dzkmRgMSrzMmnlM+z9ZcLX0B35afZvw?= =?us-ascii?Q?8m8s97himPmQ7PEx15qXezFRjfJp1rU8kJutAba3ghBdqoap8Dts/B+OJpmF?= =?us-ascii?Q?rMnpQqiJdEbb2HpojWtjb+NcjDQd8SRi8MiQdUqzB40V0Cl2aWiYD0ut6w/I?= =?us-ascii?Q?YUYU60oRGiq1F2ITZkRFiJ4yGTmqZWv29qkchwVjTcCjmHs4CvF0LEUirTnG?= =?us-ascii?Q?ogFonjezgOuH7q6AhN6DYvJUxAOm2y+7TBq1ObExAUPqAudAKlP9J2HLCY2c?= =?us-ascii?Q?nfKO+6n1A4AGVIBHw83QD+/TeKcETh1xbAiwu6eWwolt4B/RXiMPeZQLmJgw?= =?us-ascii?Q?IYF5FzgPadgeUxpwTiTtDPJjJgMO7arnDBzCAaUdmQE7viLttuFsqE2k2//r?= =?us-ascii?Q?EHEvLXULvgF4PUqJKIZsqYrkbSSjYWZ4eVTezvB3miEwG8hxNbTziuaeNO+1?= =?us-ascii?Q?tUe54OKF8ux2RtahyytlMtQs9uRyEE+TZw3QkholTPzpSoEru/iQWo5O1t0m?= =?us-ascii?Q?/16dZBzzH3ZdMWH6UtW6KgO3vWn3+/iD5CwcUzeAVTrFvbOPAaoXMIMgxWJ8?= =?us-ascii?Q?nk4WPqtG21tbqI+/iDUwooS3FK7BqLEAwojzkmZ8AO3MgPhVDPviU3cRYgWM?= =?us-ascii?Q?I6AqaYUGOFrY0dfwlsu+zJebEn2sxfUJgm2xJbcApthVcaPooJa/rRwN6Psa?= =?us-ascii?Q?Cyp36qixupCKBcYTa3vHxzAVickx+WpzDHeZAwwjGKnMWsPe4AuVfNgMpvC0?= =?us-ascii?Q?ckqK6j8DUzNq3Es=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)(376014)(36860700013)(82310400026)(1800799024)(7053199007)(13003099007); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Feb 2025 12:39:07.2534 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: dcc6ca9a-4ec1-4e3c-93df-08dd50193c6b 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: BN3PEPF0000B06F.namprd21.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY5PR12MB4099 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=837d7d50fc98f48c06cfbe2b17ebd1e3542348b0 Thanks. Xueming Li --- >From 837d7d50fc98f48c06cfbe2b17ebd1e3542348b0 Mon Sep 17 00:00:00 2001 From: Ariel Otilibili Date: Sat, 14 Dec 2024 11:36:35 +0100 Subject: [PATCH] use Python raw string notation Cc: Xueming Li [ upstream commit d3e90e5e37872f1040f37a08b056102c1a302bb3 ] * follow up of a discussion with Robin Jarry * since 3.12 invalid escape sequences generate SyntaxWarning * in the future, these invalid sequences will generate SyntaxError * therefore changed syntax to raw string notation. Link: https://inbox.dpdk.org/dev/D6AMQXRSG8E7.33BAORRHRHV9A@redhat.com/ Link: https://docs.python.org/3/whatsnew/3.12.html#other-language-changes Fixes: 9d4efc5cc6f9 ("buildtools: fix NUMA nodes count") Fixes: f88b0b892204 ("devtools: forbid indent with tabs in Meson") Suggested-by: Robin Jarry Signed-off-by: Ariel Otilibili Reviewed-by: Luca Vizzarro --- buildtools/get-numa-count.py | 2 +- devtools/check-meson.py | 2 +- dts/tests/TestSuite_smoke_tests.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/buildtools/get-numa-count.py b/buildtools/get-numa-count.py index 2f243886cd..f8bea5b58e 100644 --- a/buildtools/get-numa-count.py +++ b/buildtools/get-numa-count.py @@ -11,7 +11,7 @@ import re if os.name == 'posix': if os.path.isdir('/sys/devices/system/node'): numa_nodes = glob.glob('/sys/devices/system/node/node*') - numa_nodes.sort(key=lambda l: int(re.findall('\d+', l)[0])) + numa_nodes.sort(key=lambda l: int(re.findall(r'\d+', l)[0])) print(int(os.path.basename(numa_nodes[-1])[4:]) + 1) else: subprocess.run(['sysctl', '-n', 'vm.ndomains'], check=False) diff --git a/devtools/check-meson.py b/devtools/check-meson.py index 4b2338828d..9a33d8b036 100755 --- a/devtools/check-meson.py +++ b/devtools/check-meson.py @@ -51,7 +51,7 @@ def check_indentation(filename, contents): code, comments = split_code_comments(line) if not code.strip(): continue - if re.match('^ *\t', code): + if re.match(r'^ *\t', code): print(f'Error parsing {filename}:{lineno}, got some tabulation') if code.endswith('files('): if infiles: diff --git a/dts/tests/TestSuite_smoke_tests.py b/dts/tests/TestSuite_smoke_tests.py index 5e897cf5d2..e130a6b603 100644 --- a/dts/tests/TestSuite_smoke_tests.py +++ b/dts/tests/TestSuite_smoke_tests.py @@ -91,7 +91,7 @@ class SmokeTests(TestSuite): # with the address for the nic we are on in the loop and then captures the # name of the driver in a group devbind_info_for_nic = re.search( - f"{nic.pci}[^\\n]*drv=([\\d\\w-]*) [^\\n]*", + rf"{nic.pci}[^\\n]*drv=([\\d\\w-]*) [^\\n]*", all_nics_in_dpdk_devbind, ) self.verify( -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-02-18 19:39:01.956691919 +0800 +++ 0034-use-Python-raw-string-notation.patch 2025-02-18 19:39:00.528244065 +0800 @@ -1 +1 @@ -From d3e90e5e37872f1040f37a08b056102c1a302bb3 Mon Sep 17 00:00:00 2001 +From 837d7d50fc98f48c06cfbe2b17ebd1e3542348b0 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit d3e90e5e37872f1040f37a08b056102c1a302bb3 ] @@ -15 +17,0 @@ -Cc: stable@dpdk.org @@ -21,5 +23,4 @@ - buildtools/get-numa-count.py | 2 +- - devtools/check-meson.py | 2 +- - dts/framework/testbed_model/traffic_generator/scapy.py | 2 +- - dts/tests/TestSuite_smoke_tests.py | 2 +- - 4 files changed, 4 insertions(+), 4 deletions(-) + buildtools/get-numa-count.py | 2 +- + devtools/check-meson.py | 2 +- + dts/tests/TestSuite_smoke_tests.py | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) @@ -53,12 +53,0 @@ -diff --git a/dts/framework/testbed_model/traffic_generator/scapy.py b/dts/framework/testbed_model/traffic_generator/scapy.py -index d24efc44e6..a16cdf6758 100644 ---- a/dts/framework/testbed_model/traffic_generator/scapy.py -+++ b/dts/framework/testbed_model/traffic_generator/scapy.py -@@ -237,6 +237,6 @@ class ScapyTrafficGenerator(PythonShell, CapturingTrafficGenerator): - ) - # In the string of bytes "b'XXXX'", we only want the contents ("XXXX") - list_of_packets_base64 = re.findall( -- f"^b'({REGEX_FOR_BASE64_ENCODING})'", packet_strs, re.MULTILINE -+ rf"^b'({REGEX_FOR_BASE64_ENCODING})'", packet_strs, re.MULTILINE - ) - return [Ether(base64_bytes(pakt)) for pakt in list_of_packets_base64] @@ -66 +55 @@ -index bc3a2a6bf9..ab5ad44850 100644 +index 5e897cf5d2..e130a6b603 100644 @@ -69 +58 @@ -@@ -136,7 +136,7 @@ class TestSmokeTests(TestSuite): +@@ -91,7 +91,7 @@ class SmokeTests(TestSuite):