ARM: sched_clock: Add more notrace to prevent recursion
Subsystems (2)
PATCH 1/1 ARM: sched_clock: Add more notrace to prevent recursion
cyc_to_sched_clock() is called by sched_clock() and cyc_to_ns() is called by cyc_to_sched_clock(). I suspect that some compilers inline both of these functions into sched_clock() and so we've been getting away without having a notrace marking. It seems that my compiler isn't inlining cyc_to_sched_clock() though, so I'm hitting a recursion bug when I enable the function graph tracer, causing my system to crash. Marking these functions notrace fixes it. Technically cyc_to_ns() doesn't need the notrace because it's already marked inline, but let's just add it so that if we ever remove inline from that function it doesn't blow up.
--- arch/arm/kernel/sched_clock.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm/kernel/sched_clock.c +2 -2
@@ -45,12 +45,12 @@ static u32 notrace jiffy_sched_clock_read(void)static u32 __read_mostly (*read_sched_clock)(void ) = jiffy_sched_clock_read; -static inline u64 cyc_to_ns (u64 cyc,u32 mult,u32 shift) +static inline u64 notrace cyc_to_ns(u64 cyc, u32 mult, u32 shift) {return (cyc * mult) >> shift; } -static unsigned long long cyc_to_sched_clock (u32 cyc,u32 mask) +static unsigned long long notrace cyc_to_sched_clock (u32 cyc,u32 mask) {u64 epoch_ns;u32 epoch_cyc;
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, hosted by The Linux Foundation
Quoted 10 lines · Stephen Boyd
cyc_to_sched_clock()is called bysched_clock()andcyc_to_ns()is called bycyc_to_sched_clock(). I suspect that some compilers inline both of these functions intosched_clock()and so we've been getting away without having a notrace marking. It seems that my compiler isn't inliningcyc_to_sched_clock()though, so I'm hitting a recursion bug when I enable the function graph tracer, causing my system to crash. Marking these functions notrace fixes it. Technicallycyc_to_ns()doesn't need the notrace because it's already marked inline, but let's just add it so that if we ever remove inline from that function it doesn't blow up.
Anyone else seeing this problem?
Quoted 25 lines
Signed-off-by Stephen Boyd <[email protected]>--- arch/arm/kernel/sched_clock.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)arch/arm/kernel/sched_clock.c +2
-2@@ -45,12 +45,12 @@ static u32 notrace jiffy_sched_clock_read(void)static u32 __read_mostly (*read_sched_clock)(void ) = jiffy_sched_clock_read; -static inline u64 cyc_to_ns (u64 cyc,u32 mult,u32 shift) +static inline u64 notrace cyc_to_ns(u64 cyc, u32 mult, u32 shift) {return (cyc * mult) >> shift; } -static unsigned long long cyc_to_sched_clock (u32 cyc,u32 mask) +static unsigned long long notrace cyc_to_sched_clock (u32 cyc,u32 mask) {u64 epoch_ns;u32 epoch_cyc;
Signature · 2 lines
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation
Quoted 11 lines · Stephen Boyd
Quoted 10 lines · Stephen Boyd
cyc_to_sched_clock()is called bysched_clock()andcyc_to_ns()is called bycyc_to_sched_clock(). I suspect that some compilers inline both of these functions intosched_clock()and so we've been getting away without having a notrace marking. It seems that my compiler isn't inliningcyc_to_sched_clock()though, so I'm hitting a recursion bug when I enable the function graph tracer, causing my system to crash. Marking these functions notrace fixes it. Technicallycyc_to_ns()doesn't need the notrace because it's already marked inline, but let's just add it so that if we ever remove inline from that function it doesn't blow up.
Quoted 1 line
Anyone else seeing this problem?
Russell, should I put this into the patch tracker?
Quoted 24 lines
Quoted 24 lines
Signed-off-by Stephen Boyd <[email protected]>--- arch/arm/kernel/sched_clock.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)arch/arm/kernel/sched_clock.c +2
-2@@ -45,12 +45,12 @@ static u32 notrace jiffy_sched_clock_read(void)static u32 __read_mostly (*read_sched_clock)(void ) = jiffy_sched_clock_read; -static inline u64 cyc_to_ns (u64 cyc,u32 mult,u32 shift) +static inline u64 notrace cyc_to_ns(u64 cyc, u32 mult, u32 shift) {return (cyc * mult) >> shift; } -static unsigned long long cyc_to_sched_clock (u32 cyc,u32 mask) +static unsigned long long notrace cyc_to_sched_clock (u32 cyc,u32 mask) {u64 epoch_ns;u32 epoch_cyc;
Signature · 2 lines
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation
Quoted 12 lines · Stephen Boyd
Quoted 11 lines · Stephen Boyd
Quoted 10 lines · Stephen Boyd
cyc_to_sched_clock()is called bysched_clock()andcyc_to_ns()is called bycyc_to_sched_clock(). I suspect that some compilers inline both of these functions intosched_clock()and so we've been getting away without having a notrace marking. It seems that my compiler isn't inliningcyc_to_sched_clock()though, so I'm hitting a recursion bug when I enable the function graph tracer, causing my system to crash. Marking these functions notrace fixes it. Technicallycyc_to_ns()doesn't need the notrace because it's already marked inline, but let's just add it so that if we ever remove inline from that function it doesn't blow up.
Quoted 2 lines
Quoted 1 line
Anyone else seeing this problem?
Russell, should I put this into the patch tracker?
I'll throw this into the patch tracker tomorrow if nobody complains.
Quoted 25 lines
Quoted 24 lines
Quoted 24 lines
Signed-off-by Stephen Boyd <[email protected]>--- arch/arm/kernel/sched_clock.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)arch/arm/kernel/sched_clock.c +2
-2@@ -45,12 +45,12 @@ static u32 notrace jiffy_sched_clock_read(void)static u32 __read_mostly (*read_sched_clock)(void ) = jiffy_sched_clock_read; -static inline u64 cyc_to_ns (u64 cyc,u32 mult,u32 shift) +static inline u64 notrace cyc_to_ns(u64 cyc, u32 mult, u32 shift) {return (cyc * mult) >> shift; } -static unsigned long long cyc_to_sched_clock (u32 cyc,u32 mask) +static unsigned long long notrace cyc_to_sched_clock (u32 cyc,u32 mask) {u64 epoch_ns;u32 epoch_cyc;
Signature · 2 lines
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation
Quoted 13 lines · Stephen Boyd
Quoted 12 lines · Stephen Boyd
Quoted 11 lines · Stephen Boyd
Quoted 10 lines · Stephen Boyd
cyc_to_sched_clock()is called bysched_clock()andcyc_to_ns()is called bycyc_to_sched_clock(). I suspect that some compilers inline both of these functions intosched_clock()and so we've been getting away without having a notrace marking. It seems that my compiler isn't inliningcyc_to_sched_clock()though, so I'm hitting a recursion bug when I enable the function graph tracer, causing my system to crash. Marking these functions notrace fixes it. Technicallycyc_to_ns()doesn't need the notrace because it's already marked inline, but let's just add it so that if we ever remove inline from that function it doesn't blow up.
Quoted 4 lines
Quoted 2 lines
Quoted 1 line
Anyone else seeing this problem?
Russell, should I put this into the patch tracker?
I'll throw this into the patch tracker tomorrow if nobody complains.
Or you could do so today.