From: Stephen Rothwell <sfr@canb•auug.org.au>
To: "Paul E. McKenney" <paulmck@kernel•org>,
Frederic Weisbecker <frederic@kernel•org>,
Neeraj Upadhyay <neeraj.upadhyay@kernel•org>,
Boqun Feng <boqun.feng@gmail•com>,
Uladzislau Rezki <urezki@gmail•com>,
Steven Rostedt <rostedt@goodmis•org>,
Masami Hiramatsu <mhiramat@kernel•org>
Cc: Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>
Subject: linux-next: manual merge of the rcu tree with the ftrace tree
Date: Thu, 6 Nov 2025 12:24:07 +1100 [thread overview]
Message-ID: <20251106122407.57aec996@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 2716 bytes --]
Hi all,
Today's linux-next merge of the rcu tree got a conflict in:
include/linux/tracepoint.h
between commit:
e30f8e61e251 ("tracing: Add a tracepoint verification check at build time")
from the ftrace tree and commit:
e79b1eaca338 ("tracing: Guard __DECLARE_TRACE() use of __DO_TRACE_CALL() with SRCU-fast")
from the rcu tree.
I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging. You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
--
Cheers,
Stephen Rothwell
diff --cc include/linux/tracepoint.h
index 8a56f3278b1b,9f8b19cd303a..000000000000
--- a/include/linux/tracepoint.h
+++ b/include/linux/tracepoint.h
@@@ -275,24 -271,29 +280,30 @@@ static inline struct tracepoint *tracep
return static_branch_unlikely(&__tracepoint_##name.key);\
}
- #define __DECLARE_TRACE(name, proto, args, cond, data_proto) \
+ #define __DECLARE_TRACE(name, proto, args, cond, data_proto) \
__DECLARE_TRACE_COMMON(name, PARAMS(proto), PARAMS(args), PARAMS(data_proto)) \
- static inline void __do_trace_##name(proto) \
- { \
- TRACEPOINT_CHECK(name) \
- if (cond) { \
- guard(preempt_notrace)(); \
- __DO_TRACE_CALL(name, TP_ARGS(args)); \
- } \
- } \
- static inline void trace_##name(proto) \
- { \
- if (static_branch_unlikely(&__tracepoint_##name.key)) \
- __do_trace_##name(args); \
- if (IS_ENABLED(CONFIG_LOCKDEP) && (cond)) { \
- WARN_ONCE(!rcu_is_watching(), \
- "RCU not watching for tracepoint"); \
- } \
+ static inline void __do_trace_##name(proto) \
+ { \
++ TRACEPOINT_CHECK(name) \
+ if (cond) { \
+ if (IS_ENABLED(CONFIG_PREEMPT_RT) && preemptible()) { \
+ guard(srcu_fast_notrace)(&tracepoint_srcu); \
+ guard(migrate)(); \
+ __DO_TRACE_CALL(name, TP_ARGS(args)); \
+ } else { \
+ guard(preempt_notrace)(); \
+ __DO_TRACE_CALL(name, TP_ARGS(args)); \
+ } \
+ } \
+ } \
+ static inline void trace_##name(proto) \
+ { \
+ if (static_branch_unlikely(&__tracepoint_##name.key)) \
+ __do_trace_##name(args); \
+ if (IS_ENABLED(CONFIG_LOCKDEP) && (cond)) { \
+ WARN_ONCE(!rcu_is_watching(), \
+ "RCU not watching for tracepoint"); \
+ } \
}
#define __DECLARE_TRACE_SYSCALL(name, proto, args, data_proto) \
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2025-11-06 1:24 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-11-06 1:24 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2025-11-14 2:52 linux-next: manual merge of the rcu tree with the ftrace tree Stephen Rothwell
2025-11-14 12:42 ` Steven Rostedt
2025-11-14 13:35 ` Sebastian Andrzej Siewior
2025-11-14 15:46 ` Steven Rostedt
2025-11-14 16:00 ` Sebastian Andrzej Siewior
2025-11-14 16:22 ` Steven Rostedt
2025-11-14 16:33 ` Sebastian Andrzej Siewior
2025-11-14 16:48 ` Steven Rostedt
2025-11-14 17:02 ` Sebastian Andrzej Siewior
2025-11-14 17:11 ` Steven Rostedt
2025-11-14 17:00 ` Paul E. McKenney
2025-11-14 17:10 ` Sebastian Andrzej Siewior
2025-11-14 17:25 ` Paul E. McKenney
2025-11-14 17:40 ` Steven Rostedt
2025-11-14 17:41 ` Sebastian Andrzej Siewior
2025-11-14 18:26 ` Paul E. McKenney
2025-11-14 14:48 ` Frederic Weisbecker
2025-11-14 16:01 ` Steven Rostedt
2025-11-14 17:06 ` Paul E. McKenney
2025-11-14 18:58 ` Paul E. McKenney
2025-11-18 13:05 ` Frederic Weisbecker
2025-11-18 15:04 ` Paul E. McKenney
2025-12-02 0:57 ` Paul E. McKenney
2025-12-07 20:43 ` Paul E. McKenney
2025-12-08 0:17 ` Steven Rostedt
2025-12-08 4:21 ` Paul E. McKenney
2025-11-14 17:05 ` Paul E. McKenney
2025-11-14 18:31 ` Yonghong Song
2025-11-18 7:35 ` Sebastian Andrzej Siewior
2025-11-18 15:05 ` Paul E. McKenney
2025-11-30 18:49 ` Yonghong Song
2025-11-19 0:38 ` Paul E. McKenney
2017-05-01 3:18 Stephen Rothwell
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=20251106122407.57aec996@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=boqun.feng@gmail$(echo .)com \
--cc=frederic@kernel$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mhiramat@kernel$(echo .)org \
--cc=neeraj.upadhyay@kernel$(echo .)org \
--cc=paulmck@kernel$(echo .)org \
--cc=rostedt@goodmis$(echo .)org \
--cc=urezki@gmail$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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