On Fri, Jul 14, 2017 at 02:10:14AM -0700, tip-bot for Wanpeng Li wrote: > Commit-ID: 0e4097c3354e2f5a5ad8affd9dc7f7f7d00bb6b9 > Gitweb: http://git.kernel.org/tip/0e4097c3354e2f5a5ad8affd9dc7f7f7d00bb6b9 > Author: Wanpeng Li <[email protected]> > AuthorDate: Sun, 9 Jul 2017 00:40:28 -0700 > Committer: Ingo Molnar <[email protected]> > CommitDate: Fri, 14 Jul 2017 10:27:15 +0200 > > sched/cputime: Don't use smp_processor_id() in preemptible context > > Recent kernels trigger this warning: > > BUG: using smp_processor_id() in preemptible [00000000] code: 99-trinity/181 > caller is debug_smp_processor_id+0x17/0x19 > CPU: 0 PID: 181 Comm: 99-trinity Not tainted 4.12.0-01059-g2a42eb9 #1 > Call Trace: > dump_stack+0x82/0xb8 > check_preemption_disabled() > debug_smp_processor_id() > vtime_delta() > task_cputime() > thread_group_cputime() > thread_group_cputime_adjusted() > wait_consider_task() > do_wait() > SYSC_wait4() > do_syscall_64() > entry_SYSCALL64_slow_path() > > As Frederic pointed out: > > | Although those sched_clock_cpu() things seem to only matter when the > | sched_clock() is unstable. And that stability is a condition for nohz_full > | to work anyway. So probably sched_clock() alone would be enough. > > This patch fixes it by replacing sched_clock_cpu() with sched_clock() to > avoid calling smp_processor_id() in a preemptible context. > > Reported-by: Xiaolong Ye <[email protected]> > Signed-off-by: Wanpeng Li <[email protected]> > Cc: Frederic Weisbecker <[email protected]> > Cc: Linus Torvalds <[email protected]> > Cc: Luiz Capitulino <[email protected]> > Cc: Peter Zijlstra <[email protected]> > Cc: Rik van Riel <[email protected]> > Cc: Thomas Gleixner <[email protected]> > Link: > http://lkml.kernel.org/r/[email protected] > [ Prettified the changelog. ] > Signed-off-by: Ingo Molnar <[email protected]>
Thanks! The patch looks good!
