From: Steven Rostedt <rostedt@kernel.org>
To: linux-kernel@vger.kernel.org, linux-trace-kernel@vger.kernel.org
Cc: Masami Hiramatsu <mhiramat@kernel.org>,
Mark Rutland <mark.rutland@arm.com>,
Mathieu Desnoyers <mathieu.desnoyers@efficios.com>,
Andrew Morton <akpm@linux-foundation.org>
Subject: [PATCH 11/12] tracing: Move tracing_set_filter_buffering() into trace_events_hist.c
Date: Fri, 06 Feb 2026 14:37:52 -0500 [thread overview]
Message-ID: <20260206195936.617080218@kernel.org> (raw)
In-Reply-To: 20260206193741.767171392@kernel.org
From: Steven Rostedt <rostedt@goodmis.org>
The function tracing_set_filter_buffering() is only used in
trace_events_hist.c. Move it to that file and make it static.
Signed-off-by: Steven Rostedt (Google) <rostedt@goodmis.org>
---
kernel/trace/trace.c | 20 --------------------
kernel/trace/trace.h | 1 -
kernel/trace/trace_events_hist.c | 20 ++++++++++++++++++++
3 files changed, 20 insertions(+), 21 deletions(-)
diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
index 6a0cea7e63b0..5bc22d966834 100644
--- a/kernel/trace/trace.c
+++ b/kernel/trace/trace.c
@@ -7134,26 +7134,6 @@ u64 tracing_event_time_stamp(struct trace_buffer *buffer, struct ring_buffer_eve
return ring_buffer_event_time_stamp(buffer, rbe);
}
-/*
- * Set or disable using the per CPU trace_buffer_event when possible.
- */
-int tracing_set_filter_buffering(struct trace_array *tr, bool set)
-{
- guard(mutex)(&trace_types_lock);
-
- if (set && tr->no_filter_buffering_ref++)
- return 0;
-
- if (!set) {
- if (WARN_ON_ONCE(!tr->no_filter_buffering_ref))
- return -EINVAL;
-
- --tr->no_filter_buffering_ref;
- }
-
- return 0;
-}
-
struct ftrace_buffer_info {
struct trace_iterator iter;
void *spare;
diff --git a/kernel/trace/trace.h b/kernel/trace/trace.h
index f85c94f2e2d9..374b7c392f0a 100644
--- a/kernel/trace/trace.h
+++ b/kernel/trace/trace.h
@@ -480,7 +480,6 @@ extern struct trace_array *trace_array_find(const char *instance);
extern struct trace_array *trace_array_find_get(const char *instance);
extern u64 tracing_event_time_stamp(struct trace_buffer *buffer, struct ring_buffer_event *rbe);
-extern int tracing_set_filter_buffering(struct trace_array *tr, bool set);
extern int tracing_set_clock(struct trace_array *tr, const char *clockstr);
extern bool trace_clock_in_ns(struct trace_array *tr);
diff --git a/kernel/trace/trace_events_hist.c b/kernel/trace/trace_events_hist.c
index 0fc641461be5..e6f449f53afc 100644
--- a/kernel/trace/trace_events_hist.c
+++ b/kernel/trace/trace_events_hist.c
@@ -6531,6 +6531,26 @@ static bool existing_hist_update_only(char *glob,
return updated;
}
+/*
+ * Set or disable using the per CPU trace_buffer_event when possible.
+ */
+static int tracing_set_filter_buffering(struct trace_array *tr, bool set)
+{
+ guard(mutex)(&trace_types_lock);
+
+ if (set && tr->no_filter_buffering_ref++)
+ return 0;
+
+ if (!set) {
+ if (WARN_ON_ONCE(!tr->no_filter_buffering_ref))
+ return -EINVAL;
+
+ --tr->no_filter_buffering_ref;
+ }
+
+ return 0;
+}
+
static int hist_register_trigger(char *glob,
struct event_trigger_data *data,
struct trace_event_file *file)
--
2.51.0
next prev parent reply other threads:[~2026-02-06 19:58 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-02-06 19:37 [PATCH 00/12] tracing: Clean up trace.c and move some code into other files Steven Rostedt
2026-02-06 19:37 ` [PATCH 01/12] tracing: Make tracing_disabled global for tracing system Steven Rostedt
2026-02-06 19:37 ` [PATCH 02/12] tracing: Make tracing_selftest_running global to the tracing subsystem Steven Rostedt
2026-02-06 19:37 ` [PATCH 03/12] tracing: Move __trace_buffer_{un}lock_*() functions to trace.h Steven Rostedt
2026-02-06 19:37 ` [PATCH 04/12] tracing: Move ftrace_trace_stack() out of trace.c and into trace.h Steven Rostedt
2026-02-06 19:37 ` [PATCH 05/12] tracing: Make printk_trace global for tracing system Steven Rostedt
2026-02-06 19:37 ` [PATCH 06/12] tracing: Make tracing_update_buffers() take NULL for global_trace Steven Rostedt
2026-02-06 19:37 ` [PATCH 07/12] tracing: Have trace_printk functions use flags instead of using global_trace Steven Rostedt
2026-02-06 19:37 ` [PATCH 08/12] tracing: Use system_state in trace_printk_init_buffers() Steven Rostedt
2026-02-06 19:37 ` [PATCH 09/12] tracing: Move trace_printk functions out of trace.c and into trace_printk.c Steven Rostedt
2026-02-06 19:37 ` [PATCH 10/12] tracing: Move pid filtering into trace_pid.c Steven Rostedt
2026-02-06 19:37 ` Steven Rostedt [this message]
2026-02-06 19:37 ` [PATCH 12/12] tracing: Move snapshot code out of trace.c and into trace_snapshot.c Steven Rostedt
2026-02-07 14:56 ` [PATCH 00/12] tracing: Clean up trace.c and move some code into other files Steven Rostedt
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=20260206195936.617080218@kernel.org \
--to=rostedt@kernel.org \
--cc=akpm@linux-foundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-trace-kernel@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=mathieu.desnoyers@efficios.com \
--cc=mhiramat@kernel.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