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 627D1A0543 for ; Sat, 5 Nov 2022 18:12:09 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 5D31340151; Sat, 5 Nov 2022 18:12:09 +0100 (CET) Received: from mail-wr1-f48.google.com (mail-wr1-f48.google.com [209.85.221.48]) by mails.dpdk.org (Postfix) with ESMTP id 93C09400D5 for ; Sat, 5 Nov 2022 18:12:07 +0100 (CET) Received: by mail-wr1-f48.google.com with SMTP id a14so10883317wru.5 for ; Sat, 05 Nov 2022 10:12:07 -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=7OhenIzK17AtoziYyoIFaOijaniQIW5S7EfhILjpfO8=; b=Ea4OzOlTn3g1K7qnMbq7W2JCMEY4OEyRFXlQxS4NeCDWoOvR79sfAO1y81p2ylh/Bd Cosar+rRJr7pag79T/LDCIvwydQip58IK+TgiDyuMfgln1jiRKQXF3IH6THWtmzGyMt0 J48xxTYZjXqX57PhG9ZfnMp7l/x9Kev/9MkLc9UmQmCLl8CPvb193JKgi222KtrgIuFr juxZ7Bc+E/cTJ715MMihi673UD41HSGUdQnUmS/bIOfbW/59sqp/Ikx20VWXkFyjw4nw kM4MSmb1vMp6zmRvvXOEipJS6yQTUSDZcI+/Ei+8qHh9sQxcjPOERi7w0I/gv15CE8Bn GdyA== 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=7OhenIzK17AtoziYyoIFaOijaniQIW5S7EfhILjpfO8=; b=hB5psxge4q5WSU7Ux3R9QmqA55vHfavBo9YoDh+t2HVzjDu5bl1Z/RtaByZkjAFYb4 qkgWrnNHns+lk/Rt4xi/+5x86uK4c59lzgV2xdPtLncklmyGSBWcwDjHoTOqCHQnT/IM R2eChIn/u5/HNeseT34V6Z7rd8KfgC7TcQpFaYLbREAD78iQo0LNtkjJnq/HQdH5nDNU RYblKI22TUDzLgYhyASi4yEXZpUVD3lN0tmNb4LpNHLYHU8NNmZBb+xAvA5LZ/U83oKg Dg2Ppx0kNTSrCOeEW90LABtJUbmUOtiW+V5W0kHxriC+tvqkdPaHnj2aL3hylnMOH7EM D6tA== X-Gm-Message-State: ACrzQf3PXIUFWgHTQCVXceAPJ4PrKMIiDzF6mHARoZJuYetkYk0creAV NV7UdnsDvIdl1mFWtLnPLOc= X-Google-Smtp-Source: AMsMyM7NCRZapxbKWAW4MXUmlwUB+YXY2Otu6qaBBXB6FK+X/3yWBYwgHogBfJc/MjZuB8zeuBYVNQ== X-Received: by 2002:adf:e3c1:0:b0:236:6d5d:ffa2 with SMTP id k1-20020adfe3c1000000b002366d5dffa2mr26065243wrm.557.1667668327263; Sat, 05 Nov 2022 10:12:07 -0700 (PDT) Received: from localhost ([2a01:4b00:d307:1000:f1d3:eb5e:11f4:a7d9]) by smtp.gmail.com with ESMTPSA id k4-20020a5d6e84000000b00236722ebe66sm2578510wrz.75.2022.11.05.10.12.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 05 Nov 2022 10:12:06 -0700 (PDT) From: luca.boccassi@gmail.com To: David Marchand Cc: Sunil Kumar Kori , dpdk stable Subject: patch 'trace: fix metadata dump' has been queued to stable release 20.11.7 Date: Sat, 5 Nov 2022 17:11:05 +0000 Message-Id: <20221105171146.1520039-6-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/db083f78abf44f454c667fcdb5693d0b8112d02a Thanks. Luca Boccassi --- >From db083f78abf44f454c667fcdb5693d0b8112d02a Mon Sep 17 00:00:00 2001 From: David Marchand Date: Thu, 15 Sep 2022 13:35:46 +0200 Subject: [PATCH] trace: fix metadata dump [ upstream commit d4cbbee345e2ea1126f3f43cbc1fedaf1245feb0 ] The API does not describe that metadata dump is conditioned to enabling any trace points. While at it, merge dump unit tests into the generic trace_autotest to enhance coverage. Fixes: f6b2d65dcd5d ("trace: implement debug dump") Signed-off-by: David Marchand Acked-by: Sunil Kumar Kori --- app/test/test_trace.c | 36 +++++++++++--------- lib/librte_eal/common/eal_common_trace_ctf.c | 3 -- 2 files changed, 19 insertions(+), 20 deletions(-) diff --git a/app/test/test_trace.c b/app/test/test_trace.c index f62a385af9..4dd083fedc 100644 --- a/app/test/test_trace.c +++ b/app/test/test_trace.c @@ -189,6 +189,23 @@ test_generic_trace_points(void) return TEST_SUCCESS; } +static int +test_trace_dump(void) +{ + rte_trace_dump(stdout); + return 0; +} + +REGISTER_TEST_COMMAND(trace_dump, test_trace_dump); + +static int +test_trace_metadata_dump(void) +{ + return rte_trace_metadata_dump(stdout); +} + +REGISTER_TEST_COMMAND(trace_metadata_dump, test_trace_metadata_dump); + static struct unit_test_suite trace_tests = { .suite_name = "trace autotest", .setup = NULL, @@ -201,6 +218,8 @@ static struct unit_test_suite trace_tests = { TEST_CASE(test_trace_point_globbing), TEST_CASE(test_trace_point_regex), TEST_CASE(test_trace_points_lookup), + TEST_CASE(test_trace_dump), + TEST_CASE(test_trace_metadata_dump), TEST_CASES_END() } }; @@ -212,20 +231,3 @@ test_trace(void) } REGISTER_TEST_COMMAND(trace_autotest, test_trace); - -static int -test_trace_dump(void) -{ - rte_trace_dump(stdout); - return 0; -} - -REGISTER_TEST_COMMAND(trace_dump, test_trace_dump); - -static int -test_trace_metadata_dump(void) -{ - return rte_trace_metadata_dump(stdout); -} - -REGISTER_TEST_COMMAND(trace_metadata_dump, test_trace_metadata_dump); diff --git a/lib/librte_eal/common/eal_common_trace_ctf.c b/lib/librte_eal/common/eal_common_trace_ctf.c index 33e419aac7..94726817b2 100644 --- a/lib/librte_eal/common/eal_common_trace_ctf.c +++ b/lib/librte_eal/common/eal_common_trace_ctf.c @@ -359,9 +359,6 @@ rte_trace_metadata_dump(FILE *f) char *ctf_meta = trace->ctf_meta; int rc; - if (!rte_trace_is_enabled()) - return 0; - if (ctf_meta == NULL) return -EINVAL; -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-11-05 17:11:09.278007086 +0000 +++ 0006-trace-fix-metadata-dump.patch 2022-11-05 17:11:08.574940495 +0000 @@ -1 +1 @@ -From d4cbbee345e2ea1126f3f43cbc1fedaf1245feb0 Mon Sep 17 00:00:00 2001 +From db083f78abf44f454c667fcdb5693d0b8112d02a Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit d4cbbee345e2ea1126f3f43cbc1fedaf1245feb0 ] + @@ -13 +14,0 @@ -Cc: stable@dpdk.org @@ -18,3 +19,3 @@ - app/test/test_trace.c | 44 +++++++++------------------ - lib/eal/common/eal_common_trace_ctf.c | 3 -- - 2 files changed, 15 insertions(+), 32 deletions(-) + app/test/test_trace.c | 36 +++++++++++--------- + lib/librte_eal/common/eal_common_trace_ctf.c | 3 -- + 2 files changed, 19 insertions(+), 20 deletions(-) @@ -23 +24 @@ -index 2660f52f1d..6bedf14024 100644 +index f62a385af9..4dd083fedc 100644 @@ -26,22 +27 @@ -@@ -20,20 +20,6 @@ test_trace(void) - return TEST_SKIPPED; - } - --static int --test_trace_dump(void) --{ -- printf("trace_dump not supported on Windows, skipping test\n"); -- return TEST_SKIPPED; --} -- --static int --test_trace_metadata_dump(void) --{ -- printf("trace_metadata_dump not supported on Windows, skipping test\n"); -- return TEST_SKIPPED; --} -- - #else - - static int32_t -@@ -214,6 +200,19 @@ test_generic_trace_points(void) +@@ -189,6 +189,23 @@ test_generic_trace_points(void) @@ -57,0 +38,2 @@ ++REGISTER_TEST_COMMAND(trace_dump, test_trace_dump); ++ @@ -63,0 +46,2 @@ ++REGISTER_TEST_COMMAND(trace_metadata_dump, test_trace_metadata_dump); ++ @@ -67 +51 @@ -@@ -226,6 +225,8 @@ static struct unit_test_suite trace_tests = { +@@ -201,6 +218,8 @@ static struct unit_test_suite trace_tests = { @@ -76,2 +60 @@ -@@ -236,21 +237,6 @@ test_trace(void) - return unit_test_suite_runner(&trace_tests); +@@ -212,20 +231,3 @@ test_trace(void) @@ -79,0 +63,2 @@ + REGISTER_TEST_COMMAND(trace_autotest, test_trace); +- @@ -86,0 +72,2 @@ +-REGISTER_TEST_COMMAND(trace_dump, test_trace_dump); +- @@ -93,4 +79,0 @@ - #endif /* !RTE_EXEC_ENV_WINDOWS */ - - REGISTER_TEST_COMMAND(trace_autotest, test_trace); --REGISTER_TEST_COMMAND(trace_dump, test_trace_dump); @@ -98,5 +81,5 @@ -diff --git a/lib/eal/common/eal_common_trace_ctf.c b/lib/eal/common/eal_common_trace_ctf.c -index 335932a271..c6775c3b4d 100644 ---- a/lib/eal/common/eal_common_trace_ctf.c -+++ b/lib/eal/common/eal_common_trace_ctf.c -@@ -358,9 +358,6 @@ rte_trace_metadata_dump(FILE *f) +diff --git a/lib/librte_eal/common/eal_common_trace_ctf.c b/lib/librte_eal/common/eal_common_trace_ctf.c +index 33e419aac7..94726817b2 100644 +--- a/lib/librte_eal/common/eal_common_trace_ctf.c ++++ b/lib/librte_eal/common/eal_common_trace_ctf.c +@@ -359,9 +359,6 @@ rte_trace_metadata_dump(FILE *f)