From: Steven Rostedt <[email protected]>

In preparation to convert protection of tracepoints from being protected
by a preempt disabled section to being protected by SRCU, have all the
perf callbacks disable preemption as perf expects preemption to be
disabled when processing tracepoints.

While at it, convert the perf system call callback preempt_disable() to a
guard(preempt).

Link: 
https://lore.kernel.org/all/[email protected]/
Link: https://patch.msgid.link/20260108220550.2f6638f3@fedora

Signed-off-by: Steven Rostedt (Google) <[email protected]>
---
 include/trace/perf.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/trace/perf.h b/include/trace/perf.h
index a1754b73a8f5..348ad1d9b556 100644
--- a/include/trace/perf.h
+++ b/include/trace/perf.h
@@ -71,6 +71,7 @@ perf_trace_##call(void *__data, proto)                        
                \
        u64 __count __attribute__((unused));                            \
        struct task_struct *__task __attribute__((unused));             \
                                                                        \
+       guard(preempt_notrace)();                                       \
        do_perf_trace_##call(__data, args);                             \
 }
 
@@ -85,9 +86,8 @@ perf_trace_##call(void *__data, proto)                        
                \
        struct task_struct *__task __attribute__((unused));             \
                                                                        \
        might_fault();                                                  \
-       preempt_disable_notrace();                                      \
+       guard(preempt_notrace)();                                       \
        do_perf_trace_##call(__data, args);                             \
-       preempt_enable_notrace();                                       \
 }
 
 /*
-- 
2.51.0



Reply via email to