srcu_read_lock_fast_notrace() and srcu_read_unlock_fast_notrace() are used by tracepoints, and their comments say they cannot be traced. They are plain inline functions, as are srcu_check_read_flavor() and the Tiny SRCU versions of __srcu_read_lock_fast() and __srcu_read_unlock_fast() that they call. An out-of-line copy of any of them is untraced only because inline implies notrace.
Mark them notrace explicitly, as srcu_read_lock_notrace() and the Tree SRCU __srcu_read_lock_fast() and __srcu_read_unlock_fast() already are. No functional change. Assisted-by: Claude:claude-opus-5 Signed-off-by: Song Liu <[email protected]> --- include/linux/srcu.h | 8 +++++--- include/linux/srcutiny.h | 5 +++-- include/linux/srcutree.h | 2 +- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/include/linux/srcu.h b/include/linux/srcu.h index bce8cac45474..1ed3fc50b77f 100644 --- a/include/linux/srcu.h +++ b/include/linux/srcu.h @@ -377,7 +377,8 @@ static inline struct srcu_ctr __percpu *srcu_read_lock_fast_updown(struct srcu_s * Used by tracing, cannot be traced and cannot call lockdep. * See srcu_read_lock_fast() for more information. */ -static inline struct srcu_ctr __percpu *srcu_read_lock_fast_notrace(struct srcu_struct *ssp) +static inline struct srcu_ctr __percpu notrace * +srcu_read_lock_fast_notrace(struct srcu_struct *ssp) __acquires_shared(ssp) { struct srcu_ctr __percpu *retval; @@ -524,8 +525,9 @@ srcu_read_unlock_fast_updown(struct srcu_struct *ssp, struct srcu_ctr __percpu * * Used by tracing, cannot be traced and cannot call lockdep. * See srcu_read_unlock_fast() for more information. */ -static inline void srcu_read_unlock_fast_notrace(struct srcu_struct *ssp, - struct srcu_ctr __percpu *scp) __releases_shared(ssp) +static inline void notrace +srcu_read_unlock_fast_notrace(struct srcu_struct *ssp, + struct srcu_ctr __percpu *scp) __releases_shared(ssp) { srcu_check_read_flavor(ssp, SRCU_READ_FLAVOR_FAST); __srcu_read_unlock_fast(ssp, scp); diff --git a/include/linux/srcutiny.h b/include/linux/srcutiny.h index 905b629e8fa3..fdb988d41167 100644 --- a/include/linux/srcutiny.h +++ b/include/linux/srcutiny.h @@ -101,13 +101,14 @@ static inline struct srcu_ctr __percpu *__srcu_ctr_to_ptr(struct srcu_struct *ss return (struct srcu_ctr __percpu *)(intptr_t)idx; } -static inline struct srcu_ctr __percpu *__srcu_read_lock_fast(struct srcu_struct *ssp) +static inline struct srcu_ctr __percpu notrace *__srcu_read_lock_fast(struct srcu_struct *ssp) __acquires_shared(ssp) { return __srcu_ctr_to_ptr(ssp, __srcu_read_lock(ssp)); } -static inline void __srcu_read_unlock_fast(struct srcu_struct *ssp, struct srcu_ctr __percpu *scp) +static inline void notrace +__srcu_read_unlock_fast(struct srcu_struct *ssp, struct srcu_ctr __percpu *scp) __releases_shared(ssp) { __srcu_read_unlock(ssp, __srcu_ptr_to_ctr(ssp, scp)); diff --git a/include/linux/srcutree.h b/include/linux/srcutree.h index fd1a9270cb9a..8328218a34fa 100644 --- a/include/linux/srcutree.h +++ b/include/linux/srcutree.h @@ -368,7 +368,7 @@ __srcu_read_unlock_fast_updown(struct srcu_struct *ssp, struct srcu_ctr __percpu void __srcu_check_read_flavor(struct srcu_struct *ssp, int read_flavor); // Record SRCU-reader usage type only for CONFIG_PROVE_RCU=y kernels. -static inline void srcu_check_read_flavor(struct srcu_struct *ssp, int read_flavor) +static inline void notrace srcu_check_read_flavor(struct srcu_struct *ssp, int read_flavor) { if (IS_ENABLED(CONFIG_PROVE_RCU)) __srcu_check_read_flavor(ssp, read_flavor); -- 2.53.0-Meta
