patch 'trace: fix mode change' has been queued to stable release 20.11.7

luca.boccassi at gmail.com luca.boccassi at gmail.com
Sat Nov 5 18:11:01 CET 2022


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/7c1e74d8b76d81854c1dde35b809200157f33346

Thanks.

Luca Boccassi

---
>From 7c1e74d8b76d81854c1dde35b809200157f33346 Mon Sep 17 00:00:00 2001
From: David Marchand <david.marchand at redhat.com>
Date: Thu, 15 Sep 2022 10:20:55 +0200
Subject: [PATCH] trace: fix mode change

[ upstream commit 15596638721b3d26bdadb5f757402a2942b735ad ]

The API does not state that changing mode should be refused if no trace
point is enabled. Remove this limitation.

Fixes: 84c4fae4628f ("trace: implement operation APIs")

Signed-off-by: David Marchand <david.marchand at redhat.com>
Acked-by: Sunil Kumar Kori <skori at marvell.com>
---
 app/test/test_trace.c                    | 3 ---
 lib/librte_eal/common/eal_common_trace.c | 3 ---
 2 files changed, 6 deletions(-)

diff --git a/app/test/test_trace.c b/app/test/test_trace.c
index 0f9df83c40..acf32d5082 100644
--- a/app/test/test_trace.c
+++ b/app/test/test_trace.c
@@ -101,9 +101,6 @@ test_trace_mode(void)
 
 	current = rte_trace_mode_get();
 
-	if (!rte_trace_is_enabled())
-		return TEST_SKIPPED;
-
 	rte_trace_mode_set(RTE_TRACE_MODE_DISCARD);
 	if (rte_trace_mode_get() != RTE_TRACE_MODE_DISCARD)
 		goto failed;
diff --git a/lib/librte_eal/common/eal_common_trace.c b/lib/librte_eal/common/eal_common_trace.c
index 080278333d..3f4b5c5876 100644
--- a/lib/librte_eal/common/eal_common_trace.c
+++ b/lib/librte_eal/common/eal_common_trace.c
@@ -127,9 +127,6 @@ rte_trace_mode_set(enum rte_trace_mode mode)
 {
 	struct trace_point *tp;
 
-	if (!rte_trace_is_enabled())
-		return;
-
 	STAILQ_FOREACH(tp, &tp_list, next)
 		trace_mode_set(tp->handle, mode);
 
-- 
2.34.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2022-11-05 17:11:08.986275734 +0000
+++ 0002-trace-fix-mode-change.patch	2022-11-05 17:11:08.558940152 +0000
@@ -1 +1 @@
-From 15596638721b3d26bdadb5f757402a2942b735ad Mon Sep 17 00:00:00 2001
+From 7c1e74d8b76d81854c1dde35b809200157f33346 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 15596638721b3d26bdadb5f757402a2942b735ad ]
+
@@ -10 +11,0 @@
-Cc: stable at dpdk.org
@@ -15,2 +16,2 @@
- app/test/test_trace.c             | 3 ---
- lib/eal/common/eal_common_trace.c | 3 ---
+ app/test/test_trace.c                    | 3 ---
+ lib/librte_eal/common/eal_common_trace.c | 3 ---
@@ -20 +21 @@
-index 76af79162b..44ac38a4fa 100644
+index 0f9df83c40..acf32d5082 100644
@@ -23 +24 @@
-@@ -126,9 +126,6 @@ test_trace_mode(void)
+@@ -101,9 +101,6 @@ test_trace_mode(void)
@@ -33,4 +34,4 @@
-diff --git a/lib/eal/common/eal_common_trace.c b/lib/eal/common/eal_common_trace.c
-index d5dbc7d667..1b86f5d2d2 100644
---- a/lib/eal/common/eal_common_trace.c
-+++ b/lib/eal/common/eal_common_trace.c
+diff --git a/lib/librte_eal/common/eal_common_trace.c b/lib/librte_eal/common/eal_common_trace.c
+index 080278333d..3f4b5c5876 100644
+--- a/lib/librte_eal/common/eal_common_trace.c
++++ b/lib/librte_eal/common/eal_common_trace.c


More information about the stable mailing list