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 76C5646BAE for ; Fri, 18 Jul 2025 21:35:19 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 7065840611; Fri, 18 Jul 2025 21:35:19 +0200 (CEST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mails.dpdk.org (Postfix) with ESMTP id DB67740E35 for ; Fri, 18 Jul 2025 21:35:17 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1752867317; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=6CNgcV6ZC6658ut5v2q/I/RldRgRdyIQ3K/TRcojxy0=; b=aZplIwbBfPXIN7vey2p/pQrbY2uTvfdAKi9/c1Bu8oLij2CdyTiLJ1ATx4n6hWu7vP98p4 BrCbwnoD5Q4/G3+xJQXnp+GaFcDVlOo4hOpxzk9JumabIvowd9+M8/YU+2LhDK6fuGb7tK VsQlljpvwBHEiP0xglxBlpLTB6IS8/k= Received: from mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-411--NNQYx-9NDuA2T60b6h5Zw-1; Fri, 18 Jul 2025 15:35:16 -0400 X-MC-Unique: -NNQYx-9NDuA2T60b6h5Zw-1 X-Mimecast-MFC-AGG-ID: -NNQYx-9NDuA2T60b6h5Zw_1752867315 Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 4BFEC19560AD; Fri, 18 Jul 2025 19:35:15 +0000 (UTC) Received: from rh.redhat.com (unknown [10.44.32.40]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id A237518003FC; Fri, 18 Jul 2025 19:35:13 +0000 (UTC) From: Kevin Traynor To: Oleksandr Nahnybida Cc: Sunil Kumar Kori , dpdk stable Subject: patch 'trace: fix overflow in per-lcore trace buffer' has been queued to stable release 24.11.3 Date: Fri, 18 Jul 2025 20:30:01 +0100 Message-ID: <20250718193247.1008129-67-ktraynor@redhat.com> In-Reply-To: <20250718193247.1008129-1-ktraynor@redhat.com> References: <20250718193247.1008129-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: wK7AsRGBcVdwvNoWofJWS2IaAc0sZe_hxi4UdXa42wk_1752867315 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit content-type: text/plain; charset="US-ASCII"; x-default=true 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 24.11.3 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 07/23/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://github.com/kevintraynor/dpdk-stable This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/91e27c004f719228fcd6bce52fc554819f4da3e6 Thanks. Kevin --- >From 91e27c004f719228fcd6bce52fc554819f4da3e6 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 [ 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 87b5f43c3c..71aea97bf2 100644 --- a/lib/eal/include/rte_trace_point.h +++ b/lib/eal/include/rte_trace_point.h @@ -325,5 +325,5 @@ __rte_trace_mem_get(uint64_t in) } /* 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 */ @@ -333,6 +333,4 @@ __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; -- 2.50.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-07-18 20:29:13.380904482 +0100 +++ 0067-trace-fix-overflow-in-per-lcore-trace-buffer.patch 2025-07-18 20:29:10.967907444 +0100 @@ -1 +1 @@ -From 3c440cdfe87a2925af1be023e66bdf0bffc423a4 Mon Sep 17 00:00:00 2001 +From 91e27c004f719228fcd6bce52fc554819f4da3e6 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 3c440cdfe87a2925af1be023e66bdf0bffc423a4 ] + @@ -11 +12,0 @@ -Cc: stable@dpdk.org @@ -20 +21 @@ -index 8a317d31d2..343e0271b3 100644 +index 87b5f43c3c..71aea97bf2 100644 @@ -23 +24 @@ -@@ -329,5 +329,5 @@ __rte_trace_mem_get(uint64_t in) +@@ -325,5 +325,5 @@ __rte_trace_mem_get(uint64_t in) @@ -30 +31 @@ -@@ -337,6 +337,4 @@ __rte_trace_mem_get(uint64_t in) +@@ -333,6 +333,4 @@ __rte_trace_mem_get(uint64_t in)