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 1EF8FA0543 for ; Sat, 5 Nov 2022 18:11:57 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 19F134067C; Sat, 5 Nov 2022 18:11:57 +0100 (CET) Received: from mail-wm1-f54.google.com (mail-wm1-f54.google.com [209.85.128.54]) by mails.dpdk.org (Postfix) with ESMTP id 132BC42D1D for ; Sat, 5 Nov 2022 18:11:56 +0100 (CET) Received: by mail-wm1-f54.google.com with SMTP id p13-20020a05600c468d00b003cf8859ed1bso4891982wmo.1 for ; Sat, 05 Nov 2022 10:11:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; 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=DeOYKOZF0S+bCogot6Wura0/NRFodTp2kHPG+orM5Ao=; b=CnZMmMUcYKao5OBfEyI1b3VYIC5APgIe+MpgMRvRTuHyy+z3k7WcbokiJQ3LJAB5n1 gZ1KSP0IKa5tqRGliyv+wZUmEy6BkCQlkQzddD6l9MJ+jD/TvDaZ29fo24vsiTVchNt+ PN3TQNn+/eU8CwQ0LAq4MLdq+4sLsvqGkJ8fa8b/PScKK3nt7gMzuVEU8ieKYXO1Tl1T N2C3rnK82liB9HWt1ichcPOTmPWDU3TiXtmGHNCl18n81TOcOCbkWvsL+Ze8OjtoCvNE AjrZ3MtnQGK/uneJEsrqmWsbmhXHCxN0zA5qKy6d8Xof1c4VLzRe9Ilx6fTJOGr3mI2N 374A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=DeOYKOZF0S+bCogot6Wura0/NRFodTp2kHPG+orM5Ao=; b=bgdBosMF1gYI3eSi/IeH/G6xXVFD7igqzy/QphYQ4bq4rYVVLXxtz7KR55trwJOWaL 7//YCfjllqRxOa53xmsMwGjbaHX589hja4D0OmWU4/TFEJ4wqqKxRsQmOQtGKK+UKXM5 Xz9moAVM/B1bdXLUU9lkt4azx7zXdw/b+4ZL37P0YTLa9H7dy/kIcsbKFNanIJDiYsHZ J0S49QcpWf4vT7V4JNeT7t+hx5nnKOvzu5yDtiUzrSHihhfC03gEE8wk4BkZnl0LKgKy bkOI+teAm6pexsS1CY5r+U0OlmTlNRVjiyL/JzcOcazOXH6GRyLm1WfBaEfTuh1NsvmV TeyQ== X-Gm-Message-State: ACrzQf0jQJwGqLFRqAiokWzOo/gP5kIwl0Kj0qvcazGMIPFx5l4IbDD5 BcL1E0wBtb+kRsmG06l36CNv8BZ1rbg= X-Google-Smtp-Source: AMsMyM4hCRR2DLWYqd/XGImPSfRq/rEi9bcCElSB6CnvtEJmmQjnzZ9mIud3eGexUwiOy3UPRqYKTg== X-Received: by 2002:a1c:3503:0:b0:3c6:fb2a:b115 with SMTP id c3-20020a1c3503000000b003c6fb2ab115mr27867560wma.10.1667668315739; Sat, 05 Nov 2022 10:11:55 -0700 (PDT) Received: from localhost ([2a01:4b00:d307:1000:f1d3:eb5e:11f4:a7d9]) by smtp.gmail.com with ESMTPSA id k8-20020a05600c168800b003cf47fdead5sm2989649wmn.30.2022.11.05.10.11.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 05 Nov 2022 10:11:55 -0700 (PDT) From: luca.boccassi@gmail.com To: David Marchand Cc: Jerin Jacob , Sunil Kumar Kori , dpdk stable Subject: patch 'trace: fix race in debug dump' has been queued to stable release 20.11.7 Date: Sat, 5 Nov 2022 17:11:04 +0000 Message-Id: <20221105171146.1520039-5-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221105171146.1520039-1-luca.boccassi@gmail.com> References: <20221103092758.1099402-100-luca.boccassi@gmail.com> <20221105171146.1520039-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 20.11.7 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 11/07/22. 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/f4cb97882bf55eaa58a1d627bd7fe912cfa0a420 Thanks. Luca Boccassi --- >From f4cb97882bf55eaa58a1d627bd7fe912cfa0a420 Mon Sep 17 00:00:00 2001 From: David Marchand Date: Wed, 14 Sep 2022 13:45:42 +0200 Subject: [PATCH] trace: fix race in debug dump [ upstream commit 782dbf1791911eece2557b1a4b6f7c0ea57ea690 ] trace->nb_trace_mem_list access must be under trace->lock to avoid races with threads allocating/freeing their trace buffers. Fixes: f6b2d65dcd5d ("trace: implement debug dump") Signed-off-by: David Marchand Acked-by: Jerin Jacob Acked-by: Sunil Kumar Kori --- lib/librte_eal/common/eal_common_trace.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/librte_eal/common/eal_common_trace.c b/lib/librte_eal/common/eal_common_trace.c index 8594893a82..f9b26ab3ca 100644 --- a/lib/librte_eal/common/eal_common_trace.c +++ b/lib/librte_eal/common/eal_common_trace.c @@ -255,10 +255,9 @@ trace_lcore_mem_dump(FILE *f) struct __rte_trace_header *header; uint32_t count; + rte_spinlock_lock(&trace->lock); if (trace->nb_trace_mem_list == 0) - return; - - rte_spinlock_lock(&trace->lock); + goto out; fprintf(f, "nb_trace_mem_list = %d\n", trace->nb_trace_mem_list); fprintf(f, "\nTrace mem info\n--------------\n"); for (count = 0; count < trace->nb_trace_mem_list; count++) { @@ -269,6 +268,7 @@ trace_lcore_mem_dump(FILE *f) header->stream_header.lcore_id, header->stream_header.thread_name); } +out: rte_spinlock_unlock(&trace->lock); } -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-11-05 17:11:09.204111079 +0000 +++ 0005-trace-fix-race-in-debug-dump.patch 2022-11-05 17:11:08.570940409 +0000 @@ -1 +1 @@ -From 782dbf1791911eece2557b1a4b6f7c0ea57ea690 Mon Sep 17 00:00:00 2001 +From f4cb97882bf55eaa58a1d627bd7fe912cfa0a420 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 782dbf1791911eece2557b1a4b6f7c0ea57ea690 ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -16 +17 @@ - lib/eal/common/eal_common_trace.c | 6 +++--- + lib/librte_eal/common/eal_common_trace.c | 6 +++--- @@ -19,5 +20,5 @@ -diff --git a/lib/eal/common/eal_common_trace.c b/lib/eal/common/eal_common_trace.c -index 6aa11a3b50..ec168e37b3 100644 ---- a/lib/eal/common/eal_common_trace.c -+++ b/lib/eal/common/eal_common_trace.c -@@ -259,10 +259,9 @@ trace_lcore_mem_dump(FILE *f) +diff --git a/lib/librte_eal/common/eal_common_trace.c b/lib/librte_eal/common/eal_common_trace.c +index 8594893a82..f9b26ab3ca 100644 +--- a/lib/librte_eal/common/eal_common_trace.c ++++ b/lib/librte_eal/common/eal_common_trace.c +@@ -255,10 +255,9 @@ trace_lcore_mem_dump(FILE *f) @@ -36 +37 @@ -@@ -273,6 +272,7 @@ trace_lcore_mem_dump(FILE *f) +@@ -269,6 +268,7 @@ trace_lcore_mem_dump(FILE *f)