patch 'trace: fix overflow in per-lcore trace buffer' has been queued to stable release 24.11.3

[Kevin Traynor]

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 <oleksandrn at interfacemasters.com>
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 <oleksandrn at interfacemasters.com>
Acked-by: Sunil Kumar Kori <skori at marvell.com>
---
 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 at 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)