In message: [linux-yocto-dev standard/base][PATCH 1/1] time/sched_clock: Mark sched_clock_read_begin/retry() as notrace on 06/11/2020 [email protected] wrote:
> From: Quanyang Wang <[email protected]> > > Since sched_clock_read_begin() and sched_clock_read_retry() are called > by notrace function sched_clock(), they shouldn't be traceable either, > or else ftrace_graph_caller will run into a dead loop on the path > as below (arm for instance): > > ftrace_graph_caller() > prepare_ftrace_return() > function_graph_enter() > ftrace_push_return_trace() > trace_clock_local() > sched_clock() > sched_clock_read_begin/retry() > > Fixes: 1b86abc1c645 ("sched_clock: Expose struct clock_read_data") > Signed-off-by: Quanyang Wang <[email protected]> > Signed-off-by: Thomas Gleixner <[email protected]> > Acked-by: Peter Zijlstra (Intel) <[email protected]> > Cc: [email protected] > Link: > https://lore.kernel.org/r/[email protected] > --- > Hi Bruce, > This patch is picked up from mainline v5.10. Would you please help merge this > to linux-yocto-dev standard/base? I'm sure that you've noticed by now, that I moved the v5.9 -dev content to v5.9/* in linux-yocto-dev. standard/* is now v5.10 This didn't apply cleanly to v5.9/standard/base, but I resolved the conflict and merged it out .. let me know if anything is still broken. Bruce > > kernel/time/sched_clock.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/kernel/time/sched_clock.c b/kernel/time/sched_clock.c > index 0642013dace4..b1b9b12899f5 100644 > --- a/kernel/time/sched_clock.c > +++ b/kernel/time/sched_clock.c > @@ -68,13 +68,13 @@ static inline u64 notrace cyc_to_ns(u64 cyc, u32 mult, > u32 shift) > return (cyc * mult) >> shift; > } > > -struct clock_read_data *sched_clock_read_begin(unsigned int *seq) > +notrace struct clock_read_data *sched_clock_read_begin(unsigned int *seq) > { > *seq = raw_read_seqcount_latch(&cd.seq); > return cd.read_data + (*seq & 1); > } > > -int sched_clock_read_retry(unsigned int seq) > +notrace int sched_clock_read_retry(unsigned int seq) > { > return read_seqcount_latch_retry(&cd.seq, seq); > } > -- > 2.17.1 >
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#9141): https://lists.yoctoproject.org/g/linux-yocto/message/9141 Mute This Topic: https://lists.yoctoproject.org/mt/78070760/21656 Group Owner: [email protected] Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
