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 5743C468E4 for ; Thu, 12 Jun 2025 23:10:18 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 5234D42E0C; Thu, 12 Jun 2025 23:10:18 +0200 (CEST) Received: from mail-wm1-f43.google.com (mail-wm1-f43.google.com [209.85.128.43]) by mails.dpdk.org (Postfix) with ESMTP id 2542742E0C for ; Thu, 12 Jun 2025 23:10:17 +0200 (CEST) Received: by mail-wm1-f43.google.com with SMTP id 5b1f17b1804b1-451d41e1ad1so12285415e9.1 for ; Thu, 12 Jun 2025 14:10:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1749762617; x=1750367417; darn=dpdk.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=oieJkdy83YC93GKUcGy6yjIaXeCscwPKGc3Pwi41jNo=; b=YGAgf6wfQOsaIsQmvZjK2Yl2G92Y229E/q3Gv9rdZRh6KqdKMiBRBbyXpqq41oTfxK rh3CeS1tetQY5iScNYVcOogwvzAtHIHFeABD2KlqixffpUkr4JRbdRvLLVPb2i/z/Q80 x/pGJTcJnEkYzW7XdTG/p1m4yX4tgyaUfLgbCnrPqzcQgNYcuru+wI2drJbqDlURfISi AqpUVZhxcYG7fVNE67AhUBKcQAky2gyv8hX87skLfxzqbHGj1s5XaQMN/r2dEpqXNOEZ bVOu7Qpt/0rW1vE5ipeVyAZD3+c3aemvoxb9IdSW/ArOmvHiX7oQsjPhYVI7hSJWZfTE Wleg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1749762617; x=1750367417; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=oieJkdy83YC93GKUcGy6yjIaXeCscwPKGc3Pwi41jNo=; b=ELdhWnNKMtidvW4c9y9nB4xryn72T7P5HdppPgcYZKOWUrrW8RX15THhXk5Jo9KIZV Ak7lrF1Ay4pDgIR/xM+/c8w/0k4jDkRGiG/ZNQe6+h/Vg/TVOaaNzd870QyrZDMiwoVr vOzudu8yJhDPxpoo0pbzB7hMGUBe71jsXTVeWcwamkIlqOIGcQtGF33wnDnF8/06+a34 Jq06D3+mtrznlgi6Jl2zZROhemfv/xORgUIAfgrRwq+oAP7N9tYR5NvsSLkZz0M336Pz c/Kj4IJrGKegS7Sx3ANQ7KKVOEBhQ84lJT4DgdncpZC9dHkNFcTZs752FwYA75atXN3l cMcw== X-Forwarded-Encrypted: i=1; AJvYcCXZOUOEa9OcJTyc7LHUiuXnKsHQGL74XAz0bnCsopI/NsyZbSw+5Sj90oMmhQkMEDeJCETbS9M=@dpdk.org X-Gm-Message-State: AOJu0Yw6o66kHyMLlhODY4g/Rgws30cnQL+atRvcj/zwLfslTWxpHufz E/3Lw1tLq1CfnsJDoADTa/3d8Tb2ayVHpC7pcRkrQXZM/OCknQRy1Pqk X-Gm-Gg: ASbGncv5hqhr/O2g6b4keb6JR31waB4xotOyVcI4SkgLxVc1llXMDOkxO1RvxVx6XtG 3SPRJfgz8bgFdOO7MzKKAoWzKgLPatAOlOmD4codvfRZvjP8sKwd8N+8jMJ6qJ1YaEeV8VMbwsR Q4iXJ0xz0SIetvd/al2D4mjWl8Km/n5mYP0X6J3X3A7HrLVPpVMJ/T03WcqmL9jrSNWdwnv9eAR Myjfs7ny1gkbpSCbtPxgnDoD7hYOo4t0LVXWaHUll3HZ49PLFnbp1GQic7PI7NDM146IYju5Fqz w6WnagLMNXFcNSqF6dl0YX/ohmDPXd1+lgP4IkA8AHNC8b7dQdJELw92iTOrv4IeIXzI X-Google-Smtp-Source: AGHT+IELHRu2WBY8cGQDgqJA8KSV6/Xbb04d47CyJhclKsdTTl2rdVu4Zg+oP/CaYljwIWzLjg/Uyg== X-Received: by 2002:a05:600c:3505:b0:453:78f:fa9f with SMTP id 5b1f17b1804b1-45334a8bbbdmr4602345e9.11.1749762616556; Thu, 12 Jun 2025 14:10:16 -0700 (PDT) Received: from localhost ([2a01:4b00:d036:ae00:f2df:571a:ae4c:bef2]) by smtp.gmail.com with UTF8SMTPSA id 5b1f17b1804b1-4532e261a72sm31334695e9.38.2025.06.12.14.10.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 12 Jun 2025 14:10:16 -0700 (PDT) From: luca.boccassi@gmail.com 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 22.11.9 Date: Thu, 12 Jun 2025 22:07:05 +0100 Message-ID: <20250612210733.2506558-48-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250612210733.2506558-1-luca.boccassi@gmail.com> References: <20250612210733.2506558-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 22.11.9 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/14/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/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/d55ea085e282c18503f831ccee2a408dc469afa3 Thanks. Luca Boccassi --- >From d55ea085e282c18503f831ccee2a408dc469afa3 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 0f8700974f..ffcb14cc1b 100644 --- a/lib/eal/include/rte_trace_point.h +++ b/lib/eal/include/rte_trace_point.h @@ -310,7 +310,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)) @@ -318,8 +318,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.47.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-06-12 22:06:25.643153910 +0100 +++ 0048-trace-fix-overflow-in-per-lcore-trace-buffer.patch 2025-06-12 22:06:23.878044807 +0100 @@ -1 +1 @@ -From 3c440cdfe87a2925af1be023e66bdf0bffc423a4 Mon Sep 17 00:00:00 2001 +From d55ea085e282c18503f831ccee2a408dc469afa3 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 0f8700974f..ffcb14cc1b 100644 @@ -23 +24 @@ -@@ -328,7 +328,7 @@ __rte_trace_mem_get(uint64_t in) +@@ -310,7 +310,7 @@ __rte_trace_mem_get(uint64_t in) @@ -32 +33 @@ -@@ -336,8 +336,6 @@ __rte_trace_mem_get(uint64_t in) +@@ -318,8 +318,6 @@ __rte_trace_mem_get(uint64_t in)