time/sched_clock: mark sched_clock_read_begin/retry as notrace
PATCH v2 1/1 time/sched_clock: mark sched_clock_read_begin/retry as notrace
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
---
Changes:
V2: Add notrace to sched_clock_read_retry according to Peter's suggestion.
kernel/time/sched_clock.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
kernel/time/sched_clock.c +2 -2
@@ -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) +int notrace sched_clock_read_retry(unsigned int seq) {return read_seqcount_retry (&cd.seq, seq); }
Signature · 1 line
2.17.1
Quoted 34 lines · On Tue, Sep 29, 2020 at 09:50:51AM +0800, [email protected] wrote:
From: Quanyang Wang <[email protected]>
Since
sched_clock_read_beginandsched_clock_read_retryare called by notrace functionsched_clock, they shouldn't be traceable either, or elseftrace_graph_callerwill 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/retryFixes 1b86abc1c645 ("sched_clock: Expose struct clock_read_data")Signed-off-by Quanyang Wang <[email protected]>---
Changes:
V2: Add notrace tosched_clock_read_retryaccording to Peter's suggestion.kernel/time/sched_clock.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)kernel/time/sched_clock.c +1
-1@@ -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)
kernel/time/sched_clock.c static inline u64 notrace cyc_to_ns(u64 cyc, u32 mult, u32 shift) · line 80
Quoted 10 lines
kernel/time/sched_clock.c +1
-1{ *seq =raw_read_seqcount_latch (&cd.seq);return cd.read_data + (*seq &1 ); } -int sched_clock_read_retry (unsigned int seq) +int notrace sched_clock_read_retry(unsigned int seq) {return read_seqcount_retry (&cd.seq, seq); }
You're inconsistent in the placement of notrace, I prefer the first, the second read like notrace is the return type instead of a qualifier.
In any case,
Hi Peter,
Quoted 40 lines · Peter Zijlstra
Quoted 39 lines · On Tue, Sep 29, 2020 at 09:50:51AM +0800, [email protected] wrote:
From: Quanyang Wang <[email protected]>
Since
sched_clock_read_beginandsched_clock_read_retryare called by notrace functionsched_clock, they shouldn't be traceable either, or elseftrace_graph_callerwill 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/retryFixes 1b86abc1c645 ("sched_clock: Expose struct clock_read_data")Signed-off-by Quanyang Wang <[email protected]>---
Changes:
V2: Add notrace tosched_clock_read_retryaccording to Peter's suggestion.kernel/time/sched_clock.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)kernel/time/sched_clock.c +1
-1@@ -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 ); }
Quoted 7 lines
kernel/time/sched_clock.c static inline u64 notrace cyc_to_ns(u64 cyc, u32 mult, u32 shift) · line 80
Quoted 5 lines
kernel/time/sched_clock.c +1
-1-int sched_clock_read_retry (unsigned int seq) +int notrace sched_clock_read_retry(unsigned int seq) {return read_seqcount_retry (&cd.seq, seq); }You're inconsistent in the placement of notrace, I prefer the first, the second read like notrace is the return type instead of a qualifier.
Thanks for your review. I will send a V3 patch to fix it.
Thanks,
Quanyang
Quoted 4 lines
In any case,