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 35DB346A63 for ; Thu, 26 Jun 2025 14:07:20 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 2EDE0400D6; Thu, 26 Jun 2025 14:07:20 +0200 (CEST) Received: from NAM12-DM6-obe.outbound.protection.outlook.com (mail-dm6nam12on2079.outbound.protection.outlook.com [40.107.243.79]) by mails.dpdk.org (Postfix) with ESMTP id 4D195400D6 for ; Thu, 26 Jun 2025 14:07:18 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=xgVX4XoMqRrbEzpHNdXKnwnNZsifde7Mb+QiYWMbQzv947064iF0xBWbamojDPJbGz5lj4udMeAebTlupQnFs1KTCzC9TLTei7bLNtkvTkKqzphMlwC6Y8yZzaTOWR6tPGrUCdK+/eTiT4JmG8oGDLvXlovC3z/Ldbxe+9TDLyF3o6Orv4ZxQQ9MSBOWsffpOc0fsQcL4LBZstwMZyJmKlSL5hL6sq+NgocSoqRVU+eUdS5C1zpfTN/DtYEfB9+MO6MB85p0fI8hMq3cPTRmDYkJxLki7tRj3HIDaBE9oYXfY5BmV7gkVccbQIcQ1wQG0z2ptboLDVQOwKWStyCHmg== 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=73wZ2YqSto/cVDQL4wED++X8/El+97qtugpqjmgKcl4=; b=cW4NjFxnLZHUjhJla796aFn+DbYxXQSPgdEIaaw2MKriLiWpQYlCUqjeXQ4W5x8Shn9w6Hn76GmDh2YXKuUhvpqpPiwxqX3CKH7gOploUIS6t73rhSwU8qoUZJMxwq6WuzCLa8OIwraiHKHsAudVSc9rnPYOnMrL/uR54T+HLXuwK0ukU/xK2baJZbwSrgBqY6O0JhtbMhaLcLg+lmMEUA2lNiq11dfUgK4lxIx5BPQlodZn1xW0StXpjFQy1vw/DLtCJxs2c4oW8Iq3+rbQjsdXg9icNDmjnjLC7S93HOtE8A1RMexl3Fe0Hie616t5LQTL0EoEWoomV9/OxwDT0w== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) smtp.rcpttodomain=interfacemasters.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=73wZ2YqSto/cVDQL4wED++X8/El+97qtugpqjmgKcl4=; b=XsarUDVkEXLJvfOJ1m4kWUoNqCZ6jW6TJ8iQ7tPlb7UJTY+ELU2kGNiBz74OYHKlb598o8FWfLy8pEZoDdWyLM51v2kZY0ycv4Zq9J6eK47D9erR2pfPNvXep1Xtgwp2+MS8mPmsMpaaV25tdlp64HKFH82K5HHzmMQ+iAzpZQRo8Xe2pkEpANPDToyC4TamMhhti7GgwWq6La8MY6lE4YYJXGxYzySXD8Epe3Xpwr2EubDmlZ0aWnEaogNe4pa0qvhC07bfUPGazuDV+hVxm58k6YDYY9TLBYDfbUIlY4XvXJWxHLx4GuOPCG0VRK67eZKHHbm78Jbfm99vxy0dYg== Received: from MW4PR03CA0283.namprd03.prod.outlook.com (2603:10b6:303:b5::18) by MN6PR12MB8543.namprd12.prod.outlook.com (2603:10b6:208:47b::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8857.29; Thu, 26 Jun 2025 12:07:15 +0000 Received: from SJ5PEPF000001D0.namprd05.prod.outlook.com (2603:10b6:303:b5:cafe::f3) by MW4PR03CA0283.outlook.office365.com (2603:10b6:303:b5::18) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8880.17 via Frontend Transport; Thu, 26 Jun 2025 12:07:15 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.161) 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.161 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.161; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.161) by SJ5PEPF000001D0.mail.protection.outlook.com (10.167.242.52) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8880.14 via Frontend Transport; Thu, 26 Jun 2025 12:07:15 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.67) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.4; Thu, 26 Jun 2025 05:07:00 -0700 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; Thu, 26 Jun 2025 05:06:58 -0700 From: Xueming Li To: Oleksandr Nahnybida CC: Xueming Li , Sunil Kumar Kori , dpdk stable Subject: patch 'trace: fix overflow in per-lcore trace buffer' has been queued to stable release 23.11.5 Date: Thu, 26 Jun 2025 20:01:17 +0800 Message-ID: <20250626120145.27369-58-xuemingl@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250626120145.27369-1-xuemingl@nvidia.com> References: <20250626120145.27369-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: SJ5PEPF000001D0:EE_|MN6PR12MB8543:EE_ X-MS-Office365-Filtering-Correlation-Id: 57e058cd-e3ca-4a5b-a33b-08ddb4a9fd7d X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|376014|82310400026|1800799024|36860700013|7053199007; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?3TsGN145b4Lku1fMDhVwizkkl2wsRMJDVakR2hMZuIFVtNLNupO3/LW+wthr?= =?us-ascii?Q?wbXe3qMLIZdkFSbZfAIB+fgivMU4EBCEy4PD5u1c+mWblUQbAwrnro4zY1Yk?= =?us-ascii?Q?/JNdmHpF/JY1wO9toioJcHP7aruuFeb7Z7+wlG6jrRRjWFXPhtKVTjTHtaQm?= =?us-ascii?Q?3DvNDDepm1pRSagZ+3SBSckuv9tA2WfbCWMhi1O52P88g7pX1IIyZpk3OAls?= =?us-ascii?Q?sSVdP1ybvP/sWeROgsKkRDN7bDpYnS5flCqkF929jr3A58ytK/wvgyjUpMmv?= =?us-ascii?Q?MllBGjS+Dv49Fb5UV89Czz9+zXdyoPBlPPD2nbZcL7NNJ0pHzhHNqYqIfRek?= =?us-ascii?Q?ddo0Zdsa+uTw3uVKwFZ/um1Wiuu1M+n+f+rVLjlX0jM2tNdxn31voC+ZGFlP?= =?us-ascii?Q?gOcSuNXFysm3cKjAz0prtrIsAshZekRYxmdqwQoOdq7VdXebyYfVkYqXidnW?= =?us-ascii?Q?5vv3sLETkhFGp33cVA3Plznrp1h3q+fJ6kNzY6xZ+3e15PlxMhUmk6DE/p8w?= =?us-ascii?Q?oi+SlsivXjA9SXTH2LgypvHnmsof5CE1vW0NqM0txePNvY8Q34tJMglH/9cd?= =?us-ascii?Q?8eKyT2BbPtbyRENnvyoS3EDQvIcuEEVAv5IAbDT/toidl27SnhPd/cZnzzMk?= =?us-ascii?Q?lrq4+okc28MYBrBYh9EE1x/BTTzyEJm1yQILAFibwwMA9WiBAQmf9VZydDQu?= =?us-ascii?Q?8DD/XbLpJre22vNbEczcxDcFgQ5wZv9kzHciSBX/ERGImkzODfqEYioWDisA?= =?us-ascii?Q?Z2eQrOLPp0AZrYp4BQhC3EvxcR9XFBpo6ZBp6ms2vubpEaA8U9bprA6UITNK?= =?us-ascii?Q?d4fuJChEpGlF6GUC8D8P5upRmTgevH3iXNYIceh84DeKgDAzoYBLONecz8Ui?= =?us-ascii?Q?p40AvPxOEtxFsSxS4Pghe5wUDGvLFui9+SBV1+cUXC6MD/78T8lfCUNmcHeN?= =?us-ascii?Q?5wAbhYUUXTOyW6BzU5YloGPPdNg0v2E/rHDhDohcj076512ccnFCKPuS0jIY?= =?us-ascii?Q?fHFo3OfrOvvRQ0nqU1/HMWTtfCAujl3EiBd5GnLR5TrThl6myENcxjI26ggu?= =?us-ascii?Q?UxJtEG0Q0/g7p3Tmmy9k8yj+1XrWMVbADaqfbLcyv1UG9cpjhALzNUjjGtJC?= =?us-ascii?Q?nwP8ZkwbJ/7zcJsDp7M+3aPmy29XHw1ooJz7tzG7LathLdXi4yTpz7gTJavo?= =?us-ascii?Q?EUtgXYe8jhpJbU2Qb+Xzkg5z/bVpc9IjOnCzdCzYU1qNDpZmFDU6tGFRMaez?= =?us-ascii?Q?eCibA/alLpp+Dcz+/RHUVFbiQHKfaYH7DcdIru1iWWtlsENhUswe8jk9jssf?= =?us-ascii?Q?LAfQcru1HMv+mwE5uVrzuhvwr30OojSJXH+F91Syscq71Vf+Qk4lMWWN5Dr8?= =?us-ascii?Q?lD0WG47YUxAfj1l08jjW6PUkjKrXpc3oFAuAX8omaRZyUFfT5VUMj/I3PN9q?= =?us-ascii?Q?3H+CETdi+vRK9Lvsd3gO7aF7HVSItiv3/e9UnSdsxHrLVoi1SHQP36XohRvd?= =?us-ascii?Q?2yH3GVxp4Ns5Clop8OH8p/wYXmB8CE1zPdjoo8CsJWDXabZm+9/zoZkjog?= =?us-ascii?Q?=3D=3D?= X-Forefront-Antispam-Report: CIP:216.228.117.161; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge2.nvidia.com; CAT:NONE; SFS:(13230040)(376014)(82310400026)(1800799024)(36860700013)(7053199007); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Jun 2025 12:07:15.1436 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 57e058cd-e3ca-4a5b-a33b-08ddb4a9fd7d 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.161]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: SJ5PEPF000001D0.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN6PR12MB8543 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 06/28/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=d4506d1aba3c11b1a500ae58c02de67a5623aad1 Thanks. Xueming Li --- >From d4506d1aba3c11b1a500ae58c02de67a5623aad1 Mon Sep 17 00:00:00 2001 From: Oleksandr Nahnybida Date: Thu, 24 Apr 2025 20:08:18 +0300 Subject: [PATCH] trace: fix overflow in per-lcore trace buffer Cc: Xueming Li [ upstream commit 3c440cdfe87a2925af1be023e66bdf0bffc423a4 ] Offset should be aligned first before checking if there is free space for another write. Bugzilla ID: 1665 Fixes: 032a7e5499a0 ("trace: implement provider payload") Signed-off-by: Oleksandr Nahnybida Acked-by: Sunil Kumar Kori --- lib/eal/include/rte_trace_point.h | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/lib/eal/include/rte_trace_point.h b/lib/eal/include/rte_trace_point.h index 41e2a7f99e..ea49eca1f8 100644 --- a/lib/eal/include/rte_trace_point.h +++ b/lib/eal/include/rte_trace_point.h @@ -323,7 +323,7 @@ __rte_trace_mem_get(uint64_t in) return NULL; } /* Check the wrap around case */ - uint32_t offset = trace->offset; + uint32_t offset = RTE_ALIGN_CEIL(trace->offset, __RTE_TRACE_EVENT_HEADER_SZ); if (unlikely((offset + sz) >= trace->len)) { /* Disable the trace event if it in DISCARD mode */ if (unlikely(in & __RTE_TRACE_FIELD_ENABLE_DISCARD)) @@ -331,8 +331,6 @@ __rte_trace_mem_get(uint64_t in) offset = 0; } - /* Align to event header size */ - offset = RTE_ALIGN_CEIL(offset, __RTE_TRACE_EVENT_HEADER_SZ); void *mem = RTE_PTR_ADD(&trace->mem[0], offset); offset += sz; trace->offset = offset; -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-06-26 19:59:19.987758935 +0800 +++ 0057-trace-fix-overflow-in-per-lcore-trace-buffer.patch 2025-06-26 19:59:17.434418042 +0800 @@ -1 +1 @@ -From 3c440cdfe87a2925af1be023e66bdf0bffc423a4 Mon Sep 17 00:00:00 2001 +From d4506d1aba3c11b1a500ae58c02de67a5623aad1 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 3c440cdfe87a2925af1be023e66bdf0bffc423a4 ] @@ -11 +13,0 @@ -Cc: stable@dpdk.org @@ -20 +22 @@ -index 8a317d31d2..343e0271b3 100644 +index 41e2a7f99e..ea49eca1f8 100644 @@ -23 +25 @@ -@@ -328,7 +328,7 @@ __rte_trace_mem_get(uint64_t in) +@@ -323,7 +323,7 @@ __rte_trace_mem_get(uint64_t in) @@ -32 +34 @@ -@@ -336,8 +336,6 @@ __rte_trace_mem_get(uint64_t in) +@@ -331,8 +331,6 @@ __rte_trace_mem_get(uint64_t in)