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 7F07946C4D for ; Wed, 30 Jul 2025 09:14:41 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 75CDE40E31; Wed, 30 Jul 2025 09:14:41 +0200 (CEST) Received: from NAM10-MW2-obe.outbound.protection.outlook.com (mail-mw2nam10on2072.outbound.protection.outlook.com [40.107.94.72]) by mails.dpdk.org (Postfix) with ESMTP id 099BA40E2D for ; Wed, 30 Jul 2025 09:14:40 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=LUYbbroXO8+fzCX5pJ9+7+c2XCGKpVbaaxD84fsev5V7NBltzY7+7USxAgG4ym8InwLWNlMPrWqFqFXvIPNJH4G/ma+mMATXKqcSE4PCnuOH5LgtgPvwBpFu3DLRMgD9Lg1rMbQp8g21yrRhUT60TO919lT2+TsI6SuujVlIVCmCiqk4ssgvJ9QzV4DEqiCgDcw8fgtKnkCPMhW8xB++1tdO5GPZ7vCNkSSoc/F97MucTa8/tpIQahEiDRxW91ZfDA0rD+Iyij8YNCloJSv/KcbwSAGilk3+X5LBqQV5kYrMAfW8iDUj/tEJjDN6cdzJqHRzzpQXPq3Z+iM94hPIgA== 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=9shD33yRtTTygmWsjHy4zGGCPUUj7+FoppHvsJN82aU=; b=Pzc5lqaJnK1+xL0n6NBJLtQAZQLSu0daJgt2WLfT7vz5x73CM6wDMUsDYFt7cQ6SVu6keEiFGdXPnLmZ+Xusg3fjQRAGwavMUOhBvQmbWi6agkHPBeikpKpJ/MlpVhiIDS26RRTe8vuZlhtojo7iLfXQZugakw93etMLJ/QmRso/1CguS/UkcH/QREmYmJcW7uBe9huNlVkWE9cmflSBwr1v0q4ZcQPPEA/yD3pdS5x4WJCsU+sMl83da550n6uTWc4pSsThYLzjESSW/gUS54uGBklabLXTlZa3B3Ugv5jD3Km4b++cUVSui2tA9+CuEbNdpit1Pal3/lZe6w+kmg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) smtp.rcpttodomain=suse.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=9shD33yRtTTygmWsjHy4zGGCPUUj7+FoppHvsJN82aU=; b=nqks6iCwN1tS6LQfGcrZIl2cGBzvrvkdEhaS3lMPSY2K6ha7037K+Xpp2vkfTp0Y3lQEtMdn5uAsiZ1uERWWNlvOQFZc9fLtEpvhDb9H+kvHKXR2cESnGNRZ1uo3vlySpXZc3VGfB2D91JH+dnTGyVtkg+Hk+AinzzUk5O9i1lNQaUZTX901tTbJfU0Ix84MTG6gwExDoMeP4FsyEuaoLmlw5qc57NIS9ZkQi00s8wpjHsPdMq7b2IYfmP8E1KcLOFlXBWbip4LLnbs0RTLlXmjkD0Pw8qgLlCpWKoRDvIUuhpOf6DNiwzwBZEfzGPeUWb/n1VE4ueJqhz8g076sAQ== Received: from MW4PR02CA0017.namprd02.prod.outlook.com (2603:10b6:303:16d::24) by DS4PR12MB9612.namprd12.prod.outlook.com (2603:10b6:8:278::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8964.26; Wed, 30 Jul 2025 07:14:34 +0000 Received: from BY1PEPF0001AE17.namprd04.prod.outlook.com (2603:10b6:303:16d:cafe::78) by MW4PR02CA0017.outlook.office365.com (2603:10b6:303:16d::24) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8989.11 via Frontend Transport; Wed, 30 Jul 2025 07:14:34 +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 BY1PEPF0001AE17.mail.protection.outlook.com (10.167.242.107) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8989.10 via Frontend Transport; Wed, 30 Jul 2025 07:14:34 +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.14; Wed, 30 Jul 2025 00:14:10 -0700 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.1544.14; Wed, 30 Jul 2025 00:14:08 -0700 From: Xueming Li To: Clemens Famulla-Conrad CC: Xueming Li , Luca Vizzarro , dpdk stable Subject: patch 'dts: fix deterministic doc' has been queued to stable release 23.11.5 Date: Wed, 30 Jul 2025 15:10:42 +0800 Message-ID: <20250730071045.136672-32-xuemingl@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250730071045.136672-1-xuemingl@nvidia.com> References: <20250626120145.27369-1-xuemingl@nvidia.com> <20250730071045.136672-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: BY1PEPF0001AE17:EE_|DS4PR12MB9612:EE_ X-MS-Office365-Filtering-Correlation-Id: 03bc2531-edc8-4635-004e-08ddcf38bc9b X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|376014|82310400026|36860700013|1800799024|13003099007|7053199007; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?FHGn959NA+qmuyhYbV+VwcZ+VbAiSChCVXK8QLVUcle795ntHqTot0Cpmikk?= =?us-ascii?Q?3D08t+d32u9zxfy/x6lXHyEZYaEPfhTh9xxhgD10TrC3mYtdHDMytaVssYE0?= =?us-ascii?Q?Wdta8wsuMIyuww+59Xz1fJmsLFiE64Yoo30NluHlHOW0QFKCwSFexLLZtnG/?= =?us-ascii?Q?bIteOr91gEYKQB5df1DiQCekaN+uoWdahAunobmNJ+I/OdmRM+0814fkYlbm?= =?us-ascii?Q?td8he1pmm2xj87J1ozajkswnd3HIpflGfFheoWlIAw9UECFlUraFw/7GWfxh?= =?us-ascii?Q?ITbLtZk1eNFHZzRO8hfNWsl9YADBRnOKjduuw/vRExU/ZRkEVTN/X2VPLhm4?= =?us-ascii?Q?m3q7eHMbwhV06Gn+0I2Ke1bxS5p0nNBWFzIANQlFLL3+3oflz3xo4Xc8ivsa?= =?us-ascii?Q?axnY9URu6gwYTKSfQEN6KOwzoYVqtM1Hi6YoTm3m1FuEy/qi7GdLaap0Y3eo?= =?us-ascii?Q?dyNXzz2PC74V6Jw7S3dZYS8q6/qhM3Ux0N+3YKCz/l0TTOacipuGFcxmXqtK?= =?us-ascii?Q?0mbhT6Aeb0ZuU2DNbCGwyo7VcsXmcfhHJ6b8+MxJ8kSKgLS8d2JK+2j8Qgtc?= =?us-ascii?Q?h+YFI4nQWmq2/e0m8wGTVkI2XVOsvdUcdHoZ+yJ1g0GubdxvzPVGfQ8mH6kO?= =?us-ascii?Q?8ZAUS+PHyLrp8kRzO7cKzov76xZg1LEgHK5Do/+lKcf8O0wux76cUnF4oKnF?= =?us-ascii?Q?put+qpdgNaIPsHH2G9bpAvaP/Y/iADfELqxSeRBOBRWZdtlZwqxRDnc+Hl4F?= =?us-ascii?Q?cThP2eaLu01Ue+/Rt8msW/WUNIEFo9uYaGATTED5ygJ72JW0tt1qWdN1iQpt?= =?us-ascii?Q?ZQFIL4EBJ90wEcLQCtl7WE8YqdPaziMH3sqJ7MwtIw6olEvQk1LFA4Y/pz6m?= =?us-ascii?Q?SOvM9eB1sdcZpS3+Sqv+36TCyqgs1SSdltOI6wBjPi4tczwQgzbek6Az2AZm?= =?us-ascii?Q?9z3tePzmdeD1re9TyqlvlBFsKQQsDgXpjcxTEuWm9wrJ9tpnbvW/jlTAl2CA?= =?us-ascii?Q?HpuDQfjMCgONxGSdpmvZArxSwAba4cnJTtDffuMiHOPA24xunfohs3eRc64o?= =?us-ascii?Q?ETpK7vaJ4jhzBne5tJyfew0DdpvVRGnRExk1Ernh/EHnseBACdV0X36iM8xC?= =?us-ascii?Q?Bq/t6RtCqE1LnSBk7x7ozoT4q8qGdBIPuzC2f2e4Iyct1pymJ9a0xDusD4MP?= =?us-ascii?Q?cdQw+xSqMCZ/ntZvDyIOdgovlPhSC/Y70arwrtAeyReeGYayrMkxtyVJaqjS?= =?us-ascii?Q?/OB23E174q+bUo1MJfOcqzYiKR3Spnaxg1486TVGPGtJojPjuQYgG2AMPtMj?= =?us-ascii?Q?jXjDqa54dHtm2s0bLuW8EpFFrswkJhHve9mVgAL+rk+0GfOeSPjNdOwdP7Xe?= =?us-ascii?Q?/ovCeAhh/R5WZI5Ra3RXkA4x3kDyFSgRz2bDOmQHuSC6hsb0p92G+YFtlJa5?= =?us-ascii?Q?wkfHwVlhI55s6reGsr9ZOdOHw+p6AEUlaRcvp0SjB//vDsrOamE4AmaylN5D?= =?us-ascii?Q?8uC2co6UyV4iYWWwsKsI5K11hpM55HRpQN4d?= 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)(82310400026)(36860700013)(1800799024)(13003099007)(7053199007); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Jul 2025 07:14:34.4427 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 03bc2531-edc8-4635-004e-08ddcf38bc9b 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: BY1PEPF0001AE17.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS4PR12MB9612 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.5 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/10/25. 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=f5520b77b358f6ab072762779cd170a0386549a7 Thanks. Xueming Li --- >From f5520b77b358f6ab072762779cd170a0386549a7 Mon Sep 17 00:00:00 2001 From: Clemens Famulla-Conrad Date: Wed, 11 Jun 2025 16:05:30 +0200 Subject: [PATCH] dts: fix deterministic doc Cc: Xueming Li [ upstream commit 5603ab87f2ed666c59cdb3ef7a210c68f3af1f2d ] Previously, `capture_name` defaulted to a "dynamic" value. This caused non-deterministic documentation and could lead to overwriting capture files if the method was called multiple times within a single Python process. Bugzilla ID: 1718 Fixes: cecfe0aabf58 ("dts: add traffic generator abstractions") Signed-off-by: Clemens Famulla-Conrad Reviewed-by: Luca Vizzarro --- .mailmap | 1 + dts/framework/testbed_model/capturing_traffic_generator.py | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.mailmap b/.mailmap index 889fd604fe..ddf58a13f4 100644 --- a/.mailmap +++ b/.mailmap @@ -257,6 +257,7 @@ Cian Ferriter Ciara Loftus Ciara Power Claire Murphy +Clemens Famulla-Conrad Cody Doucette Congwen Zhang Conor Fogarty diff --git a/dts/framework/testbed_model/capturing_traffic_generator.py b/dts/framework/testbed_model/capturing_traffic_generator.py index e6512061d7..2e34cfb464 100644 --- a/dts/framework/testbed_model/capturing_traffic_generator.py +++ b/dts/framework/testbed_model/capturing_traffic_generator.py @@ -80,7 +80,7 @@ class CapturingTrafficGenerator(TrafficGenerator): send_port: Port, receive_port: Port, duration: float, - capture_name: str = _get_default_capture_name(), + capture_name: str = "", ) -> list[Packet]: """Send packets, return received traffic. @@ -109,6 +109,9 @@ class CapturingTrafficGenerator(TrafficGenerator): duration, ) + if not capture_name: + capture_name = _get_default_capture_name() + self._logger.debug(f"Received packets: {get_packet_summaries(received_packets)}") self._write_capture_from_packets(capture_name, received_packets) return received_packets -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-07-30 15:02:13.670682378 +0800 +++ 0031-dts-fix-deterministic-doc.patch 2025-07-30 15:02:12.845770859 +0800 @@ -1 +1 @@ -From 5603ab87f2ed666c59cdb3ef7a210c68f3af1f2d Mon Sep 17 00:00:00 2001 +From f5520b77b358f6ab072762779cd170a0386549a7 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 5603ab87f2ed666c59cdb3ef7a210c68f3af1f2d ] @@ -13 +15,0 @@ -Cc: stable@dpdk.org @@ -18,2 +20,2 @@ - .mailmap | 1 + - .../traffic_generator/capturing_traffic_generator.py | 5 ++++- + .mailmap | 1 + + dts/framework/testbed_model/capturing_traffic_generator.py | 5 ++++- @@ -23 +25 @@ -index eba7383c7d..c7d55c7386 100644 +index 889fd604fe..ddf58a13f4 100644 @@ -26 +28 @@ -@@ -276,6 +276,7 @@ Cian Ferriter +@@ -257,6 +257,7 @@ Cian Ferriter @@ -34,5 +36,6 @@ -diff --git a/dts/framework/testbed_model/traffic_generator/capturing_traffic_generator.py b/dts/framework/testbed_model/traffic_generator/capturing_traffic_generator.py -index 61e5033f0b..a85858ba07 100644 ---- a/dts/framework/testbed_model/traffic_generator/capturing_traffic_generator.py -+++ b/dts/framework/testbed_model/traffic_generator/capturing_traffic_generator.py -@@ -72,7 +72,7 @@ class CapturingTrafficGenerator(TrafficGenerator): +diff --git a/dts/framework/testbed_model/capturing_traffic_generator.py b/dts/framework/testbed_model/capturing_traffic_generator.py +index e6512061d7..2e34cfb464 100644 +--- a/dts/framework/testbed_model/capturing_traffic_generator.py ++++ b/dts/framework/testbed_model/capturing_traffic_generator.py +@@ -80,7 +80,7 @@ class CapturingTrafficGenerator(TrafficGenerator): + send_port: Port, @@ -40 +42,0 @@ - filter_config: PacketFilteringConfig, @@ -45 +47 @@ - """Send `packets` and capture received traffic. + """Send packets, return received traffic. @@ -47 +49 @@ -@@ -106,6 +106,9 @@ class CapturingTrafficGenerator(TrafficGenerator): +@@ -109,6 +109,9 @@ class CapturingTrafficGenerator(TrafficGenerator):