From: Steven Rostedt <rostedt@kernel.org>
To: linux-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>,
Chris Mason <clm@fb.com>, Peter Zijlstra <peterz@infradead.org>,
"Vineeth Pillai (Google)" <vineeth@bitbyteword.org>,
David Sterba <dsterba@suse.com>
Subject: [for-next][PATCH 11/13] btrfs: Use trace_call__##name() at guarded tracepoint call sites
Date: Thu, 26 Mar 2026 10:27:07 -0400 [thread overview]
Message-ID: <20260326142717.686260889@kernel.org> (raw)
In-Reply-To: 20260326142656.794462952@kernel.org
From: "Vineeth Pillai (Google)" <vineeth@bitbyteword.org>
Replace trace_foo() with the new trace_call__foo() at sites already
guarded by trace_foo_enabled(), avoiding a redundant
static_branch_unlikely() re-evaluation inside the tracepoint.
trace_call__foo() calls the tracepoint callbacks directly without
utilizing the static branch again.
Cc: Chris Mason <clm@fb.com>
Link: https://patch.msgid.link/20260323160052.17528-16-vineeth@bitbyteword.org
Suggested-by: Steven Rostedt <rostedt@goodmis.org>
Suggested-by: Peter Zijlstra <peterz@infradead.org>
Signed-off-by: Vineeth Pillai (Google) <vineeth@bitbyteword.org>
Assisted-by: Claude:claude-sonnet-4-6
Acked-by: David Sterba <dsterba@suse.com>
Signed-off-by: Steven Rostedt (Google) <rostedt@goodmis.org>
---
fs/btrfs/extent_map.c | 4 ++--
fs/btrfs/raid56.c | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/fs/btrfs/extent_map.c b/fs/btrfs/extent_map.c
index 095a561d733f..9284c0a81bef 100644
--- a/fs/btrfs/extent_map.c
+++ b/fs/btrfs/extent_map.c
@@ -1318,7 +1318,7 @@ static void btrfs_extent_map_shrinker_worker(struct work_struct *work)
if (trace_btrfs_extent_map_shrinker_scan_enter_enabled()) {
s64 nr = percpu_counter_sum_positive(&fs_info->evictable_extent_maps);
- trace_btrfs_extent_map_shrinker_scan_enter(fs_info, nr);
+ trace_call__btrfs_extent_map_shrinker_scan_enter(fs_info, nr);
}
while (ctx.scanned < ctx.nr_to_scan && !btrfs_fs_closing(fs_info)) {
@@ -1358,7 +1358,7 @@ static void btrfs_extent_map_shrinker_worker(struct work_struct *work)
if (trace_btrfs_extent_map_shrinker_scan_exit_enabled()) {
s64 nr = percpu_counter_sum_positive(&fs_info->evictable_extent_maps);
- trace_btrfs_extent_map_shrinker_scan_exit(fs_info, nr_dropped, nr);
+ trace_call__btrfs_extent_map_shrinker_scan_exit(fs_info, nr_dropped, nr);
}
atomic64_set(&fs_info->em_shrinker_nr_to_scan, 0);
diff --git a/fs/btrfs/raid56.c b/fs/btrfs/raid56.c
index 02105d68accb..30bd6c0fdd1f 100644
--- a/fs/btrfs/raid56.c
+++ b/fs/btrfs/raid56.c
@@ -1743,7 +1743,7 @@ static void submit_read_wait_bio_list(struct btrfs_raid_bio *rbio,
struct raid56_bio_trace_info trace_info = { 0 };
bio_get_trace_info(rbio, bio, &trace_info);
- trace_raid56_read(rbio, bio, &trace_info);
+ trace_call__raid56_read(rbio, bio, &trace_info);
}
submit_bio(bio);
}
@@ -2428,7 +2428,7 @@ static void submit_write_bios(struct btrfs_raid_bio *rbio,
struct raid56_bio_trace_info trace_info = { 0 };
bio_get_trace_info(rbio, bio, &trace_info);
- trace_raid56_write(rbio, bio, &trace_info);
+ trace_call__raid56_write(rbio, bio, &trace_info);
}
submit_bio(bio);
}
--
2.51.0
next prev parent reply other threads:[~2026-03-26 14:26 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-03-26 14:26 [for-next][PATCH 00/13] tracing: Updates for 7.1 Steven Rostedt
2026-03-26 14:26 ` [for-next][PATCH 01/13] tracing: move __printf() attribute on __ftrace_vbprintk() Steven Rostedt
2026-03-26 14:26 ` [for-next][PATCH 02/13] tracing: Remove unnecessary check for EVENT_FILE_FL_FREED Steven Rostedt
2026-03-26 14:26 ` [for-next][PATCH 03/13] tracing: Clean up access to trace_event_file from a file pointer Steven Rostedt
2026-03-26 14:27 ` [for-next][PATCH 04/13] tracing: Free up file->private_data for use by individual events Steven Rostedt
2026-03-26 14:27 ` [for-next][PATCH 05/13] tracing: Pretty-print enum parameters in function arguments Steven Rostedt
2026-03-26 14:27 ` [for-next][PATCH 06/13] tracing: trace_mmap.h: fix a kernel-doc warning Steven Rostedt
2026-03-26 14:27 ` [for-next][PATCH 07/13] tracepoint: Add trace_call__##name() API Steven Rostedt
2026-03-26 14:27 ` [for-next][PATCH 08/13] kernel: Use trace_call__##name() at guarded tracepoint call sites Steven Rostedt
2026-03-26 14:27 ` [for-next][PATCH 09/13] i2c: " Steven Rostedt
2026-03-26 14:27 ` [for-next][PATCH 10/13] spi: " Steven Rostedt
2026-03-26 14:27 ` Steven Rostedt [this message]
2026-03-26 14:27 ` [for-next][PATCH 12/13] mm: damon: " Steven Rostedt
2026-03-26 14:27 ` [for-next][PATCH 13/13] tracing: Move snapshot code out of trace.c and into trace_snapshot.c 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=20260326142717.686260889@kernel.org \
--to=rostedt@kernel.org \
--cc=akpm@linux-foundation.org \
--cc=clm@fb.com \
--cc=dsterba@suse.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=mathieu.desnoyers@efficios.com \
--cc=mhiramat@kernel.org \
--cc=peterz@infradead.org \
--cc=vineeth@bitbyteword.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