Skip to contentSkip to conversation

time/sched_clock: mark sched_clock_read_begin as notrace

PATCH Superseded [email protected] 3 participants 6 messages Sep 28, 2020 – Sep 29, 2020

v1 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 time/sched_clock: mark sched_clock_read_begin as notrace

From: Quanyang Wang <[email protected]>

Since sched_clock_read_begin is called by notrace function sched_clock, it shouldn't be traceable either, or else __ftrace_graph_caller will run into a dead loop on the path (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

Fixes 1b86abc1c645 ("sched_clock: Expose struct clock_read_data")
---
 kernel/time/sched_clock.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
kernel/time/sched_clock.c +1 -1
index 1c03eec6ca9b..58459e1359d7 100644
@@ -68,7 +68,7 @@ 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);
Signature · 1 line
2.17.1
#1 lore raw
Quoted 25 lines · On Mon, Sep 28, 2020 at 06:49:52PM +0800, [email protected] wrote:

From: Quanyang Wang <[email protected]>

Since sched_clock_read_begin is called by notrace function sched_clock, it shouldn't be traceable either, or else __ftrace_graph_caller will run into a dead loop on the path (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

Fixes 1b86abc1c645 ("sched_clock: Expose struct clock_read_data")
---
 kernel/time/sched_clock.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
kernel/time/sched_clock.c +0 -0
index 1c03eec6ca9b..58459e1359d7 100644

kernel/time/sched_clock.c static inline u64 notrace cyc_to_ns(u64 cyc, u32 mult, u32 shift) · line 74

Quoted 8 lines
kernel/time/sched_clock.c +1 -1
@@ -68,7 +68,7 @@ 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);

At the very least sched_clock_read_retry() should also be marked such.

But Steve, how come x86 works? Our sched_clock() doesn't have notrace on at all.

#2 lore raw

Hi Peter,

Quoted 29 lines · Peter Zijlstra
Quoted 28 lines · On Mon, Sep 28, 2020 at 06:49:52PM +0800, [email protected] wrote:

From: Quanyang Wang <[email protected]>

Since sched_clock_read_begin is called by notrace function sched_clock, it shouldn't be traceable either, or else __ftrace_graph_caller will run into a dead loop on the path (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

Fixes 1b86abc1c645 ("sched_clock: Expose struct clock_read_data")
---
  kernel/time/sched_clock.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
kernel/time/sched_clock.c +0 -0
index 1c03eec6ca9b..58459e1359d7 100644
@@ -68,7 +68,7 @@ static inline u64 notrace cyc_to_ns(u64 cyc, u32 mult, u32 shift)
  	return (cyc * mult) >> shift;
  }
 
Quoted 6 lines

kernel/time/sched_clock.c static inline u64 notrace cyc_to_ns(u64 cyc, u32 mult, u32 shift) · line 74

Quoted 5 lines
kernel/time/sched_clock.c +1 -1
-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);

At the very least sched_clock_read_retry() should also be marked such.

In fact, the sched_clock_read_retry is treated as a "inline" function, so

it doesn't trigger the  dead loop. But for safe, add notrace to it is better.

I will send a V2 patch.

Thanks,

Quanyang

Quoted 3 lines

But Steve, how come x86 works? Our sched_clock() doesn't have notrace on at all.

#3 lore raw
In reply to Peter Zijlstra
Quoted 10 lines · On Mon, 28 Sep 2020 12:58:59 +0200 Peter Zijlstra <[email protected]> wrote:

kernel/time/sched_clock.c static inline u64 notrace cyc_to_ns(u64 cyc, u32 mult, u32 shift) · line 74

Quoted 5 lines
kernel/time/sched_clock.c +1 -1
-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);  

At the very least sched_clock_read_retry() should also be marked such.

But Steve, how come x86 works? Our sched_clock() doesn't have notrace on at all.

It's because of that magic in the Makefile that you love so much ;-)

CFLAGS_REMOVE_tsc.o = -pg

-- Steve

#4 lore raw
Quoted 11 lines · Steven Rostedt
Quoted 8 lines · On Mon, 28 Sep 2020 12:58:59 +0200 Peter Zijlstra <[email protected]> wrote:

kernel/time/sched_clock.c static inline u64 notrace cyc_to_ns(u64 cyc, u32 mult, u32 shift) · line 74

Quoted 5 lines
kernel/time/sched_clock.c +1 -1
-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);  

At the very least sched_clock_read_retry() should also be marked such.

Quoted 6 lines
Quoted 2 lines

But Steve, how come x86 works? Our sched_clock() doesn't have notrace on at all.

It's because of that magic in the Makefile that you love so much ;-)

CFLAGS_REMOVE_tsc.o = -pg

ARGH!!, I really should write a script to fix up that mess :/

#5 lore raw
Quoted 12 lines · On Tue, 29 Sep 2020 09:13:33 +0200 Peter Zijlstra <[email protected]> wrote:
Quoted 11 lines · Steven Rostedt
Quoted 8 lines · On Mon, 28 Sep 2020 12:58:59 +0200 Peter Zijlstra <[email protected]> wrote:

kernel/time/sched_clock.c static inline u64 notrace cyc_to_ns(u64 cyc, u32 mult, u32 shift) · line 74

Quoted 5 lines
kernel/time/sched_clock.c +1 -1
-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);    

At the very least sched_clock_read_retry() should also be marked such.

Quoted 8 lines
Quoted 6 lines
Quoted 2 lines

But Steve, how come x86 works? Our sched_clock() doesn't have notrace on at all.

It's because of that magic in the Makefile that you love so much ;-)

CFLAGS_REMOVE_tsc.o = -pg

ARGH!!, I really should write a script to fix up that mess :/

Please don't.

I did this because these files contain lots of functions, that if traced can cause function tracing to reboot without any information, and as you have recently found, they are very hard to find when they do happen.

I much rather blacklist an entire file, than to spend time debugging what function caused the system to reboot.

I'd be OK with both. That is, add "notrace" to all the functions in the file that isn't traced, just for documentation purposes. Perhaps call it something else:

file_notrace ?

and have a comment about it being "this is just to let you know that the functions are not traced because of the file".

And this "file_notrace" could even be:

/*
* Denote functions that are not traced because the make file removes the
* tracing features via a CONFIG_REMOVE_xxx.o = CC_FLAGS_FTRACE or similar.
* This is for documentation purposes only, to remind people why a function
* is not being traced.
*/
#define file_notrace /* Not traced because the file is blacklisted */

We could also add:

#define dir_notrace /* Not traced because the entire directory is blacklisted */

-- Steve