From: Gabriele Monaco <gmonaco@redhat.com>
To: linux-kernel@vger.kernel.org,
Steven Rostedt <rostedt@goodmis.org>,
Masami Hiramatsu <mhiramat@kernel.org>,
linux-trace-kernel@vger.kernel.org
Cc: Gabriele Monaco <gmonaco@redhat.com>,
Ingo Molnar <mingo@redhat.com>,
Peter Zijlstra <peterz@infradead.org>,
Juri Lelli <juri.lelli@redhat.com>
Subject: [PATCH v2 01/11] tracing: Fix DECLARE_TRACE_CONDITION
Date: Thu, 13 Feb 2025 10:07:59 +0100 [thread overview]
Message-ID: <20250213090819.419470-2-gmonaco@redhat.com> (raw)
In-Reply-To: <20250213090819.419470-1-gmonaco@redhat.com>
Commit 287050d39026 ("tracing: Add TRACE_EVENT_CONDITIONAL()") adds
macros to define conditional trace events (TRACE_EVENT_CONDITIONAL) and
tracepoints (DECLARE_TRACE_CONDITION), but sets up functionality for
direct use only for the former.
Add preprocessor bits in define_trace.h to allow usage of
DECLARE_TRACE_CONDITION just like DECLARE_TRACE.
Fixes: 287050d39026 ("tracing: Add TRACE_EVENT_CONDITIONAL()")
Link: https://lore.kernel.org/linux-trace-kernel/20250128111926.303093-1-gmonaco@redhat.com
Reviewed-by: Masami Hiramatsu (Google) <mhiramat@kernel.org>
Signed-off-by: Gabriele Monaco <gmonaco@redhat.com>
---
include/trace/define_trace.h | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/include/trace/define_trace.h b/include/trace/define_trace.h
index e1c1079f8c8db..ed52d0506c69f 100644
--- a/include/trace/define_trace.h
+++ b/include/trace/define_trace.h
@@ -76,6 +76,10 @@
#define DECLARE_TRACE(name, proto, args) \
DEFINE_TRACE(name, PARAMS(proto), PARAMS(args))
+#undef DECLARE_TRACE_CONDITION
+#define DECLARE_TRACE_CONDITION(name, proto, args, cond) \
+ DEFINE_TRACE(name, PARAMS(proto), PARAMS(args))
+
/* If requested, create helpers for calling these tracepoints from Rust. */
#ifdef CREATE_RUST_TRACE_POINTS
#undef DEFINE_RUST_DO_TRACE
@@ -108,6 +112,8 @@
/* Make all open coded DECLARE_TRACE nops */
#undef DECLARE_TRACE
#define DECLARE_TRACE(name, proto, args)
+#undef DECLARE_TRACE_CONDITION
+#define DECLARE_TRACE_CONDITION(name, proto, args, cond)
#ifdef TRACEPOINTS_ENABLED
#include <trace/trace_events.h>
@@ -129,6 +135,7 @@
#undef DEFINE_EVENT_CONDITION
#undef TRACE_HEADER_MULTI_READ
#undef DECLARE_TRACE
+#undef DECLARE_TRACE_CONDITION
/* Only undef what we defined in this file */
#ifdef UNDEF_TRACE_INCLUDE_FILE
--
2.48.1
next prev parent reply other threads:[~2025-02-13 9:08 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-02-13 9:07 [PATCH v2 00/11] rv: Add scheduler specification monitors Gabriele Monaco
2025-02-13 9:07 ` Gabriele Monaco [this message]
2025-02-13 9:08 ` [PATCH v2 02/11] rv: Add license identifiers to monitor files Gabriele Monaco
2025-02-13 9:08 ` [PATCH v2 03/11] sched: Add sched tracepoints for RV task model Gabriele Monaco
2025-02-14 8:00 ` kernel test robot
2025-02-14 11:15 ` Gabriele Monaco
2025-02-17 16:39 ` Steven Rostedt
2025-02-14 9:52 ` kernel test robot
2025-02-17 16:38 ` Steven Rostedt
2025-02-17 16:49 ` Peter Zijlstra
2025-02-17 17:16 ` Steven Rostedt
2025-02-18 7:06 ` Gabriele Monaco
2025-02-13 9:08 ` [PATCH v2 04/11] rv: Add option for nested monitors and include sched Gabriele Monaco
2025-02-16 22:39 ` kernel test robot
2025-02-17 6:56 ` Gabriele Monaco
2025-02-13 9:08 ` [PATCH v2 05/11] rv: Add sco and tss per-cpu monitors Gabriele Monaco
2025-02-13 9:08 ` [PATCH v2 06/11] rv: Add snroc per-task monitor Gabriele Monaco
2025-02-13 9:08 ` [PATCH v2 07/11] rv: Add scpd, snep and sncid per-cpu monitors Gabriele Monaco
2025-02-13 9:08 ` [PATCH v2 08/11] tools/rv: Add support for nested monitors Gabriele Monaco
2025-02-13 9:08 ` [PATCH v2 09/11] verification/dot2k: " Gabriele Monaco
2025-02-13 9:08 ` [PATCH v2 10/11] Documentation/rv: Add docs for the sched monitors Gabriele Monaco
2025-02-13 9:08 ` [PATCH v2 11/11] tools/rv: Allow rv list to filter for container Gabriele Monaco
-- strict thread matches above, loose matches on Subject: below --
2025-02-17 13:11 [PATCH v2 00/11] rv: Add scheduler specification monitors Gabriele Monaco
2025-02-17 13:11 ` [PATCH v2 01/11] tracing: Fix DECLARE_TRACE_CONDITION Gabriele Monaco
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250213090819.419470-2-gmonaco@redhat.com \
--to=gmonaco@redhat.com \
--cc=juri.lelli@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-trace-kernel@vger.kernel.org \
--cc=mhiramat@kernel.org \
--cc=mingo@redhat.com \
--cc=peterz@infradead.org \
--cc=rostedt@goodmis.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).