wchan: Fix wchan support
Subsystems (26)
Peter Zijlstra
maintainercover wchan: Fix wchan support
Hi,
This fixes up wchan which is various degrees of broken across the architectures.
Patch 4 fixes wchan for x86, which has been returning 0 for the past many releases.
Patch 5 fixes the fundamental race against scheduling.
Patch 6 deletes a lot and makes STACKTRACE unconditional
patch 7 fixes up a few STACKTRACE arch oddities
0day says all builds are good, so it must be perfect :-) I'm planning on queueing up at least the first 5 patches, but I'm hoping the last two patches can be too.
Also available here:
git://git.kernel.org/pub/scm/linux/kernel/git/peterz/queue.git sched/wchan
--- arch/alpha/include/asm/processor.h | 2 +- arch/alpha/kernel/process.c | 5 ++- arch/arc/include/asm/processor.h | 2 -- arch/arc/kernel/stacktrace.c | 19 +--------- arch/arm/include/asm/processor.h | 2 -- arch/arm/kernel/process.c | 24 ------------- arch/arm64/include/asm/processor.h | 2 -- arch/arm64/kernel/process.c | 28 --------------- arch/csky/include/asm/processor.h | 2 -- arch/csky/kernel/stacktrace.c | 26 ++++---------- arch/h8300/include/asm/processor.h | 2 +- arch/h8300/kernel/process.c | 5 +-- arch/hexagon/include/asm/processor.h | 3 -- arch/hexagon/kernel/process.c | 28 --------------- arch/ia64/include/asm/processor.h | 3 -- arch/ia64/kernel/process.c | 31 ----------------- arch/m68k/include/asm/processor.h | 2 +- arch/m68k/kernel/process.c | 4 +-- arch/microblaze/include/asm/processor.h | 2 -- arch/microblaze/kernel/process.c | 6 ---- arch/mips/include/asm/processor.h | 2 -- arch/mips/kernel/process.c | 31 +---------------- arch/mips/kernel/stacktrace.c | 27 ++++++++------ arch/nds32/include/asm/processor.h | 2 -- arch/nds32/kernel/process.c | 28 --------------- arch/nds32/kernel/stacktrace.c | 21 +++++------ arch/nios2/include/asm/processor.h | 2 +- arch/nios2/kernel/process.c | 5 +-- arch/openrisc/include/asm/processor.h | 1 - arch/openrisc/kernel/process.c | 6 ---- arch/parisc/include/asm/processor.h | 2 -- arch/parisc/kernel/process.c | 27 -------------- arch/powerpc/include/asm/processor.h | 2 -- arch/powerpc/kernel/process.c | 40 --------------------- arch/riscv/include/asm/processor.h | 3 -- arch/riscv/kernel/stacktrace.c | 23 ------------ arch/s390/include/asm/processor.h | 1 - arch/s390/kernel/process.c | 29 --------------- arch/sh/include/asm/processor_32.h | 2 -- arch/sh/kernel/process_32.c | 22 ------------ arch/sparc/include/asm/processor_32.h | 2 +- arch/sparc/include/asm/processor_64.h | 2 -- arch/sparc/kernel/process_32.c | 5 +-- arch/sparc/kernel/process_64.c | 31 ----------------- arch/um/include/asm/processor-generic.h | 1 - arch/um/kernel/process.c | 35 ------------------- arch/x86/include/asm/processor.h | 2 -- arch/x86/kernel/process.c | 62 --------------------------------- arch/xtensa/include/asm/processor.h | 2 -- arch/xtensa/kernel/process.c | 32 ----------------- fs/proc/array.c | 7 ++-- fs/proc/base.c | 19 +++++----- include/linux/sched.h | 1 + kernel/sched/core.c | 34 ++++++++++++++++++ lib/Kconfig.debug | 7 +--- scripts/leaking_addresses.pl | 3 +- 56 files changed, 97 insertions(+), 622 deletions(-)
Peter Zijlstra
maintainerPATCH 1/7 Revert "proc/wchan: use printk format instead of lookup_symbol_name()"
From: Kees Cook <[email protected]>
This reverts commit 152c432b128cb043fc107e8f211195fe94b2159c.
When a kernel address couldn't be symbolized for /proc/$pid/wchan, it would leak the raw value, a potential information exposure. This is a regression compared to the safer pre-v5.12 behavior.
--- fs/proc/base.c | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-)
fs/proc/base.c +12 -9
@@ -67,6 +67,7 @@#include <linux/mm.h> #include <linux/swap.h> #include <linux/rcupdate.h> +#include <linux/kallsyms.h> #include <linux/stacktrace.h> #include <linux/resource.h> #include <linux/module.h>
@@ -386,17 +387,19 @@ static int proc_pid_wchan(struct seq_fil struct pid *pid, struct task_struct *task) { unsigned long wchan; +char symname[KSYM_NAME_LEN ]; -if (ptrace_may_access (task,PTRACE_MODE_READ_FSCREDS )) - wchan =get_wchan (task); -else - wchan =0 ; - -if (wchan) -seq_printf (m,"%ps" , (void *) wchan); -else -seq_putc (m,'0' ); +if (!ptrace_may_access (task,PTRACE_MODE_READ_FSCREDS )) + goto print0; + wchan =get_wchan (task); +if (wchan && !lookup_symbol_name (wchan, symname)) { +seq_puts (m, symname); +return 0 ; + } + +print0: +seq_putc (m,'0' );return 0 ; }#endif /* CONFIG_KALLSYMS */
[tip: sched/core] Revert "proc/wchan: use printk format instead of lookup_symbol_name()"
The following commit has been merged into the sched/core branch of tip:
The following commit has been merged into the sched/core branch of tip:
Commit-ID: 54354c6a9f7fd5572d2b9ec108117c4f376d4d23 Gitweb: https://git.kernel.org/tip/54354c6a9f7fd5572d2b9ec108117c4f376d4d23 Author: Kees Cook <[email protected]> AuthorDate: Wed, 29 Sep 2021 15:02:13 -07:00 Committer: Peter Zijlstra <[email protected]> CommitterDate: Fri, 15 Oct 2021 11:25:13 +02:00
Revert "proc/wchan: use printk format instead of lookup_symbol_name()"
This reverts commit 152c432b128cb043fc107e8f211195fe94b2159c.
When a kernel address couldn't be symbolized for /proc/$pid/wchan, it would leak the raw value, a potential information exposure. This is a regression compared to the safer pre-v5.12 behavior.
--- fs/proc/base.c | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-)
fs/proc/base.c +11 -8
@@ -67,6 +67,7 @@#include <linux/mm.h> #include <linux/swap.h> #include <linux/rcupdate.h> +#include <linux/kallsyms.h> #include <linux/stacktrace.h> #include <linux/resource.h> #include <linux/module.h>
@@ -386,17 +387,19 @@ static int proc_pid_wchan(struct seq_file *m, struct pid_namespace *ns, struct pid *pid, struct task_struct *task) { unsigned long wchan; +char symname[KSYM_NAME_LEN ]; -if (ptrace_may_access (task,PTRACE_MODE_READ_FSCREDS )) - wchan =get_wchan (task); -else - wchan =0 ; +if (!ptrace_may_access (task,PTRACE_MODE_READ_FSCREDS )) + goto print0; -if (wchan) -seq_printf (m,"%ps" , (void *) wchan); -else -seq_putc (m,'0' ); + wchan =get_wchan (task); +if (wchan && !lookup_symbol_name (wchan, symname)) { +seq_puts (m, symname); +return 0 ; + } +print0: +seq_putc (m,'0' );return 0 ; }#endif /* CONFIG_KALLSYMS */
Peter Zijlstra
maintainerPATCH 2/7 leaking_addresses: Always print a trailing newline
In reply to Peter ZijlstraFrom: Kees Cook <[email protected]>
For files that lack trailing newlines and match a leaking address (e.g. wchan[1]), the leaking_addresses.pl report would run together with the next line, making things look corrupted.
Unconditionally remove the newline on input, and write it back out on output.
[1] https://lore.kernel.org/all/20210103142726.GC30643@xsang-OptiPlex-9020/
--- scripts/leaking_addresses.pl | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
scripts/leaking_addresses.pl +2 -1
@@ -455,8 +455,9 @@ sub parse_file open my $fh, "<", $file or return; while ( <$fh> ) { + chomp; if (may_leak_address($_)) { - print $file . ': ' . $_; + printf("$file: $_\n"); } } close $fh;
[tip: sched/core] leaking_addresses: Always print a trailing newline
The following commit has been merged into the sched/core branch of tip:
The following commit has been merged into the sched/core branch of tip:
Commit-ID: cf2a85efdade117e2169d6e26641016cbbf03ef0 Gitweb: https://git.kernel.org/tip/cf2a85efdade117e2169d6e26641016cbbf03ef0 Author: Kees Cook <[email protected]> AuthorDate: Wed, 29 Sep 2021 15:02:18 -07:00 Committer: Peter Zijlstra <[email protected]> CommitterDate: Fri, 15 Oct 2021 11:25:13 +02:00
leaking_addresses: Always print a trailing newline
For files that lack trailing newlines and match a leaking address (e.g. wchan[1]), the leaking_addresses.pl report would run together with the next line, making things look corrupted.
Unconditionally remove the newline on input, and write it back out on output.
[1] https://lore.kernel.org/all/20210103142726.GC30643@xsang-OptiPlex-9020/
--- scripts/leaking_addresses.pl | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
scripts/leaking_addresses.pl +2 -1
@@ -455,8 +455,9 @@ sub parse_file open my $fh, "<", $file or return; while ( <$fh> ) { + chomp; if (may_leak_address($_)) { - print $file . ': ' . $_; + printf("$file: $_\n"); } } close $fh;
Peter Zijlstra
maintainerPATCH 3/7 proc: Use task_is_running() for wchan in /proc/$pid/stat
In reply to Peter ZijlstraFrom: Kees Cook <[email protected]>
The implementations of get_wchan() can be expensive. The only information imparted here is whether or not a process is currently blocked in the scheduler (and even this doesn't need to be exact). Avoid doing the heavy lifting of stack walking and just report that information by using task_is_running().
--- fs/proc/array.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-)
fs/proc/array.c +2 -5
@@ -541,7 +541,7 @@ static int do_task_stat(struct seq_file }if (permitted && (!whole || num_threads <2 )) - wchan =get_wchan (task); + wchan = !task_is_running (task);if (!whole) { min_flt = task->min_flt; maj_flt = task->maj_flt;
@@ -606,10 +606,7 @@ static int do_task_stat(struct seq_file* * This works with older implementations of procps as well. */ -if (wchan) -seq_puts (m," 1" ); -else -seq_puts (m," 0" ); +seq_put_decimal_ull (m," " , wchan);seq_put_decimal_ull (m," " ,0 );seq_put_decimal_ull (m," " ,0 );
[tip: sched/core] proc: Use task_is_running() for wchan in /proc/$pid/stat
The following commit has been merged into the sched/core branch of tip:
The following commit has been merged into the sched/core branch of tip:
Commit-ID: 4e046156792c26bef8a4e30be711777fc8578257 Gitweb: https://git.kernel.org/tip/4e046156792c26bef8a4e30be711777fc8578257 Author: Kees Cook <[email protected]> AuthorDate: Wed, 29 Sep 2021 15:02:15 -07:00 Committer: Peter Zijlstra <[email protected]> CommitterDate: Fri, 15 Oct 2021 11:25:13 +02:00
proc: Use task_is_running() for wchan in /proc/$pid/stat
The implementations of get_wchan() can be expensive. The only information imparted here is whether or not a process is currently blocked in the scheduler (and even this doesn't need to be exact). Avoid doing the heavy lifting of stack walking and just report that information by using task_is_running().
--- fs/proc/array.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-)
fs/proc/array.c +2 -5
@@ -541,7 +541,7 @@ static int do_task_stat(struct seq_file *m, struct pid_namespace *ns, }if (permitted && (!whole || num_threads <2 )) - wchan =get_wchan (task); + wchan = !task_is_running (task);if (!whole) { min_flt = task->min_flt; maj_flt = task->maj_flt;
@@ -606,10 +606,7 @@ static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,* * This works with older implementations of procps as well. */ -if (wchan) -seq_puts (m," 1" ); -else -seq_puts (m," 0" ); +seq_put_decimal_ull (m," " , wchan);seq_put_decimal_ull (m," " ,0 );seq_put_decimal_ull (m," " ,0 );
Peter Zijlstra
maintainerPATCH 4/7 x86: Fix get_wchan() to support the ORC unwinder
In reply to Peter ZijlstraFrom: Qi Zheng <[email protected]>
Currently, the kernel CONFIG_UNWINDER_ORC option is enabled by default on x86, but the implementation of get_wchan() is still based on the frame pointer unwinder, so the /proc/<pid>/wchan usually returned 0 regardless of whether the task <pid> is running.
Reimplement get_wchan() by calling stack_trace_save_tsk(), which is adapted to the ORC and frame pointer unwinders.
--- arch/x86/kernel/process.c | 51 ++-------------------------------------------- 1 file changed, 3 insertions(+), 48 deletions(-)
arch/x86/kernel/process.c +3 -48
@@ -944,58 +944,13 @@ unsigned long arch_randomize_brk(struct*/ unsigned long get_wchan (struct task_struct *p) { -unsigned long start, bottom, top, sp, fp, ip, ret =0 ; -int count =0 ; +unsigned long entry =0 ;if (p == current ||task_is_running (p))return 0 ; -if (!try_get_task_stack (p)) -return 0 ; - - start = (unsigned long )task_stack_page (p); -if (!start) - goto out; - -/* -* Layout of the stack page: -* -* ----------- topmax = start + THREAD_SIZE - sizeof(unsigned long) -* PADDING -* ----------- top = topmax - TOP_OF_KERNEL_STACK_PADDING -* stack -* ----------- bottom = start -* -* The tasks stack pointer points at the location where the -* framepointer is stored. The data on the stack is: -* ... IP FP ... IP FP -* -* We need to read FP and IP, so we need to adjust the upper -* bound by another unsigned long. -*/ - top = start +THREAD_SIZE -TOP_OF_KERNEL_STACK_PADDING ; - top -=2 *sizeof (unsigned long ); - bottom = start; - - sp =READ_ONCE (p->thread.sp); -if (sp < bottom || sp > top) - goto out; - - fp =READ_ONCE_NOCHECK (((struct inactive_task_frame *)sp)->bp); -do { -if (fp < bottom || fp > top) - goto out; - ip =READ_ONCE_NOCHECK (*(unsigned long *)(fp +sizeof (unsigned long ))); -if (!in_sched_functions (ip)) { - ret = ip; - goto out; - } - fp =READ_ONCE_NOCHECK (*(unsigned long *)fp); - }while (count++ <16 && !task_is_running (p)); - -out: -put_task_stack (p); -return ret; +stack_trace_save_tsk (p, &entry,1 ,0 ); +return entry; } long do_arch_prctl_common(struct task_struct *task, int option,
[tip: sched/core] x86: Fix get_wchan() to support the ORC unwinder
The following commit has been merged into the sched/core branch of tip:
The following commit has been merged into the sched/core branch of tip:
Commit-ID: bc9bbb81730ea667c31c5b284f95ee312bab466f Gitweb: https://git.kernel.org/tip/bc9bbb81730ea667c31c5b284f95ee312bab466f Author: Qi Zheng <[email protected]> AuthorDate: Wed, 29 Sep 2021 15:02:17 -07:00 Committer: Peter Zijlstra <[email protected]> CommitterDate: Fri, 15 Oct 2021 11:25:14 +02:00
x86: Fix get_wchan() to support the ORC unwinder
Currently, the kernel CONFIG_UNWINDER_ORC option is enabled by default on x86, but the implementation of get_wchan() is still based on the frame pointer unwinder, so the /proc/<pid>/wchan usually returned 0 regardless of whether the task <pid> is running.
Reimplement get_wchan() by calling stack_trace_save_tsk(), which is adapted to the ORC and frame pointer unwinders.
--- arch/x86/kernel/process.c | 51 ++------------------------------------ 1 file changed, 3 insertions(+), 48 deletions(-)
arch/x86/kernel/process.c +3 -48
@@ -944,58 +944,13 @@ unsigned long arch_randomize_brk(struct mm_struct *mm)*/ unsigned long get_wchan (struct task_struct *p) { -unsigned long start, bottom, top, sp, fp, ip, ret =0 ; -int count =0 ; +unsigned long entry =0 ;if (p == current ||task_is_running (p))return 0 ; -if (!try_get_task_stack (p)) -return 0 ; - - start = (unsigned long )task_stack_page (p); -if (!start) - goto out; - -/* -* Layout of the stack page: -* -* ----------- topmax = start + THREAD_SIZE - sizeof(unsigned long) -* PADDING -* ----------- top = topmax - TOP_OF_KERNEL_STACK_PADDING -* stack -* ----------- bottom = start -* -* The tasks stack pointer points at the location where the -* framepointer is stored. The data on the stack is: -* ... IP FP ... IP FP -* -* We need to read FP and IP, so we need to adjust the upper -* bound by another unsigned long. -*/ - top = start +THREAD_SIZE -TOP_OF_KERNEL_STACK_PADDING ; - top -=2 *sizeof (unsigned long ); - bottom = start; - - sp =READ_ONCE (p->thread.sp); -if (sp < bottom || sp > top) - goto out; - - fp =READ_ONCE_NOCHECK (((struct inactive_task_frame *)sp)->bp); -do { -if (fp < bottom || fp > top) - goto out; - ip =READ_ONCE_NOCHECK (*(unsigned long *)(fp +sizeof (unsigned long ))); -if (!in_sched_functions (ip)) { - ret = ip; - goto out; - } - fp =READ_ONCE_NOCHECK (*(unsigned long *)fp); - }while (count++ <16 && !task_is_running (p)); - -out: -put_task_stack (p); -return ret; +stack_trace_save_tsk (p, &entry,1 ,0 ); +return entry; } long do_arch_prctl_common(struct task_struct *task, int option,
Peter Zijlstra
maintainerPATCH 5/7 sched: Add wrapper for get_wchan() to keep task blocked
In reply to Peter ZijlstraFrom: Kees Cook <[email protected]>
Having a stable wchan means the process must be blocked and for it to stay that way while performing stack unwinding.
--- arch/alpha/include/asm/processor.h | 2 +- arch/alpha/kernel/process.c | 5 ++--- arch/arc/include/asm/processor.h | 2 +- arch/arc/kernel/stacktrace.c | 4 ++-- arch/arm/include/asm/processor.h | 2 +- arch/arm/kernel/process.c | 4 +--- arch/arm64/include/asm/processor.h | 2 +- arch/arm64/kernel/process.c | 4 +--- arch/csky/include/asm/processor.h | 2 +- arch/csky/kernel/stacktrace.c | 5 ++--- arch/h8300/include/asm/processor.h | 2 +- arch/h8300/kernel/process.c | 5 +---- arch/hexagon/include/asm/processor.h | 2 +- arch/hexagon/kernel/process.c | 4 +--- arch/ia64/include/asm/processor.h | 2 +- arch/ia64/kernel/process.c | 5 +---- arch/m68k/include/asm/processor.h | 2 +- arch/m68k/kernel/process.c | 4 +--- arch/microblaze/include/asm/processor.h | 2 +- arch/microblaze/kernel/process.c | 2 +- arch/mips/include/asm/processor.h | 2 +- arch/mips/kernel/process.c | 8 +++----- arch/nds32/include/asm/processor.h | 2 +- arch/nds32/kernel/process.c | 7 +------ arch/nios2/include/asm/processor.h | 2 +- arch/nios2/kernel/process.c | 5 +---- arch/openrisc/include/asm/processor.h | 2 +- arch/openrisc/kernel/process.c | 2 +- arch/parisc/include/asm/processor.h | 2 +- arch/parisc/kernel/process.c | 5 +---- arch/powerpc/include/asm/processor.h | 2 +- arch/powerpc/kernel/process.c | 9 +++------ arch/riscv/include/asm/processor.h | 2 +- arch/riscv/kernel/stacktrace.c | 12 +++++------- arch/s390/include/asm/processor.h | 2 +- arch/s390/kernel/process.c | 4 ++-- arch/sh/include/asm/processor_32.h | 2 +- arch/sh/kernel/process_32.c | 5 +---- arch/sparc/include/asm/processor_32.h | 2 +- arch/sparc/include/asm/processor_64.h | 2 +- arch/sparc/kernel/process_32.c | 5 +---- arch/sparc/kernel/process_64.c | 5 +---- arch/um/include/asm/processor-generic.h | 2 +- arch/um/kernel/process.c | 5 +---- arch/x86/include/asm/processor.h | 2 +- arch/x86/kernel/process.c | 5 +---- arch/xtensa/include/asm/processor.h | 2 +- arch/xtensa/kernel/process.c | 5 +---- include/linux/sched.h | 1 + kernel/sched/core.c | 19 +++++++++++++++++++ 50 files changed, 80 insertions(+), 112 deletions(-)
arch/alpha/include/asm/processor.h +1 -1
@@ -42,7 +42,7 @@ extern void start_thread(struct pt_regsstruct task_struct ;extern void release_thread (struct task_struct *); -unsigned long get_wchan (struct task_struct *p); +unsigned long __get_wchan (struct task_struct *p);#define KSTK_EIP (tsk) (task_pt_regs(tsk)->pc)
arch/alpha/kernel/process.c +2 -3
@@ -376,12 +376,11 @@ thread_saved_pc(struct task_struct *t) }unsigned long -get_wchan (struct task_struct *p) +__get_wchan (struct task_struct *p) {unsigned long schedule_frame;unsigned long pc; -if (!p || p == current ||task_is_running (p)) -return 0 ; +/* * This one depends on the frame size of schedule(). Do a * "disass schedule" in gdb to find the frame size. Also, the
arch/arc/include/asm/processor.h +1 -1
@@ -70,7 +70,7 @@ struct task_struct;extern void start_thread (struct pt_regs * regs,unsigned long pc,unsigned long usp); -extern unsigned int get_wchan (struct task_struct *p); +extern unsigned int __get_wchan (struct task_struct *p);#endif /* !__ASSEMBLY__ */
arch/arc/kernel/stacktrace.c +2 -2
@@ -15,7 +15,7 @@* = specifics of data structs where trace is saved(CONFIG_STACKTRACE etc) * * vineetg: March 2009 -* -Implemented correct versions of thread_saved_pc() and get_wchan() +* -Implemented correct versions of thread_saved_pc() and __get_wchan() * * rajeshwarr: 2008 * -Initial implementation
@@ -248,7 +248,7 @@ void show_stack(struct task_struct *tsk,* Of course just returning schedule( ) would be pointless so unwind until * the function is not in schedular code */ -unsigned int get_wchan (struct task_struct *tsk) +unsigned int __get_wchan (struct task_struct *tsk) {return arc_unwind_core (tsk,NULL , __get_first_nonsched,NULL ); }
arch/arm/include/asm/processor.h +1 -1
@@ -84,7 +84,7 @@ struct task_struct;/* Free all resources held by a thread. */ extern void release_thread (struct task_struct *); -unsigned long get_wchan (struct task_struct *p); +unsigned long __get_wchan (struct task_struct *p);#define task_pt_regs (p) \ ((struct pt_regs *)(THREAD_START_SP + task_stack_page(p)) - 1)
arch/arm/kernel/process.c +1 -3
@@ -276,13 +276,11 @@ int copy_thread(unsigned long clone_flagreturn 0 ; } -unsigned long get_wchan (struct task_struct *p) +unsigned long __get_wchan (struct task_struct *p) {struct stackframe frame;unsigned long stack_page;int count =0 ; -if (!p || p == current ||task_is_running (p)) -return 0 ; frame.fp =thread_saved_fp (p); frame.sp =thread_saved_sp (p);
arch/arm64/include/asm/processor.h +1 -1
@@ -257,7 +257,7 @@ struct task_struct;/* Free all resources held by a thread. */ extern void release_thread (struct task_struct *); -unsigned long get_wchan (struct task_struct *p); +unsigned long __get_wchan (struct task_struct *p);void update_sctlr_el1 (u64 sctlr);
arch/arm64/kernel/process.c +1 -3
@@ -528,13 +528,11 @@ __notrace_funcgraph struct task_struct *return last; } -unsigned long get_wchan (struct task_struct *p) +unsigned long __get_wchan (struct task_struct *p) {struct stackframe frame;unsigned long stack_page, ret =0 ;int count =0 ; -if (!p || p == current ||task_is_running (p)) -return 0 ; stack_page = (unsigned long )try_get_task_stack (p);if (!stack_page)
arch/csky/include/asm/processor.h +1 -1
@@ -81,7 +81,7 @@ static inline void release_thread(structextern int kernel_thread (int (*fn)(void *),void *arg,unsigned long flags); -unsigned long get_wchan (struct task_struct *p); +unsigned long __get_wchan (struct task_struct *p);#define KSTK_EIP (tsk) (task_pt_regs(tsk)->pc)#define KSTK_ESP (tsk) (task_pt_regs(tsk)->usp)
arch/csky/kernel/stacktrace.c +2 -3
@@ -111,12 +111,11 @@ static bool save_wchan(unsigned long pc,return false; } -unsigned long get_wchan (struct task_struct *task) +unsigned long __get_wchan (struct task_struct *task) {unsigned long pc =0 ; -if (likely (task && task != current && !task_is_running (task))) -walk_stackframe (task,NULL , save_wchan, &pc); +walk_stackframe (task,NULL , save_wchan, &pc);return pc; }
arch/h8300/include/asm/processor.h +1 -1
@@ -105,7 +105,7 @@ static inline void release_thread(struct { } -unsigned long get_wchan (struct task_struct *p); +unsigned long __get_wchan (struct task_struct *p);#define KSTK_EIP (tsk) \ ({ \
arch/h8300/kernel/process.c +1 -4
@@ -128,15 +128,12 @@ int copy_thread(unsigned long clone_flagreturn 0 ; } -unsigned long get_wchan (struct task_struct *p) +unsigned long __get_wchan (struct task_struct *p) {unsigned long fp, pc;unsigned long stack_page;int count =0 ; -if (!p || p == current ||task_is_running (p)) -return 0 ; - stack_page = (unsigned long )p; fp = ((struct pt_regs *)p->thread.ksp)->er6; do {
arch/hexagon/include/asm/processor.h +1 -1
@@ -64,7 +64,7 @@ struct thread_struct {extern void release_thread (struct task_struct *dead_task);/* Get wait channel for task P. */ -extern unsigned long get_wchan (struct task_struct *p); +extern unsigned long __get_wchan (struct task_struct *p);/* The following stuff is pretty HEXAGON specific. */
arch/hexagon/kernel/process.c +1 -3
@@ -130,13 +130,11 @@ void flush_thread(void)* is an identification of the point at which the scheduler * was invoked by a blocked thread. */ -unsigned long get_wchan (struct task_struct *p) +unsigned long __get_wchan (struct task_struct *p) {unsigned long fp, pc;unsigned long stack_page;int count =0 ; -if (!p || p == current ||task_is_running (p)) -return 0 ; stack_page = (unsigned long )task_stack_page (p); fp = ((struct hexagon_switch_stack *)p->thread.switch_sp)->fp;
arch/ia64/include/asm/processor.h +1 -1
@@ -330,7 +330,7 @@ struct task_struct;#define release_thread (dead_task)/* Get wait channel for task P. */ -extern unsigned long get_wchan (struct task_struct *p); +extern unsigned long __get_wchan (struct task_struct *p);/* Return instruction pointer of blocked task TSK. */ #define KSTK_EIP (tsk) \
arch/ia64/kernel/process.c +1 -4
@@ -523,15 +523,12 @@ exit_thread (struct task_struct *tsk) }unsigned long -get_wchan (struct task_struct *p) +__get_wchan (struct task_struct *p) {struct unw_frame_info info;unsigned long ip;int count =0 ; -if (!p || p == current ||task_is_running (p)) -return 0 ; -/* * Note: p may not be a blocked task (it could be current or * another process running on some other CPU. Rather than
arch/m68k/include/asm/processor.h +1 -1
@@ -125,7 +125,7 @@ static inline void release_thread(struct { } -unsigned long get_wchan (struct task_struct *p); +unsigned long __get_wchan (struct task_struct *p);#define KSTK_EIP (tsk) \ ({ \
arch/m68k/kernel/process.c +1 -3
@@ -263,13 +263,11 @@ int dump_fpu (struct pt_regs *regs, stru }EXPORT_SYMBOL (dump_fpu); -unsigned long get_wchan (struct task_struct *p) +unsigned long __get_wchan (struct task_struct *p) {unsigned long fp, pc;unsigned long stack_page;int count =0 ; -if (!p || p == current ||task_is_running (p)) -return 0 ; stack_page = (unsigned long )task_stack_page (p); fp = ((struct switch_stack *)p->thread.ksp)->a6;
arch/microblaze/include/asm/processor.h +1 -1
@@ -68,7 +68,7 @@ static inline void release_thread(struct { } -unsigned long get_wchan (struct task_struct *p); +unsigned long __get_wchan (struct task_struct *p);/* The size allocated for kernel stacks. This _must_ be a power of two! */ # define KERNEL_STACK_SIZE 0x2000
arch/microblaze/kernel/process.c +1 -1
@@ -112,7 +112,7 @@ int copy_thread(unsigned long clone_flagreturn 0 ; } -unsigned long get_wchan (struct task_struct *p) +unsigned long __get_wchan (struct task_struct *p) {/* TBD (used by procfs) */ return 0 ;
arch/mips/include/asm/processor.h +1 -1
@@ -369,7 +369,7 @@ static inline void flush_thread(void) { } -unsigned long get_wchan (struct task_struct *p); +unsigned long __get_wchan (struct task_struct *p);#define __KSTK_TOS (tsk) ((unsigned long)task_stack_page(tsk) + \ THREAD_SIZE - 32 - sizeof(struct pt_regs))
arch/mips/kernel/process.c +3 -5
@@ -511,7 +511,7 @@ static int __init frame_info_init(void)/* * Without schedule() frame info, result given by -* thread_saved_pc() and get_wchan() are not reliable. +* thread_saved_pc() and __get_wchan() are not reliable. */ if (schedule_mfi.pc_offset <0 )printk ("Can't analyze schedule() prologue at %p\n" , schedule);
@@ -652,9 +652,9 @@ unsigned long unwind_stack(struct task_s#endif /* -* get_wchan - a maintenance nightmare^W^Wpain in the ass ... +* __get_wchan - a maintenance nightmare^W^Wpain in the ass ... */ -unsigned long get_wchan (struct task_struct *task) +unsigned long __get_wchan (struct task_struct *task) {unsigned long pc =0 ;#ifdef CONFIG_KALLSYMS
@@ -662,8 +662,6 @@ unsigned long get_wchan(struct task_struunsigned long ra =0 ;#endif -if (!task || task == current ||task_is_running (task)) - goto out;if (!task_stack_page (task)) goto out;
arch/nds32/include/asm/processor.h +1 -1
@@ -83,7 +83,7 @@ extern struct task_struct *last_task_use/* Prepare to copy thread state - unlazy all lazy status */ #define prepare_to_copy (tsk) do { } while (0) -unsigned long get_wchan (struct task_struct *p); +unsigned long __get_wchan (struct task_struct *p);#define cpu_relax () barrier()
arch/nds32/kernel/process.c +1 -6
@@ -233,15 +233,12 @@ int dump_fpu(struct pt_regs *regs, elf_fEXPORT_SYMBOL (dump_fpu); -unsigned long get_wchan (struct task_struct *p) +unsigned long __get_wchan (struct task_struct *p) {unsigned long fp, lr;unsigned long stack_start, stack_end;int count =0 ; -if (!p || p == current ||task_is_running (p)) -return 0 ; -if (IS_ENABLED (CONFIG_FRAME_POINTER )) { stack_start = (unsigned long )end_of_stack (p); stack_end = (unsigned long )task_stack_page (p) +THREAD_SIZE ;
@@ -258,5 +255,3 @@ unsigned long get_wchan(struct task_stru }return 0 ; } - -EXPORT_SYMBOL (get_wchan);
arch/nios2/include/asm/processor.h +1 -1
@@ -69,7 +69,7 @@ static inline void release_thread(struct { } -extern unsigned long get_wchan (struct task_struct *p); +extern unsigned long __get_wchan (struct task_struct *p);#define task_pt_regs (p) \ ((struct pt_regs *)(THREAD_SIZE + task_stack_page(p)) - 1)
arch/nios2/kernel/process.c +1 -4
@@ -217,15 +217,12 @@ void dump(struct pt_regs *fp)pr_emerg ("\n\n" ); } -unsigned long get_wchan (struct task_struct *p) +unsigned long __get_wchan (struct task_struct *p) {unsigned long fp, pc;unsigned long stack_page;int count =0 ; -if (!p || p == current ||task_is_running (p)) -return 0 ; - stack_page = (unsigned long )p; fp = ((struct switch_stack *)p->thread.ksp)->fp;/* ;dgt2 */ do {
arch/openrisc/include/asm/processor.h +1 -1
@@ -73,7 +73,7 @@ struct thread_struct {void start_thread (struct pt_regs *regs,unsigned long nip,unsigned long sp);void release_thread (struct task_struct *); -unsigned long get_wchan (struct task_struct *p); +unsigned long __get_wchan (struct task_struct *p);#define cpu_relax () barrier()
arch/openrisc/kernel/process.c +1 -1
@@ -263,7 +263,7 @@ void dump_elf_thread(elf_greg_t *dest, s dest[35 ] =0 ; } -unsigned long get_wchan (struct task_struct *p) +unsigned long __get_wchan (struct task_struct *p) {/* TODO */
arch/parisc/include/asm/processor.h +1 -1
@@ -273,7 +273,7 @@ struct mm_struct;/* Free all resources held by a thread. */ extern void release_thread (struct task_struct *); -extern unsigned long get_wchan (struct task_struct *p); +extern unsigned long __get_wchan (struct task_struct *p);#define KSTK_EIP (tsk) ((tsk)->thread.regs.iaoq[0])#define KSTK_ESP (tsk) ((tsk)->thread.regs.gr[30])
arch/parisc/kernel/process.c +1 -4
@@ -240,15 +240,12 @@ copy_thread(unsigned long clone_flags, u }unsigned long -get_wchan (struct task_struct *p) +__get_wchan (struct task_struct *p) {struct unwind_frame_info info;unsigned long ip;int count =0 ; -if (!p || p == current ||task_is_running (p)) -return 0 ; -/* * These bracket the sleeping functions.. */
arch/powerpc/include/asm/processor.h +1 -1
@@ -300,7 +300,7 @@ struct thread_struct {#define task_pt_regs (tsk) ((tsk)->thread.regs) -unsigned long get_wchan (struct task_struct *p); +unsigned long __get_wchan (struct task_struct *p);#define KSTK_EIP (tsk) ((tsk)->thread.regs? (tsk)->thread.regs->nip: 0)#define KSTK_ESP (tsk) ((tsk)->thread.regs? (tsk)->thread.regs->gpr[1]: 0)
arch/powerpc/kernel/process.c +3 -6
@@ -2111,14 +2111,11 @@ int validate_sp(unsigned long sp, structEXPORT_SYMBOL (validate_sp); -static unsigned long __get_wchan (struct task_struct *p) +static unsigned long ___get_wchan (struct task_struct *p) {unsigned long ip, sp;int count =0 ; -if (!p || p == current ||task_is_running (p)) -return 0 ; - sp = p->thread.ksp;if (!validate_sp (sp, p,STACK_FRAME_OVERHEAD ))return 0 ;
@@ -2137,14 +2134,14 @@ static unsigned long __get_wchan(structreturn 0 ; } -unsigned long get_wchan (struct task_struct *p) +unsigned long __get_wchan (struct task_struct *p) {unsigned long ret;if (!try_get_task_stack (p))return 0 ; - ret =__get_wchan (p); + ret =___get_wchan (p);put_task_stack (p);
arch/riscv/include/asm/processor.h +1 -1
@@ -66,7 +66,7 @@ static inline void release_thread(struct { } -extern unsigned long get_wchan (struct task_struct *p); +extern unsigned long __get_wchan (struct task_struct *p);static inline void wait_for_interrupt (void )
arch/riscv/kernel/stacktrace.c +5 -7
@@ -128,16 +128,14 @@ static bool save_wchan(void *arg, unsignreturn true; } -unsigned long get_wchan (struct task_struct *task) +unsigned long __get_wchan (struct task_struct *task) {unsigned long pc =0 ; -if (likely (task && task != current && !task_is_running (task))) { -if (!try_get_task_stack (task)) -return 0 ; -walk_stackframe (task,NULL , save_wchan, &pc); -put_task_stack (task); - } +if (!try_get_task_stack (task)) +return 0 ; +walk_stackframe (task,NULL , save_wchan, &pc); +put_task_stack (task);return pc; }
arch/s390/include/asm/processor.h +1 -1
@@ -192,7 +192,7 @@ static inline void release_thread(structvoid guarded_storage_release (struct task_struct *tsk);void gs_load_bc_cb (struct pt_regs *regs); -unsigned long get_wchan (struct task_struct *p); +unsigned long __get_wchan (struct task_struct *p);#define task_pt_regs (tsk) ((struct pt_regs *) \ (task_stack_page(tsk) + THREAD_SIZE) - 1)#define KSTK_EIP (tsk) (task_pt_regs(tsk)->psw.addr)
arch/s390/kernel/process.c +2 -2
@@ -181,12 +181,12 @@ void execve_tail(void) asmvolatile ("sfpc %0" : :"d" (0 )); } -unsigned long get_wchan (struct task_struct *p) +unsigned long __get_wchan (struct task_struct *p) {struct unwind_state state;unsigned long ip =0 ; -if (!p || p == current ||task_is_running (p) || !task_stack_page (p)) +if (!task_stack_page (p))return 0 ;if (!try_get_task_stack (p))
arch/sh/include/asm/processor_32.h +1 -1
@@ -180,7 +180,7 @@ static inline void show_code(struct pt_r }#endif -extern unsigned long get_wchan (struct task_struct *p); +extern unsigned long __get_wchan (struct task_struct *p);#define KSTK_EIP (tsk) (task_pt_regs(tsk)->pc)#define KSTK_ESP (tsk) (task_pt_regs(tsk)->regs[15])
arch/sh/kernel/process_32.c +1 -4
@@ -182,13 +182,10 @@ __switch_to(struct task_struct *prev, streturn prev; } -unsigned long get_wchan (struct task_struct *p) +unsigned long __get_wchan (struct task_struct *p) {unsigned long pc; -if (!p || p == current ||task_is_running (p)) -return 0 ; -/* * The same comment as on the Alpha applies here, too ... */
arch/sparc/include/asm/processor_32.h +1 -1
@@ -89,7 +89,7 @@ static inline void start_thread(struct p/* Free all resources held by a thread. */ #define release_thread (tsk) do { } while(0) -unsigned long get_wchan (struct task_struct *); +unsigned long __get_wchan (struct task_struct *);#define task_pt_regs (tsk) ((tsk)->thread.kregs)#define KSTK_EIP (tsk) ((tsk)->thread.kregs->pc)
arch/sparc/include/asm/processor_64.h +1 -1
@@ -183,7 +183,7 @@ do { \/* Free all resources held by a thread. */ #define release_thread (tsk) do { } while (0) -unsigned long get_wchan (struct task_struct *task); +unsigned long __get_wchan (struct task_struct *task);#define task_pt_regs (tsk) (task_thread_info(tsk)->kregs)#define KSTK_EIP (tsk) (task_pt_regs(tsk)->tpc)
arch/sparc/kernel/process_32.c +1 -4
@@ -365,7 +365,7 @@ int copy_thread(unsigned long clone_flagreturn 0 ; } -unsigned long get_wchan (struct task_struct *task) +unsigned long __get_wchan (struct task_struct *task) {unsigned long pc, fp, bias =0 ;unsigned long task_base = (unsigned long ) task;
@@ -373,9 +373,6 @@ unsigned long get_wchan(struct task_strustruct reg_window32 *rw;int count =0 ; -if (!task || task == current ||task_is_running (task)) - goto out; - fp =task_thread_info (task)->ksp + bias; do { /* Bogus frame pointer? */
arch/sparc/kernel/process_64.c +1 -4
@@ -663,7 +663,7 @@ int arch_dup_task_struct(struct task_strreturn 0 ; } -unsigned long get_wchan (struct task_struct *task) +unsigned long __get_wchan (struct task_struct *task) {unsigned long pc, fp, bias =0 ;struct thread_info *tp;
@@ -671,9 +671,6 @@ unsigned long get_wchan(struct task_struunsigned long ret =0 ;int count =0 ; -if (!task || task == current ||task_is_running (task)) - goto out; - tp =task_thread_info (task); bias =STACK_BIAS ; fp =task_thread_info (task)->ksp + bias;
arch/um/include/asm/processor-generic.h +1 -1
@@ -106,6 +106,6 @@ extern struct cpuinfo_um boot_cpu_data;#define cache_line_size () (boot_cpu_data.cache_alignment)#define KSTK_REG (tsk, reg) get_thread_reg(reg, &tsk->thread.switch_buf) -extern unsigned long get_wchan (struct task_struct *p); +extern unsigned long __get_wchan (struct task_struct *p);#endif
arch/um/kernel/process.c +1 -4
@@ -364,14 +364,11 @@ unsigned long arch_align_stack(unsigned }#endif -unsigned long get_wchan (struct task_struct *p) +unsigned long __get_wchan (struct task_struct *p) {unsigned long stack_page, sp, ip;bool seen_sched =0 ; -if ((p ==NULL ) || (p == current) ||task_is_running (p)) -return 0 ; - stack_page = (unsigned long )task_stack_page (p);/* Bail if the process has no kernel stack for some reason */ if (stack_page ==0 )
arch/x86/include/asm/processor.h +1 -1
@@ -590,7 +590,7 @@ static inline void load_sp0(unsigned lon/* Free all resources held by a thread. */ extern void release_thread (struct task_struct *); -unsigned long get_wchan (struct task_struct *p); +unsigned long __get_wchan (struct task_struct *p);/* * Generic CPUID function
arch/x86/kernel/process.c +1 -4
@@ -943,13 +943,10 @@ unsigned long arch_randomize_brk(struct* because the task might wake up and we might look at a stack * changing under us. */ -unsigned long get_wchan (struct task_struct *p) +unsigned long __get_wchan (struct task_struct *p) {unsigned long entry =0 ; -if (p == current ||task_is_running (p)) -return 0 ; -stack_trace_save_tsk (p, &entry,1 ,0 );return entry; }
arch/xtensa/include/asm/processor.h +1 -1
@@ -215,7 +215,7 @@ struct mm_struct;/* Free all resources held by a thread. */ #define release_thread (thread) do { } while(0) -extern unsigned long get_wchan (struct task_struct *p); +extern unsigned long __get_wchan (struct task_struct *p);#define KSTK_EIP (tsk) (task_pt_regs(tsk)->pc)#define KSTK_ESP (tsk) (task_pt_regs(tsk)->areg[1])
arch/xtensa/kernel/process.c +1 -4
@@ -298,15 +298,12 @@ int copy_thread(unsigned long clone_flag* These bracket the sleeping functions.. */ -unsigned long get_wchan (struct task_struct *p) +unsigned long __get_wchan (struct task_struct *p) {unsigned long sp, pc;unsigned long stack_page = (unsigned long )task_stack_page (p);int count =0 ; -if (!p || p == current ||task_is_running (p)) -return 0 ; - sp = p->thread.sp; pc =MAKE_PC_FROM_RA (p->thread.ra, p->thread.sp);
include/linux/sched.h +1 -0
@@ -2139,6 +2139,7 @@ static inline void set_task_cpu(struct t#endif /* CONFIG_SMP */ extern bool sched_task_on_rq (struct task_struct *p); +extern unsigned long get_wchan (struct task_struct *p);/* * In order to reduce various lock holder preemption latencies provide an
kernel/sched/core.c +19 -0
@@ -1962,6 +1962,25 @@ bool sched_task_on_rq(struct task_structreturn task_on_rq_queued (p); } +unsigned long get_wchan (struct task_struct *p) +{ +unsigned long ip =0 ; +unsigned int state; + +if (!p || p == current) +return 0 ; + +/* Only get wchan if task is blocked and we can keep it that way. */ +raw_spin_lock_irq (&p->pi_lock); + state =READ_ONCE (p->__state); +smp_rmb ();/* see try_to_wake_up() */ +if (state !=TASK_RUNNING && state !=TASK_WAKING && !p->on_rq) + ip =__get_wchan (p); +raw_spin_unlock_irq (&p->pi_lock); + +return ip; +} +static inline void enqueue_task (struct rq *rq,struct task_struct *p,int flags) {if (!(flags &ENQUEUE_NOCLOCK ))
Re: [PATCH 5/7] sched: Add wrapper for get_wchan() to keep task blocked
Quoted 11 lines · Peter Zijlstra
From: Kees Cook <[email protected]>
Having a stable wchan means the process must be blocked and for it to stay that way while performing stack unwinding.
Suggested-by Peter Zijlstra <[email protected]>Signed-off-by Kees Cook <[email protected]>Signed-off-by Peter Zijlstra (Intel) <[email protected]>arch/m68k/include/asm/processor.h | 2 +- arch/m68k/kernel/process.c | 4 +---
Gr{oetje,eeting}s,
Geert
Signature · 5 lines
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected] In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds
Re: [PATCH 5/7] sched: Add wrapper for get_wchan() to keep task blocked
In reply to Peter ZijlstraQuoted 8 lines · Peter Zijlstra
From: Kees Cook <[email protected]>
Having a stable wchan means the process must be blocked and for it to stay that way while performing stack unwinding.
Suggested-by Peter Zijlstra <[email protected]>Signed-off-by Kees Cook <[email protected]>Signed-off-by Peter Zijlstra (Intel) <[email protected]>
FWIW, this seems to wpork on arm64:
Mark.
Quoted 822 lines
--- arch/alpha/include/asm/processor.h | 2 +- arch/alpha/kernel/process.c | 5 ++--- arch/arc/include/asm/processor.h | 2 +- arch/arc/kernel/stacktrace.c | 4 ++-- arch/arm/include/asm/processor.h | 2 +- arch/arm/kernel/process.c | 4 +--- arch/arm64/include/asm/processor.h | 2 +- arch/arm64/kernel/process.c | 4 +--- arch/csky/include/asm/processor.h | 2 +- arch/csky/kernel/stacktrace.c | 5 ++--- arch/h8300/include/asm/processor.h | 2 +- arch/h8300/kernel/process.c | 5 +---- arch/hexagon/include/asm/processor.h | 2 +- arch/hexagon/kernel/process.c | 4 +--- arch/ia64/include/asm/processor.h | 2 +- arch/ia64/kernel/process.c | 5 +---- arch/m68k/include/asm/processor.h | 2 +- arch/m68k/kernel/process.c | 4 +--- arch/microblaze/include/asm/processor.h | 2 +- arch/microblaze/kernel/process.c | 2 +- arch/mips/include/asm/processor.h | 2 +- arch/mips/kernel/process.c | 8 +++----- arch/nds32/include/asm/processor.h | 2 +- arch/nds32/kernel/process.c | 7 +------ arch/nios2/include/asm/processor.h | 2 +- arch/nios2/kernel/process.c | 5 +---- arch/openrisc/include/asm/processor.h | 2 +- arch/openrisc/kernel/process.c | 2 +- arch/parisc/include/asm/processor.h | 2 +- arch/parisc/kernel/process.c | 5 +---- arch/powerpc/include/asm/processor.h | 2 +- arch/powerpc/kernel/process.c | 9 +++------ arch/riscv/include/asm/processor.h | 2 +- arch/riscv/kernel/stacktrace.c | 12 +++++------- arch/s390/include/asm/processor.h | 2 +- arch/s390/kernel/process.c | 4 ++-- arch/sh/include/asm/processor_32.h | 2 +- arch/sh/kernel/process_32.c | 5 +---- arch/sparc/include/asm/processor_32.h | 2 +- arch/sparc/include/asm/processor_64.h | 2 +- arch/sparc/kernel/process_32.c | 5 +---- arch/sparc/kernel/process_64.c | 5 +---- arch/um/include/asm/processor-generic.h | 2 +- arch/um/kernel/process.c | 5 +---- arch/x86/include/asm/processor.h | 2 +- arch/x86/kernel/process.c | 5 +---- arch/xtensa/include/asm/processor.h | 2 +- arch/xtensa/kernel/process.c | 5 +---- include/linux/sched.h | 1 + kernel/sched/core.c | 19 +++++++++++++++++++ 50 files changed, 80 insertions(+), 112 deletions(-)arch/alpha/include/asm/processor.h +1
-1@@ -42,7 +42,7 @@ extern void start_thread(struct pt_regsstruct task_struct ;extern void release_thread (struct task_struct *); -unsigned long get_wchan (struct task_struct *p); +unsigned long __get_wchan (struct task_struct *p);#define KSTK_EIP (tsk) (task_pt_regs(tsk)->pc)arch/alpha/kernel/process.c +2
-3@@ -376,12 +376,11 @@ thread_saved_pc(struct task_struct *t) }unsigned long -get_wchan (struct task_struct *p) +__get_wchan (struct task_struct *p) {unsigned long schedule_frame;unsigned long pc; -if (!p || p == current ||task_is_running (p)) -return 0 ; +/* * This one depends on the frame size of schedule(). Do a * "disass schedule" in gdb to find the frame size. Also, the arch/arc/include/asm/processor.h +1
-1@@ -70,7 +70,7 @@ struct task_struct;extern void start_thread (struct pt_regs * regs,unsigned long pc,unsigned long usp); -extern unsigned int get_wchan (struct task_struct *p); +extern unsigned int __get_wchan (struct task_struct *p);#endif /* !__ASSEMBLY__ */ arch/arc/kernel/stacktrace.c +2
-2@@ -15,7 +15,7 @@* = specifics of data structs where trace is saved(CONFIG_STACKTRACE etc) * * vineetg: March 2009 -* -Implemented correct versions of thread_saved_pc() and get_wchan() +* -Implemented correct versions of thread_saved_pc() and __get_wchan() * * rajeshwarr: 2008 * -Initial implementation @@ -248,7 +248,7 @@ void show_stack(struct task_struct *tsk,* Of course just returning schedule( ) would be pointless so unwind until * the function is not in schedular code */ -unsigned int get_wchan (struct task_struct *tsk) +unsigned int __get_wchan (struct task_struct *tsk) {return arc_unwind_core (tsk,NULL , __get_first_nonsched,NULL ); }arch/arm/include/asm/processor.h +1
-1@@ -84,7 +84,7 @@ struct task_struct;/* Free all resources held by a thread. */ extern void release_thread (struct task_struct *); -unsigned long get_wchan (struct task_struct *p); +unsigned long __get_wchan (struct task_struct *p);#define task_pt_regs (p) \ ((struct pt_regs *)(THREAD_START_SP + task_stack_page(p)) - 1)arch/arm/kernel/process.c +1
-3@@ -276,13 +276,11 @@ int copy_thread(unsigned long clone_flagreturn 0 ; } -unsigned long get_wchan (struct task_struct *p) +unsigned long __get_wchan (struct task_struct *p) {struct stackframe frame;unsigned long stack_page;int count =0 ; -if (!p || p == current ||task_is_running (p)) -return 0 ; frame.fp =thread_saved_fp (p); frame.sp =thread_saved_sp (p);arch/arm64/include/asm/processor.h +1
-1@@ -257,7 +257,7 @@ struct task_struct;/* Free all resources held by a thread. */ extern void release_thread (struct task_struct *); -unsigned long get_wchan (struct task_struct *p); +unsigned long __get_wchan (struct task_struct *p);void update_sctlr_el1 (u64 sctlr);arch/arm64/kernel/process.c +1
-3@@ -528,13 +528,11 @@ __notrace_funcgraph struct task_struct *return last; } -unsigned long get_wchan (struct task_struct *p) +unsigned long __get_wchan (struct task_struct *p) {struct stackframe frame;unsigned long stack_page, ret =0 ;int count =0 ; -if (!p || p == current ||task_is_running (p)) -return 0 ; stack_page = (unsigned long )try_get_task_stack (p);if (!stack_page)arch/csky/include/asm/processor.h +1
-1@@ -81,7 +81,7 @@ static inline void release_thread(structextern int kernel_thread (int (*fn)(void *),void *arg,unsigned long flags); -unsigned long get_wchan (struct task_struct *p); +unsigned long __get_wchan (struct task_struct *p);#define KSTK_EIP (tsk) (task_pt_regs(tsk)->pc)#define KSTK_ESP (tsk) (task_pt_regs(tsk)->usp)arch/csky/kernel/stacktrace.c +2
-3@@ -111,12 +111,11 @@ static bool save_wchan(unsigned long pc,return false; } -unsigned long get_wchan (struct task_struct *task) +unsigned long __get_wchan (struct task_struct *task) {unsigned long pc =0 ; -if (likely (task && task != current && !task_is_running (task))) -walk_stackframe (task,NULL , save_wchan, &pc); +walk_stackframe (task,NULL , save_wchan, &pc);return pc; }arch/h8300/include/asm/processor.h +1
-1@@ -105,7 +105,7 @@ static inline void release_thread(struct { } -unsigned long get_wchan (struct task_struct *p); +unsigned long __get_wchan (struct task_struct *p);#define KSTK_EIP (tsk) \ ({ \arch/h8300/kernel/process.c +1
-4@@ -128,15 +128,12 @@ int copy_thread(unsigned long clone_flagreturn 0 ; } -unsigned long get_wchan (struct task_struct *p) +unsigned long __get_wchan (struct task_struct *p) {unsigned long fp, pc;unsigned long stack_page;int count =0 ; -if (!p || p == current ||task_is_running (p)) -return 0 ; - stack_page = (unsigned long )p; fp = ((struct pt_regs *)p->thread.ksp)->er6; do {arch/hexagon/include/asm/processor.h +1
-1@@ -64,7 +64,7 @@ struct thread_struct {extern void release_thread (struct task_struct *dead_task);/* Get wait channel for task P. */ -extern unsigned long get_wchan (struct task_struct *p); +extern unsigned long __get_wchan (struct task_struct *p);/* The following stuff is pretty HEXAGON specific. */ arch/hexagon/kernel/process.c +1
-3@@ -130,13 +130,11 @@ void flush_thread(void)* is an identification of the point at which the scheduler * was invoked by a blocked thread. */ -unsigned long get_wchan (struct task_struct *p) +unsigned long __get_wchan (struct task_struct *p) {unsigned long fp, pc;unsigned long stack_page;int count =0 ; -if (!p || p == current ||task_is_running (p)) -return 0 ; stack_page = (unsigned long )task_stack_page (p); fp = ((struct hexagon_switch_stack *)p->thread.switch_sp)->fp;arch/ia64/include/asm/processor.h +1
-1@@ -330,7 +330,7 @@ struct task_struct;#define release_thread (dead_task)/* Get wait channel for task P. */ -extern unsigned long get_wchan (struct task_struct *p); +extern unsigned long __get_wchan (struct task_struct *p);/* Return instruction pointer of blocked task TSK. */ #define KSTK_EIP (tsk) \arch/ia64/kernel/process.c +1
-4@@ -523,15 +523,12 @@ exit_thread (struct task_struct *tsk) }unsigned long -get_wchan (struct task_struct *p) +__get_wchan (struct task_struct *p) {struct unw_frame_info info;unsigned long ip;int count =0 ; -if (!p || p == current ||task_is_running (p)) -return 0 ; -/* * Note: p may not be a blocked task (it could be current or * another process running on some other CPU. Rather than arch/m68k/include/asm/processor.h +1
-1@@ -125,7 +125,7 @@ static inline void release_thread(struct { } -unsigned long get_wchan (struct task_struct *p); +unsigned long __get_wchan (struct task_struct *p);#define KSTK_EIP (tsk) \ ({ \arch/m68k/kernel/process.c +1
-3@@ -263,13 +263,11 @@ int dump_fpu (struct pt_regs *regs, stru }EXPORT_SYMBOL (dump_fpu); -unsigned long get_wchan (struct task_struct *p) +unsigned long __get_wchan (struct task_struct *p) {unsigned long fp, pc;unsigned long stack_page;int count =0 ; -if (!p || p == current ||task_is_running (p)) -return 0 ; stack_page = (unsigned long )task_stack_page (p); fp = ((struct switch_stack *)p->thread.ksp)->a6;arch/microblaze/include/asm/processor.h +1
-1@@ -68,7 +68,7 @@ static inline void release_thread(struct { } -unsigned long get_wchan (struct task_struct *p); +unsigned long __get_wchan (struct task_struct *p);/* The size allocated for kernel stacks. This _must_ be a power of two! */ # define KERNEL_STACK_SIZE 0x2000arch/microblaze/kernel/process.c +1
-1@@ -112,7 +112,7 @@ int copy_thread(unsigned long clone_flagreturn 0 ; } -unsigned long get_wchan (struct task_struct *p) +unsigned long __get_wchan (struct task_struct *p) {/* TBD (used by procfs) */ return 0 ;arch/mips/include/asm/processor.h +1
-1@@ -369,7 +369,7 @@ static inline void flush_thread(void) { } -unsigned long get_wchan (struct task_struct *p); +unsigned long __get_wchan (struct task_struct *p);#define __KSTK_TOS (tsk) ((unsigned long)task_stack_page(tsk) + \ THREAD_SIZE - 32 - sizeof(struct pt_regs))arch/mips/kernel/process.c +3
-5@@ -511,7 +511,7 @@ static int __init frame_info_init(void)/* * Without schedule() frame info, result given by -* thread_saved_pc() and get_wchan() are not reliable. +* thread_saved_pc() and __get_wchan() are not reliable. */ if (schedule_mfi.pc_offset <0 )printk ("Can't analyze schedule() prologue at %p\n" , schedule);@@ -652,9 +652,9 @@ unsigned long unwind_stack(struct task_s#endif /* -* get_wchan - a maintenance nightmare^W^Wpain in the ass ... +* __get_wchan - a maintenance nightmare^W^Wpain in the ass ... */ -unsigned long get_wchan (struct task_struct *task) +unsigned long __get_wchan (struct task_struct *task) {unsigned long pc =0 ;#ifdef CONFIG_KALLSYMS @@ -662,8 +662,6 @@ unsigned long get_wchan(struct task_struunsigned long ra =0 ;#endif -if (!task || task == current ||task_is_running (task)) - goto out;if (!task_stack_page (task)) goto out;arch/nds32/include/asm/processor.h +1
-1@@ -83,7 +83,7 @@ extern struct task_struct *last_task_use/* Prepare to copy thread state - unlazy all lazy status */ #define prepare_to_copy (tsk) do { } while (0) -unsigned long get_wchan (struct task_struct *p); +unsigned long __get_wchan (struct task_struct *p);#define cpu_relax () barrier()arch/nds32/kernel/process.c +1
-6@@ -233,15 +233,12 @@ int dump_fpu(struct pt_regs *regs, elf_fEXPORT_SYMBOL (dump_fpu); -unsigned long get_wchan (struct task_struct *p) +unsigned long __get_wchan (struct task_struct *p) {unsigned long fp, lr;unsigned long stack_start, stack_end;int count =0 ; -if (!p || p == current ||task_is_running (p)) -return 0 ; -if (IS_ENABLED (CONFIG_FRAME_POINTER )) { stack_start = (unsigned long )end_of_stack (p); stack_end = (unsigned long )task_stack_page (p) +THREAD_SIZE ;@@ -258,5 +255,3 @@ unsigned long get_wchan(struct task_stru }return 0 ; } - -EXPORT_SYMBOL (get_wchan);arch/nios2/include/asm/processor.h +1
-1@@ -69,7 +69,7 @@ static inline void release_thread(struct { } -extern unsigned long get_wchan (struct task_struct *p); +extern unsigned long __get_wchan (struct task_struct *p);#define task_pt_regs (p) \ ((struct pt_regs *)(THREAD_SIZE + task_stack_page(p)) - 1)arch/nios2/kernel/process.c +1
-4@@ -217,15 +217,12 @@ void dump(struct pt_regs *fp)pr_emerg ("\n\n" ); } -unsigned long get_wchan (struct task_struct *p) +unsigned long __get_wchan (struct task_struct *p) {unsigned long fp, pc;unsigned long stack_page;int count =0 ; -if (!p || p == current ||task_is_running (p)) -return 0 ; - stack_page = (unsigned long )p; fp = ((struct switch_stack *)p->thread.ksp)->fp;/* ;dgt2 */ do {arch/openrisc/include/asm/processor.h +1
-1@@ -73,7 +73,7 @@ struct thread_struct {void start_thread (struct pt_regs *regs,unsigned long nip,unsigned long sp);void release_thread (struct task_struct *); -unsigned long get_wchan (struct task_struct *p); +unsigned long __get_wchan (struct task_struct *p);#define cpu_relax () barrier()arch/openrisc/kernel/process.c +1
-1@@ -263,7 +263,7 @@ void dump_elf_thread(elf_greg_t *dest, s dest[35 ] =0 ; } -unsigned long get_wchan (struct task_struct *p) +unsigned long __get_wchan (struct task_struct *p) {/* TODO */ arch/parisc/include/asm/processor.h +1
-1@@ -273,7 +273,7 @@ struct mm_struct;/* Free all resources held by a thread. */ extern void release_thread (struct task_struct *); -extern unsigned long get_wchan (struct task_struct *p); +extern unsigned long __get_wchan (struct task_struct *p);#define KSTK_EIP (tsk) ((tsk)->thread.regs.iaoq[0])#define KSTK_ESP (tsk) ((tsk)->thread.regs.gr[30])arch/parisc/kernel/process.c +1
-4@@ -240,15 +240,12 @@ copy_thread(unsigned long clone_flags, u }unsigned long -get_wchan (struct task_struct *p) +__get_wchan (struct task_struct *p) {struct unwind_frame_info info;unsigned long ip;int count =0 ; -if (!p || p == current ||task_is_running (p)) -return 0 ; -/* * These bracket the sleeping functions.. */ arch/powerpc/include/asm/processor.h +1
-1@@ -300,7 +300,7 @@ struct thread_struct {#define task_pt_regs (tsk) ((tsk)->thread.regs) -unsigned long get_wchan (struct task_struct *p); +unsigned long __get_wchan (struct task_struct *p);#define KSTK_EIP (tsk) ((tsk)->thread.regs? (tsk)->thread.regs->nip: 0)#define KSTK_ESP (tsk) ((tsk)->thread.regs? (tsk)->thread.regs->gpr[1]: 0)arch/powerpc/kernel/process.c +3
-6@@ -2111,14 +2111,11 @@ int validate_sp(unsigned long sp, structEXPORT_SYMBOL (validate_sp); -static unsigned long __get_wchan (struct task_struct *p) +static unsigned long ___get_wchan (struct task_struct *p) {unsigned long ip, sp;int count =0 ; -if (!p || p == current ||task_is_running (p)) -return 0 ; - sp = p->thread.ksp;if (!validate_sp (sp, p,STACK_FRAME_OVERHEAD ))return 0 ;@@ -2137,14 +2134,14 @@ static unsigned long __get_wchan(structreturn 0 ; } -unsigned long get_wchan (struct task_struct *p) +unsigned long __get_wchan (struct task_struct *p) {unsigned long ret;if (!try_get_task_stack (p))return 0 ; - ret =__get_wchan (p); + ret =___get_wchan (p);put_task_stack (p);arch/riscv/include/asm/processor.h +1
-1@@ -66,7 +66,7 @@ static inline void release_thread(struct { } -extern unsigned long get_wchan (struct task_struct *p); +extern unsigned long __get_wchan (struct task_struct *p);static inline void wait_for_interrupt (void )arch/riscv/kernel/stacktrace.c +5
-7@@ -128,16 +128,14 @@ static bool save_wchan(void *arg, unsignreturn true; } -unsigned long get_wchan (struct task_struct *task) +unsigned long __get_wchan (struct task_struct *task) {unsigned long pc =0 ; -if (likely (task && task != current && !task_is_running (task))) { -if (!try_get_task_stack (task)) -return 0 ; -walk_stackframe (task,NULL , save_wchan, &pc); -put_task_stack (task); - } +if (!try_get_task_stack (task)) +return 0 ; +walk_stackframe (task,NULL , save_wchan, &pc); +put_task_stack (task);return pc; }arch/s390/include/asm/processor.h +1
-1@@ -192,7 +192,7 @@ static inline void release_thread(structvoid guarded_storage_release (struct task_struct *tsk);void gs_load_bc_cb (struct pt_regs *regs); -unsigned long get_wchan (struct task_struct *p); +unsigned long __get_wchan (struct task_struct *p);#define task_pt_regs (tsk) ((struct pt_regs *) \ (task_stack_page(tsk) + THREAD_SIZE) - 1)#define KSTK_EIP (tsk) (task_pt_regs(tsk)->psw.addr)arch/s390/kernel/process.c +2
-2@@ -181,12 +181,12 @@ void execve_tail(void) asmvolatile ("sfpc %0" : :"d" (0 )); } -unsigned long get_wchan (struct task_struct *p) +unsigned long __get_wchan (struct task_struct *p) {struct unwind_state state;unsigned long ip =0 ; -if (!p || p == current ||task_is_running (p) || !task_stack_page (p)) +if (!task_stack_page (p))return 0 ;if (!try_get_task_stack (p))arch/sh/include/asm/processor_32.h +1
-1@@ -180,7 +180,7 @@ static inline void show_code(struct pt_r }#endif -extern unsigned long get_wchan (struct task_struct *p); +extern unsigned long __get_wchan (struct task_struct *p);#define KSTK_EIP (tsk) (task_pt_regs(tsk)->pc)#define KSTK_ESP (tsk) (task_pt_regs(tsk)->regs[15])arch/sh/kernel/process_32.c +1
-4@@ -182,13 +182,10 @@ __switch_to(struct task_struct *prev, streturn prev; } -unsigned long get_wchan (struct task_struct *p) +unsigned long __get_wchan (struct task_struct *p) {unsigned long pc; -if (!p || p == current ||task_is_running (p)) -return 0 ; -/* * The same comment as on the Alpha applies here, too ... */ arch/sparc/include/asm/processor_32.h +1
-1@@ -89,7 +89,7 @@ static inline void start_thread(struct p/* Free all resources held by a thread. */ #define release_thread (tsk) do { } while(0) -unsigned long get_wchan (struct task_struct *); +unsigned long __get_wchan (struct task_struct *);#define task_pt_regs (tsk) ((tsk)->thread.kregs)#define KSTK_EIP (tsk) ((tsk)->thread.kregs->pc)arch/sparc/include/asm/processor_64.h +1
-1@@ -183,7 +183,7 @@ do { \/* Free all resources held by a thread. */ #define release_thread (tsk) do { } while (0) -unsigned long get_wchan (struct task_struct *task); +unsigned long __get_wchan (struct task_struct *task);#define task_pt_regs (tsk) (task_thread_info(tsk)->kregs)#define KSTK_EIP (tsk) (task_pt_regs(tsk)->tpc)arch/sparc/kernel/process_32.c +1
-4@@ -365,7 +365,7 @@ int copy_thread(unsigned long clone_flagreturn 0 ; } -unsigned long get_wchan (struct task_struct *task) +unsigned long __get_wchan (struct task_struct *task) {unsigned long pc, fp, bias =0 ;unsigned long task_base = (unsigned long ) task;@@ -373,9 +373,6 @@ unsigned long get_wchan(struct task_strustruct reg_window32 *rw;int count =0 ; -if (!task || task == current ||task_is_running (task)) - goto out; - fp =task_thread_info (task)->ksp + bias; do { /* Bogus frame pointer? */arch/sparc/kernel/process_64.c +1
-4@@ -663,7 +663,7 @@ int arch_dup_task_struct(struct task_strreturn 0 ; } -unsigned long get_wchan (struct task_struct *task) +unsigned long __get_wchan (struct task_struct *task) {unsigned long pc, fp, bias =0 ;struct thread_info *tp;@@ -671,9 +671,6 @@ unsigned long get_wchan(struct task_struunsigned long ret =0 ;int count =0 ; -if (!task || task == current ||task_is_running (task)) - goto out; - tp =task_thread_info (task); bias =STACK_BIAS ; fp =task_thread_info (task)->ksp + bias;arch/um/include/asm/processor-generic.h +1
-1@@ -106,6 +106,6 @@ extern struct cpuinfo_um boot_cpu_data;#define cache_line_size () (boot_cpu_data.cache_alignment)#define KSTK_REG (tsk, reg) get_thread_reg(reg, &tsk->thread.switch_buf) -extern unsigned long get_wchan (struct task_struct *p); +extern unsigned long __get_wchan (struct task_struct *p);#endif arch/um/kernel/process.c +1
-4@@ -364,14 +364,11 @@ unsigned long arch_align_stack(unsigned }#endif -unsigned long get_wchan (struct task_struct *p) +unsigned long __get_wchan (struct task_struct *p) {unsigned long stack_page, sp, ip;bool seen_sched =0 ; -if ((p ==NULL ) || (p == current) ||task_is_running (p)) -return 0 ; - stack_page = (unsigned long )task_stack_page (p);/* Bail if the process has no kernel stack for some reason */ if (stack_page ==0 )arch/x86/include/asm/processor.h +1
-1@@ -590,7 +590,7 @@ static inline void load_sp0(unsigned lon/* Free all resources held by a thread. */ extern void release_thread (struct task_struct *); -unsigned long get_wchan (struct task_struct *p); +unsigned long __get_wchan (struct task_struct *p);/* * Generic CPUID function arch/x86/kernel/process.c +1
-4@@ -943,13 +943,10 @@ unsigned long arch_randomize_brk(struct* because the task might wake up and we might look at a stack * changing under us. */ -unsigned long get_wchan (struct task_struct *p) +unsigned long __get_wchan (struct task_struct *p) {unsigned long entry =0 ; -if (p == current ||task_is_running (p)) -return 0 ; -stack_trace_save_tsk (p, &entry,1 ,0 );return entry; }arch/xtensa/include/asm/processor.h +1
-1@@ -215,7 +215,7 @@ struct mm_struct;/* Free all resources held by a thread. */ #define release_thread (thread) do { } while(0) -extern unsigned long get_wchan (struct task_struct *p); +extern unsigned long __get_wchan (struct task_struct *p);#define KSTK_EIP (tsk) (task_pt_regs(tsk)->pc)#define KSTK_ESP (tsk) (task_pt_regs(tsk)->areg[1])arch/xtensa/kernel/process.c +1
-4@@ -298,15 +298,12 @@ int copy_thread(unsigned long clone_flag* These bracket the sleeping functions.. */ -unsigned long get_wchan (struct task_struct *p) +unsigned long __get_wchan (struct task_struct *p) {unsigned long sp, pc;unsigned long stack_page = (unsigned long )task_stack_page (p);int count =0 ; -if (!p || p == current ||task_is_running (p)) -return 0 ; - sp = p->thread.sp; pc =MAKE_PC_FROM_RA (p->thread.ra, p->thread.sp);include/linux/sched.h +1
-0@@ -2139,6 +2139,7 @@ static inline void set_task_cpu(struct t#endif /* CONFIG_SMP */ extern bool sched_task_on_rq (struct task_struct *p); +extern unsigned long get_wchan (struct task_struct *p);/* * In order to reduce various lock holder preemption latencies provide an kernel/sched/core.c +19
-0@@ -1962,6 +1962,25 @@ bool sched_task_on_rq(struct task_structreturn task_on_rq_queued (p); } +unsigned long get_wchan (struct task_struct *p) +{ +unsigned long ip =0 ; +unsigned int state; + +if (!p || p == current) +return 0 ; + +/* Only get wchan if task is blocked and we can keep it that way. */ +raw_spin_lock_irq (&p->pi_lock); + state =READ_ONCE (p->__state); +smp_rmb ();/* see try_to_wake_up() */ +if (state !=TASK_RUNNING && state !=TASK_WAKING && !p->on_rq) + ip =__get_wchan (p); +raw_spin_unlock_irq (&p->pi_lock); + +return ip; +} +static inline void enqueue_task (struct rq *rq,struct task_struct *p,int flags) {if (!(flags &ENQUEUE_NOCLOCK ))
Re: [PATCH 5/7] sched: Add wrapper for get_wchan() to keep task blocked
In reply to Peter ZijlstraQuoted 8 lines · Peter Zijlstra
From: Kees Cook <[email protected]>
Having a stable wchan means the process must be blocked and for it to stay that way while performing stack unwinding.
Suggested-by Peter Zijlstra <[email protected]>Signed-off-by Kees Cook <[email protected]>Signed-off-by Peter Zijlstra (Intel) <[email protected]>
I will eventually get around to test this once I've caught up.
Signature · 2 lines
RMK's Patch system: https://www.armlinux.org.uk/developer/patches/ FTTP is here! 40Mbps down 10Mbps up. Decent connectivity at last!
[tip: sched/core] sched: Add wrapper for get_wchan() to keep task blocked
In reply to Peter ZijlstraThe following commit has been merged into the sched/core branch of tip:
The following commit has been merged into the sched/core branch of tip:
Commit-ID: 42a20f86dc19f9282d974df0ba4d226c865ab9dd Gitweb: https://git.kernel.org/tip/42a20f86dc19f9282d974df0ba4d226c865ab9dd Author: Kees Cook <[email protected]> AuthorDate: Wed, 29 Sep 2021 15:02:14 -07:00 Committer: Peter Zijlstra <[email protected]> CommitterDate: Fri, 15 Oct 2021 11:25:14 +02:00
sched: Add wrapper for get_wchan() to keep task blocked
Having a stable wchan means the process must be blocked and for it to stay that way while performing stack unwinding.
--- arch/alpha/include/asm/processor.h | 2 +- arch/alpha/kernel/process.c | 5 ++--- arch/arc/include/asm/processor.h | 2 +- arch/arc/kernel/stacktrace.c | 4 ++-- arch/arm/include/asm/processor.h | 2 +- arch/arm/kernel/process.c | 4 +--- arch/arm64/include/asm/processor.h | 2 +- arch/arm64/kernel/process.c | 4 +--- arch/csky/include/asm/processor.h | 2 +- arch/csky/kernel/stacktrace.c | 5 ++--- arch/h8300/include/asm/processor.h | 2 +- arch/h8300/kernel/process.c | 5 +---- arch/hexagon/include/asm/processor.h | 2 +- arch/hexagon/kernel/process.c | 4 +--- arch/ia64/include/asm/processor.h | 2 +- arch/ia64/kernel/process.c | 5 +---- arch/m68k/include/asm/processor.h | 2 +- arch/m68k/kernel/process.c | 4 +--- arch/microblaze/include/asm/processor.h | 2 +- arch/microblaze/kernel/process.c | 2 +- arch/mips/include/asm/processor.h | 2 +- arch/mips/kernel/process.c | 8 +++----- arch/nds32/include/asm/processor.h | 2 +- arch/nds32/kernel/process.c | 7 +------ arch/nios2/include/asm/processor.h | 2 +- arch/nios2/kernel/process.c | 5 +---- arch/openrisc/include/asm/processor.h | 2 +- arch/openrisc/kernel/process.c | 2 +- arch/parisc/include/asm/processor.h | 2 +- arch/parisc/kernel/process.c | 5 +---- arch/powerpc/include/asm/processor.h | 2 +- arch/powerpc/kernel/process.c | 9 +++------ arch/riscv/include/asm/processor.h | 2 +- arch/riscv/kernel/stacktrace.c | 12 +++++------- arch/s390/include/asm/processor.h | 2 +- arch/s390/kernel/process.c | 4 ++-- arch/sh/include/asm/processor_32.h | 2 +- arch/sh/kernel/process_32.c | 5 +---- arch/sparc/include/asm/processor_32.h | 2 +- arch/sparc/include/asm/processor_64.h | 2 +- arch/sparc/kernel/process_32.c | 5 +---- arch/sparc/kernel/process_64.c | 5 +---- arch/um/include/asm/processor-generic.h | 2 +- arch/um/kernel/process.c | 5 +---- arch/x86/include/asm/processor.h | 2 +- arch/x86/kernel/process.c | 5 +---- arch/xtensa/include/asm/processor.h | 2 +- arch/xtensa/kernel/process.c | 5 +---- include/linux/sched.h | 1 + kernel/sched/core.c | 19 +++++++++++++++++++ 50 files changed, 80 insertions(+), 112 deletions(-)
arch/alpha/include/asm/processor.h +1 -1
@@ -42,7 +42,7 @@ extern void start_thread(struct pt_regs *, unsigned long, unsigned long);struct task_struct ;extern void release_thread (struct task_struct *); -unsigned long get_wchan (struct task_struct *p); +unsigned long __get_wchan (struct task_struct *p);#define KSTK_EIP (tsk) (task_pt_regs(tsk)->pc)
arch/alpha/kernel/process.c +2 -3
@@ -376,12 +376,11 @@ thread_saved_pc(struct task_struct *t) }unsigned long -get_wchan (struct task_struct *p) +__get_wchan (struct task_struct *p) {unsigned long schedule_frame;unsigned long pc; -if (!p || p == current ||task_is_running (p)) -return 0 ; +/* * This one depends on the frame size of schedule(). Do a * "disass schedule" in gdb to find the frame size. Also, the
arch/arc/include/asm/processor.h +1 -1
@@ -70,7 +70,7 @@ struct task_struct;extern void start_thread (struct pt_regs * regs,unsigned long pc,unsigned long usp); -extern unsigned int get_wchan (struct task_struct *p); +extern unsigned int __get_wchan (struct task_struct *p);#endif /* !__ASSEMBLY__ */
arch/arc/kernel/stacktrace.c +2 -2
@@ -15,7 +15,7 @@* = specifics of data structs where trace is saved(CONFIG_STACKTRACE etc) * * vineetg: March 2009 -* -Implemented correct versions of thread_saved_pc() and get_wchan() +* -Implemented correct versions of thread_saved_pc() and __get_wchan() * * rajeshwarr: 2008 * -Initial implementation
@@ -248,7 +248,7 @@ void show_stack(struct task_struct *tsk, unsigned long *sp, const char *loglvl)* Of course just returning schedule( ) would be pointless so unwind until * the function is not in schedular code */ -unsigned int get_wchan (struct task_struct *tsk) +unsigned int __get_wchan (struct task_struct *tsk) {return arc_unwind_core (tsk,NULL , __get_first_nonsched,NULL ); }
arch/arm/include/asm/processor.h +1 -1
@@ -84,7 +84,7 @@ struct task_struct;/* Free all resources held by a thread. */ extern void release_thread (struct task_struct *); -unsigned long get_wchan (struct task_struct *p); +unsigned long __get_wchan (struct task_struct *p);#define task_pt_regs (p) \ ((struct pt_regs *)(THREAD_START_SP + task_stack_page(p)) - 1)
arch/arm/kernel/process.c +1 -3
@@ -276,13 +276,11 @@ int copy_thread(unsigned long clone_flags, unsigned long stack_start,return 0 ; } -unsigned long get_wchan (struct task_struct *p) +unsigned long __get_wchan (struct task_struct *p) {struct stackframe frame;unsigned long stack_page;int count =0 ; -if (!p || p == current ||task_is_running (p)) -return 0 ; frame.fp =thread_saved_fp (p); frame.sp =thread_saved_sp (p);
arch/arm64/include/asm/processor.h +1 -1
@@ -257,7 +257,7 @@ struct task_struct;/* Free all resources held by a thread. */ extern void release_thread (struct task_struct *); -unsigned long get_wchan (struct task_struct *p); +unsigned long __get_wchan (struct task_struct *p);void update_sctlr_el1 (u64 sctlr);
arch/arm64/kernel/process.c +1 -3
@@ -528,13 +528,11 @@ __notrace_funcgraph struct task_struct *__switch_to(struct task_struct *prev,return last; } -unsigned long get_wchan (struct task_struct *p) +unsigned long __get_wchan (struct task_struct *p) {struct stackframe frame;unsigned long stack_page, ret =0 ;int count =0 ; -if (!p || p == current ||task_is_running (p)) -return 0 ; stack_page = (unsigned long )try_get_task_stack (p);if (!stack_page)
arch/csky/include/asm/processor.h +1 -1
@@ -81,7 +81,7 @@ static inline void release_thread(struct task_struct *dead_task)extern int kernel_thread (int (*fn)(void *),void *arg,unsigned long flags); -unsigned long get_wchan (struct task_struct *p); +unsigned long __get_wchan (struct task_struct *p);#define KSTK_EIP (tsk) (task_pt_regs(tsk)->pc)#define KSTK_ESP (tsk) (task_pt_regs(tsk)->usp)
arch/csky/kernel/stacktrace.c +2 -3
@@ -111,12 +111,11 @@ static bool save_wchan(unsigned long pc, void *arg)return false; } -unsigned long get_wchan (struct task_struct *task) +unsigned long __get_wchan (struct task_struct *task) {unsigned long pc =0 ; -if (likely (task && task != current && !task_is_running (task))) -walk_stackframe (task,NULL , save_wchan, &pc); +walk_stackframe (task,NULL , save_wchan, &pc);return pc; }
arch/h8300/include/asm/processor.h +1 -1
@@ -105,7 +105,7 @@ static inline void release_thread(struct task_struct *dead_task) { } -unsigned long get_wchan (struct task_struct *p); +unsigned long __get_wchan (struct task_struct *p);#define KSTK_EIP (tsk) \ ({ \
arch/h8300/kernel/process.c +1 -4
@@ -128,15 +128,12 @@ int copy_thread(unsigned long clone_flags, unsigned long usp,return 0 ; } -unsigned long get_wchan (struct task_struct *p) +unsigned long __get_wchan (struct task_struct *p) {unsigned long fp, pc;unsigned long stack_page;int count =0 ; -if (!p || p == current ||task_is_running (p)) -return 0 ; - stack_page = (unsigned long )p; fp = ((struct pt_regs *)p->thread.ksp)->er6; do {
arch/hexagon/include/asm/processor.h +1 -1
@@ -64,7 +64,7 @@ struct thread_struct {extern void release_thread (struct task_struct *dead_task);/* Get wait channel for task P. */ -extern unsigned long get_wchan (struct task_struct *p); +extern unsigned long __get_wchan (struct task_struct *p);/* The following stuff is pretty HEXAGON specific. */
arch/hexagon/kernel/process.c +1 -3
@@ -130,13 +130,11 @@ void flush_thread(void)* is an identification of the point at which the scheduler * was invoked by a blocked thread. */ -unsigned long get_wchan (struct task_struct *p) +unsigned long __get_wchan (struct task_struct *p) {unsigned long fp, pc;unsigned long stack_page;int count =0 ; -if (!p || p == current ||task_is_running (p)) -return 0 ; stack_page = (unsigned long )task_stack_page (p); fp = ((struct hexagon_switch_stack *)p->thread.switch_sp)->fp;
arch/ia64/include/asm/processor.h +1 -1
@@ -330,7 +330,7 @@ struct task_struct;#define release_thread (dead_task)/* Get wait channel for task P. */ -extern unsigned long get_wchan (struct task_struct *p); +extern unsigned long __get_wchan (struct task_struct *p);/* Return instruction pointer of blocked task TSK. */ #define KSTK_EIP (tsk) \
arch/ia64/kernel/process.c +1 -4
@@ -523,15 +523,12 @@ exit_thread (struct task_struct *tsk) }unsigned long -get_wchan (struct task_struct *p) +__get_wchan (struct task_struct *p) {struct unw_frame_info info;unsigned long ip;int count =0 ; -if (!p || p == current ||task_is_running (p)) -return 0 ; -/* * Note: p may not be a blocked task (it could be current or * another process running on some other CPU. Rather than
arch/m68k/include/asm/processor.h +1 -1
@@ -150,7 +150,7 @@ static inline void release_thread(struct task_struct *dead_task) { } -unsigned long get_wchan (struct task_struct *p); +unsigned long __get_wchan (struct task_struct *p);#define KSTK_EIP (tsk) \ ({ \
arch/m68k/kernel/process.c +1 -3
@@ -263,13 +263,11 @@ int dump_fpu (struct pt_regs *regs, struct user_m68kfp_struct *fpu) }EXPORT_SYMBOL (dump_fpu); -unsigned long get_wchan (struct task_struct *p) +unsigned long __get_wchan (struct task_struct *p) {unsigned long fp, pc;unsigned long stack_page;int count =0 ; -if (!p || p == current ||task_is_running (p)) -return 0 ; stack_page = (unsigned long )task_stack_page (p); fp = ((struct switch_stack *)p->thread.ksp)->a6;
arch/microblaze/include/asm/processor.h +1 -1
@@ -68,7 +68,7 @@ static inline void release_thread(struct task_struct *dead_task) { } -unsigned long get_wchan (struct task_struct *p); +unsigned long __get_wchan (struct task_struct *p);/* The size allocated for kernel stacks. This _must_ be a power of two! */ # define KERNEL_STACK_SIZE 0x2000
arch/microblaze/kernel/process.c +1 -1
@@ -112,7 +112,7 @@ int copy_thread(unsigned long clone_flags, unsigned long usp, unsigned long arg,return 0 ; } -unsigned long get_wchan (struct task_struct *p) +unsigned long __get_wchan (struct task_struct *p) {/* TBD (used by procfs) */ return 0 ;
arch/mips/include/asm/processor.h +1 -1
@@ -369,7 +369,7 @@ static inline void flush_thread(void) { } -unsigned long get_wchan (struct task_struct *p); +unsigned long __get_wchan (struct task_struct *p);#define __KSTK_TOS (tsk) ((unsigned long)task_stack_page(tsk) + \ THREAD_SIZE - 32 - sizeof(struct pt_regs))
arch/mips/kernel/process.c +3 -5
@@ -511,7 +511,7 @@ static int __init frame_info_init(void)/* * Without schedule() frame info, result given by -* thread_saved_pc() and get_wchan() are not reliable. +* thread_saved_pc() and __get_wchan() are not reliable. */ if (schedule_mfi.pc_offset <0 )printk ("Can't analyze schedule() prologue at %p\n" , schedule);
@@ -652,9 +652,9 @@ unsigned long unwind_stack(struct task_struct *task, unsigned long *sp,#endif /* -* get_wchan - a maintenance nightmare^W^Wpain in the ass ... +* __get_wchan - a maintenance nightmare^W^Wpain in the ass ... */ -unsigned long get_wchan (struct task_struct *task) +unsigned long __get_wchan (struct task_struct *task) {unsigned long pc =0 ;#ifdef CONFIG_KALLSYMS
@@ -662,8 +662,6 @@ unsigned long get_wchan(struct task_struct *task)unsigned long ra =0 ;#endif -if (!task || task == current ||task_is_running (task)) - goto out;if (!task_stack_page (task)) goto out;
arch/nds32/include/asm/processor.h +1 -1
@@ -83,7 +83,7 @@ extern struct task_struct *last_task_used_math;/* Prepare to copy thread state - unlazy all lazy status */ #define prepare_to_copy (tsk) do { } while (0) -unsigned long get_wchan (struct task_struct *p); +unsigned long __get_wchan (struct task_struct *p);#define cpu_relax () barrier()
arch/nds32/kernel/process.c +1 -6
@@ -233,15 +233,12 @@ int dump_fpu(struct pt_regs *regs, elf_fpregset_t * fpu)EXPORT_SYMBOL (dump_fpu); -unsigned long get_wchan (struct task_struct *p) +unsigned long __get_wchan (struct task_struct *p) {unsigned long fp, lr;unsigned long stack_start, stack_end;int count =0 ; -if (!p || p == current ||task_is_running (p)) -return 0 ; -if (IS_ENABLED (CONFIG_FRAME_POINTER )) { stack_start = (unsigned long )end_of_stack (p); stack_end = (unsigned long )task_stack_page (p) +THREAD_SIZE ;
@@ -258,5 +255,3 @@ unsigned long get_wchan(struct task_struct *p) }return 0 ; } - -EXPORT_SYMBOL (get_wchan);
arch/nios2/include/asm/processor.h +1 -1
@@ -69,7 +69,7 @@ static inline void release_thread(struct task_struct *dead_task) { } -extern unsigned long get_wchan (struct task_struct *p); +extern unsigned long __get_wchan (struct task_struct *p);#define task_pt_regs (p) \ ((struct pt_regs *)(THREAD_SIZE + task_stack_page(p)) - 1)
arch/nios2/kernel/process.c +1 -4
@@ -217,15 +217,12 @@ void dump(struct pt_regs *fp)pr_emerg ("\n\n" ); } -unsigned long get_wchan (struct task_struct *p) +unsigned long __get_wchan (struct task_struct *p) {unsigned long fp, pc;unsigned long stack_page;int count =0 ; -if (!p || p == current ||task_is_running (p)) -return 0 ; - stack_page = (unsigned long )p; fp = ((struct switch_stack *)p->thread.ksp)->fp;/* ;dgt2 */ do {
arch/openrisc/include/asm/processor.h +1 -1
@@ -73,7 +73,7 @@ struct thread_struct {void start_thread (struct pt_regs *regs,unsigned long nip,unsigned long sp);void release_thread (struct task_struct *); -unsigned long get_wchan (struct task_struct *p); +unsigned long __get_wchan (struct task_struct *p);#define cpu_relax () barrier()
arch/openrisc/kernel/process.c +1 -1
@@ -263,7 +263,7 @@ void dump_elf_thread(elf_greg_t *dest, struct pt_regs* regs) dest[35 ] =0 ; } -unsigned long get_wchan (struct task_struct *p) +unsigned long __get_wchan (struct task_struct *p) {/* TODO */
arch/parisc/include/asm/processor.h +1 -1
@@ -273,7 +273,7 @@ struct mm_struct;/* Free all resources held by a thread. */ extern void release_thread (struct task_struct *); -extern unsigned long get_wchan (struct task_struct *p); +extern unsigned long __get_wchan (struct task_struct *p);#define KSTK_EIP (tsk) ((tsk)->thread.regs.iaoq[0])#define KSTK_ESP (tsk) ((tsk)->thread.regs.gr[30])
arch/parisc/kernel/process.c +1 -4
@@ -240,15 +240,12 @@ copy_thread(unsigned long clone_flags, unsigned long usp, }unsigned long -get_wchan (struct task_struct *p) +__get_wchan (struct task_struct *p) {struct unwind_frame_info info;unsigned long ip;int count =0 ; -if (!p || p == current ||task_is_running (p)) -return 0 ; -/* * These bracket the sleeping functions.. */
arch/powerpc/include/asm/processor.h +1 -1
@@ -300,7 +300,7 @@ struct thread_struct {#define task_pt_regs (tsk) ((tsk)->thread.regs) -unsigned long get_wchan (struct task_struct *p); +unsigned long __get_wchan (struct task_struct *p);#define KSTK_EIP (tsk) ((tsk)->thread.regs? (tsk)->thread.regs->nip: 0)#define KSTK_ESP (tsk) ((tsk)->thread.regs? (tsk)->thread.regs->gpr[1]: 0)
arch/powerpc/kernel/process.c +3 -6
@@ -2111,14 +2111,11 @@ int validate_sp(unsigned long sp, struct task_struct *p,EXPORT_SYMBOL (validate_sp); -static unsigned long __get_wchan (struct task_struct *p) +static unsigned long ___get_wchan (struct task_struct *p) {unsigned long ip, sp;int count =0 ; -if (!p || p == current ||task_is_running (p)) -return 0 ; - sp = p->thread.ksp;if (!validate_sp (sp, p,STACK_FRAME_OVERHEAD ))return 0 ;
@@ -2137,14 +2134,14 @@ static unsigned long __get_wchan(struct task_struct *p)return 0 ; } -unsigned long get_wchan (struct task_struct *p) +unsigned long __get_wchan (struct task_struct *p) {unsigned long ret;if (!try_get_task_stack (p))return 0 ; - ret =__get_wchan (p); + ret =___get_wchan (p);put_task_stack (p);
arch/riscv/include/asm/processor.h +1 -1
@@ -66,7 +66,7 @@ static inline void release_thread(struct task_struct *dead_task) { } -extern unsigned long get_wchan (struct task_struct *p); +extern unsigned long __get_wchan (struct task_struct *p);static inline void wait_for_interrupt (void )
arch/riscv/kernel/stacktrace.c +5 -7
@@ -128,16 +128,14 @@ static bool save_wchan(void *arg, unsigned long pc)return true; } -unsigned long get_wchan (struct task_struct *task) +unsigned long __get_wchan (struct task_struct *task) {unsigned long pc =0 ; -if (likely (task && task != current && !task_is_running (task))) { -if (!try_get_task_stack (task)) -return 0 ; -walk_stackframe (task,NULL , save_wchan, &pc); -put_task_stack (task); - } +if (!try_get_task_stack (task)) +return 0 ; +walk_stackframe (task,NULL , save_wchan, &pc); +put_task_stack (task);return pc; }
arch/s390/include/asm/processor.h +1 -1
@@ -192,7 +192,7 @@ static inline void release_thread(struct task_struct *tsk) { }void guarded_storage_release (struct task_struct *tsk);void gs_load_bc_cb (struct pt_regs *regs); -unsigned long get_wchan (struct task_struct *p); +unsigned long __get_wchan (struct task_struct *p);#define task_pt_regs (tsk) ((struct pt_regs *) \ (task_stack_page(tsk) + THREAD_SIZE) - 1)#define KSTK_EIP (tsk) (task_pt_regs(tsk)->psw.addr)
arch/s390/kernel/process.c +2 -2
@@ -181,12 +181,12 @@ void execve_tail(void) asmvolatile ("sfpc %0" : :"d" (0 )); } -unsigned long get_wchan (struct task_struct *p) +unsigned long __get_wchan (struct task_struct *p) {struct unwind_state state;unsigned long ip =0 ; -if (!p || p == current ||task_is_running (p) || !task_stack_page (p)) +if (!task_stack_page (p))return 0 ;if (!try_get_task_stack (p))
arch/sh/include/asm/processor_32.h +1 -1
@@ -180,7 +180,7 @@ static inline void show_code(struct pt_regs *regs) }#endif -extern unsigned long get_wchan (struct task_struct *p); +extern unsigned long __get_wchan (struct task_struct *p);#define KSTK_EIP (tsk) (task_pt_regs(tsk)->pc)#define KSTK_ESP (tsk) (task_pt_regs(tsk)->regs[15])
arch/sh/kernel/process_32.c +1 -4
@@ -182,13 +182,10 @@ __switch_to(struct task_struct *prev, struct task_struct *next)return prev; } -unsigned long get_wchan (struct task_struct *p) +unsigned long __get_wchan (struct task_struct *p) {unsigned long pc; -if (!p || p == current ||task_is_running (p)) -return 0 ; -/* * The same comment as on the Alpha applies here, too ... */
arch/sparc/include/asm/processor_32.h +1 -1
@@ -89,7 +89,7 @@ static inline void start_thread(struct pt_regs * regs, unsigned long pc,/* Free all resources held by a thread. */ #define release_thread (tsk) do { } while(0) -unsigned long get_wchan (struct task_struct *); +unsigned long __get_wchan (struct task_struct *);#define task_pt_regs (tsk) ((tsk)->thread.kregs)#define KSTK_EIP (tsk) ((tsk)->thread.kregs->pc)
arch/sparc/include/asm/processor_64.h +1 -1
@@ -183,7 +183,7 @@ do { \/* Free all resources held by a thread. */ #define release_thread (tsk) do { } while (0) -unsigned long get_wchan (struct task_struct *task); +unsigned long __get_wchan (struct task_struct *task);#define task_pt_regs (tsk) (task_thread_info(tsk)->kregs)#define KSTK_EIP (tsk) (task_pt_regs(tsk)->tpc)
arch/sparc/kernel/process_32.c +1 -4
@@ -365,7 +365,7 @@ int copy_thread(unsigned long clone_flags, unsigned long sp, unsigned long arg,return 0 ; } -unsigned long get_wchan (struct task_struct *task) +unsigned long __get_wchan (struct task_struct *task) {unsigned long pc, fp, bias =0 ;unsigned long task_base = (unsigned long ) task;
@@ -373,9 +373,6 @@ unsigned long get_wchan(struct task_struct *task)struct reg_window32 *rw;int count =0 ; -if (!task || task == current ||task_is_running (task)) - goto out; - fp =task_thread_info (task)->ksp + bias; do { /* Bogus frame pointer? */
arch/sparc/kernel/process_64.c +1 -4
@@ -663,7 +663,7 @@ int arch_dup_task_struct(struct task_struct *dst, struct task_struct *src)return 0 ; } -unsigned long get_wchan (struct task_struct *task) +unsigned long __get_wchan (struct task_struct *task) {unsigned long pc, fp, bias =0 ;struct thread_info *tp;
@@ -671,9 +671,6 @@ unsigned long get_wchan(struct task_struct *task)unsigned long ret =0 ;int count =0 ; -if (!task || task == current ||task_is_running (task)) - goto out; - tp =task_thread_info (task); bias =STACK_BIAS ; fp =task_thread_info (task)->ksp + bias;
arch/um/include/asm/processor-generic.h +1 -1
@@ -106,6 +106,6 @@ extern struct cpuinfo_um boot_cpu_data;#define cache_line_size () (boot_cpu_data.cache_alignment)#define KSTK_REG (tsk, reg) get_thread_reg(reg, &tsk->thread.switch_buf) -extern unsigned long get_wchan (struct task_struct *p); +extern unsigned long __get_wchan (struct task_struct *p);#endif
arch/um/kernel/process.c +1 -4
@@ -364,14 +364,11 @@ unsigned long arch_align_stack(unsigned long sp) }#endif -unsigned long get_wchan (struct task_struct *p) +unsigned long __get_wchan (struct task_struct *p) {unsigned long stack_page, sp, ip;bool seen_sched =0 ; -if ((p ==NULL ) || (p == current) ||task_is_running (p)) -return 0 ; - stack_page = (unsigned long )task_stack_page (p);/* Bail if the process has no kernel stack for some reason */ if (stack_page ==0 )
arch/x86/include/asm/processor.h +1 -1
@@ -589,7 +589,7 @@ static inline void load_sp0(unsigned long sp0)/* Free all resources held by a thread. */ extern void release_thread (struct task_struct *); -unsigned long get_wchan (struct task_struct *p); +unsigned long __get_wchan (struct task_struct *p);/* * Generic CPUID function
arch/x86/kernel/process.c +1 -4
@@ -942,13 +942,10 @@ unsigned long arch_randomize_brk(struct mm_struct *mm)* because the task might wake up and we might look at a stack * changing under us. */ -unsigned long get_wchan (struct task_struct *p) +unsigned long __get_wchan (struct task_struct *p) {unsigned long entry =0 ; -if (p == current ||task_is_running (p)) -return 0 ; -stack_trace_save_tsk (p, &entry,1 ,0 );return entry; }
arch/xtensa/include/asm/processor.h +1 -1
@@ -215,7 +215,7 @@ struct mm_struct;/* Free all resources held by a thread. */ #define release_thread (thread) do { } while(0) -extern unsigned long get_wchan (struct task_struct *p); +extern unsigned long __get_wchan (struct task_struct *p);#define KSTK_EIP (tsk) (task_pt_regs(tsk)->pc)#define KSTK_ESP (tsk) (task_pt_regs(tsk)->areg[1])
arch/xtensa/kernel/process.c +1 -4
@@ -298,15 +298,12 @@ int copy_thread(unsigned long clone_flags, unsigned long usp_thread_fn,* These bracket the sleeping functions.. */ -unsigned long get_wchan (struct task_struct *p) +unsigned long __get_wchan (struct task_struct *p) {unsigned long sp, pc;unsigned long stack_page = (unsigned long )task_stack_page (p);int count =0 ; -if (!p || p == current ||task_is_running (p)) -return 0 ; - sp = p->thread.sp; pc =MAKE_PC_FROM_RA (p->thread.ra, p->thread.sp);
include/linux/sched.h +1 -0
@@ -2139,6 +2139,7 @@ static inline void set_task_cpu(struct task_struct *p, unsigned int cpu)#endif /* CONFIG_SMP */ extern bool sched_task_on_rq (struct task_struct *p); +extern unsigned long get_wchan (struct task_struct *p);/* * In order to reduce various lock holder preemption latencies provide an
kernel/sched/core.c +19 -0
@@ -1966,6 +1966,25 @@ bool sched_task_on_rq(struct task_struct *p)return task_on_rq_queued (p); } +unsigned long get_wchan (struct task_struct *p) +{ +unsigned long ip =0 ; +unsigned int state; + +if (!p || p == current) +return 0 ; + +/* Only get wchan if task is blocked and we can keep it that way. */ +raw_spin_lock_irq (&p->pi_lock); + state =READ_ONCE (p->__state); +smp_rmb ();/* see try_to_wake_up() */ +if (state !=TASK_RUNNING && state !=TASK_WAKING && !p->on_rq) + ip =__get_wchan (p); +raw_spin_unlock_irq (&p->pi_lock); + +return ip; +} +static inline void enqueue_task (struct rq *rq,struct task_struct *p,int flags) {if (!(flags &ENQUEUE_NOCLOCK ))
Peter Zijlstra
maintainerPATCH 6/7 arch: __get_wchan || STACKTRACE_SUPPORT
In reply to Peter ZijlstraIt's trivial to implement __get_wchan() with CONFIG_STACKTRACE
--- arch/arc/include/asm/processor.h | 2 - arch/arc/kernel/stacktrace.c | 17 -------------- arch/arm/include/asm/processor.h | 2 - arch/arm/kernel/process.c | 22 ------------------- arch/arm64/include/asm/processor.h | 2 - arch/arm64/kernel/process.c | 26 ---------------------- arch/csky/include/asm/processor.h | 2 - arch/csky/kernel/stacktrace.c | 18 --------------- arch/hexagon/include/asm/processor.h | 3 -- arch/hexagon/kernel/process.c | 26 ---------------------- arch/ia64/include/asm/processor.h | 3 -- arch/ia64/kernel/process.c | 28 ------------------------ arch/microblaze/include/asm/processor.h | 2 - arch/microblaze/kernel/process.c | 6 ----- arch/mips/include/asm/processor.h | 2 - arch/mips/kernel/process.c | 27 ----------------------- arch/nds32/include/asm/processor.h | 2 - arch/nds32/kernel/process.c | 23 ------------------- arch/openrisc/include/asm/processor.h | 1 arch/openrisc/kernel/process.c | 6 ----- arch/parisc/include/asm/processor.h | 2 - arch/parisc/kernel/process.c | 24 -------------------- arch/powerpc/include/asm/processor.h | 2 - arch/powerpc/kernel/process.c | 37 -------------------------------- arch/riscv/include/asm/processor.h | 3 -- arch/riscv/kernel/stacktrace.c | 21 ------------------ arch/s390/include/asm/processor.h | 1 arch/s390/kernel/process.c | 29 ------------------------- arch/sh/include/asm/processor_32.h | 2 - arch/sh/kernel/process_32.c | 19 ---------------- arch/sparc/include/asm/processor_64.h | 2 - arch/sparc/kernel/process_64.c | 28 ------------------------ arch/um/include/asm/processor-generic.h | 1 arch/um/kernel/process.c | 32 --------------------------- arch/x86/include/asm/processor.h | 2 - arch/x86/kernel/process.c | 14 ------------ arch/xtensa/include/asm/processor.h | 2 - arch/xtensa/kernel/process.c | 29 ------------------------- kernel/sched/core.c | 15 ++++++++++++ lib/Kconfig.debug | 7 ------ 40 files changed, 16 insertions(+), 476 deletions(-)
arch/arc/include/asm/processor.h +0 -2
@@ -70,8 +70,6 @@ struct task_struct;extern void start_thread (struct pt_regs * regs,unsigned long pc,unsigned long usp); -extern unsigned int __get_wchan (struct task_struct *p); -#endif /* !__ASSEMBLY__ */ /*
arch/arc/kernel/stacktrace.c +0 -17
@@ -217,14 +217,6 @@ static int __collect_all_but_sched(unsig#endif -static int __get_first_nonsched (unsigned int address,void *unused) -{ -if (in_sched_functions (address)) -return 0 ; - -return -1 ; -} -/*------------------------------------------------------------------------- * APIs expected by various kernel sub-systems *-------------------------------------------------------------------------
@@ -244,15 +236,6 @@ void show_stack(struct task_struct *tsk,show_stacktrace (tsk,NULL , loglvl); } -/* Another API expected by schedular, shows up in "ps" as Wait Channel -* Of course just returning schedule( ) would be pointless so unwind until -* the function is not in schedular code -*/ -unsigned int __get_wchan (struct task_struct *tsk) -{ -return arc_unwind_core (tsk,NULL , __get_first_nonsched,NULL ); -} -#ifdef CONFIG_STACKTRACE /*
arch/arm/include/asm/processor.h +0 -2
@@ -84,8 +84,6 @@ struct task_struct;/* Free all resources held by a thread. */ extern void release_thread (struct task_struct *); -unsigned long __get_wchan (struct task_struct *p); -#define task_pt_regs (p) \ ((struct pt_regs *)(THREAD_START_SP + task_stack_page(p)) - 1)
arch/arm/kernel/process.c +0 -22
@@ -276,28 +276,6 @@ int copy_thread(unsigned long clone_flagreturn 0 ; } -unsigned long __get_wchan (struct task_struct *p) -{ -struct stackframe frame; -unsigned long stack_page; -int count =0 ; - - frame.fp =thread_saved_fp (p); - frame.sp =thread_saved_sp (p); - frame.lr =0 ;/* recovered from the stack */ - frame.pc =thread_saved_pc (p); - stack_page = (unsigned long )task_stack_page (p); -do { -if (frame.sp < stack_page || - frame.sp >= stack_page +THREAD_SIZE || -unwind_frame (&frame) <0 ) -return 0 ; -if (!in_sched_functions (frame.pc)) -return frame.pc; - }while (count ++ <16 ); -return 0 ; -} -#ifdef CONFIG_MMU #ifdef CONFIG_KUSER_HELPERS /*
arch/arm64/include/asm/processor.h +0 -2
@@ -257,8 +257,6 @@ struct task_struct;/* Free all resources held by a thread. */ extern void release_thread (struct task_struct *); -unsigned long __get_wchan (struct task_struct *p); -void update_sctlr_el1 (u64 sctlr);/* Thread switching */
arch/arm64/kernel/process.c +0 -26
@@ -528,32 +528,6 @@ __notrace_funcgraph struct task_struct *return last; } -unsigned long __get_wchan (struct task_struct *p) -{ -struct stackframe frame; -unsigned long stack_page, ret =0 ; -int count =0 ; - - stack_page = (unsigned long )try_get_task_stack (p); -if (!stack_page) -return 0 ; - -start_backtrace (&frame,thread_saved_fp (p),thread_saved_pc (p)); - -do { -if (unwind_frame (p, &frame)) - goto out; -if (!in_sched_functions (frame.pc)) { - ret = frame.pc; - goto out; - } - }while (count++ <16 ); - -out: -put_task_stack (p); -return ret; -} -unsigned long arch_align_stack (unsigned long sp) {if (!(current->personality &ADDR_NO_RANDOMIZE ) && randomize_va_space)
arch/csky/include/asm/processor.h +0 -2
@@ -81,8 +81,6 @@ static inline void release_thread(structextern int kernel_thread (int (*fn)(void *),void *arg,unsigned long flags); -unsigned long __get_wchan (struct task_struct *p); -#define KSTK_EIP (tsk) (task_pt_regs(tsk)->pc)#define KSTK_ESP (tsk) (task_pt_regs(tsk)->usp)
arch/csky/kernel/stacktrace.c +0 -18
@@ -101,24 +101,6 @@ void show_stack(struct task_struct *taskwalk_stackframe (task,NULL , print_trace_address, (void *)loglvl); } -static bool save_wchan (unsigned long pc,void *arg) -{ -if (!in_sched_functions (pc)) { -unsigned long *p = arg; - *p = pc; -return true; - } -return false; -} - -unsigned long __get_wchan (struct task_struct *task) -{ -unsigned long pc =0 ; - -walk_stackframe (task,NULL , save_wchan, &pc); -return pc; -} -#ifdef CONFIG_STACKTRACE static bool __save_trace (unsigned long pc,void *arg,bool nosched) {
arch/hexagon/include/asm/processor.h +0 -3
@@ -63,9 +63,6 @@ struct thread_struct {/* Free all resources held by a thread; defined in process.c */ extern void release_thread (struct task_struct *dead_task); -/* Get wait channel for task P. */ -extern unsigned long __get_wchan (struct task_struct *p); -/* The following stuff is pretty HEXAGON specific. */ /* This is really just here for __switch_to.
arch/hexagon/kernel/process.c +0 -26
@@ -126,32 +126,6 @@ void flush_thread(void) }/* -* The "wait channel" terminology is archaic, but what we want -* is an identification of the point at which the scheduler -* was invoked by a blocked thread. -*/ -unsigned long __get_wchan (struct task_struct *p) -{ -unsigned long fp, pc; -unsigned long stack_page; -int count =0 ; - - stack_page = (unsigned long )task_stack_page (p); - fp = ((struct hexagon_switch_stack *)p->thread.switch_sp)->fp; -do { -if (fp < (stack_page +sizeof (struct thread_info )) || - fp >= (THREAD_SIZE -8 + stack_page)) -return 0 ; - pc = ((unsigned long *)fp)[1 ]; -if (!in_sched_functions (pc)) -return pc; - fp = *(unsigned long *) fp; - }while (count++ <16 ); - -return 0 ; -} - -/* * Called on the exit path of event entry; see vm_entry.S * * Interrupts will already be disabled.
arch/ia64/include/asm/processor.h +0 -3
@@ -329,9 +329,6 @@ struct task_struct;*/ #define release_thread (dead_task) -/* Get wait channel for task P. */ -extern unsigned long __get_wchan (struct task_struct *p); -/* Return instruction pointer of blocked task TSK. */ #define KSTK_EIP (tsk) \ ({ \
arch/ia64/kernel/process.c +0 -28
@@ -522,34 +522,6 @@ exit_thread (struct task_struct *tsk)ia64_drop_fpu (tsk); } -unsigned long -__get_wchan (struct task_struct *p) -{ -struct unw_frame_info info; -unsigned long ip; -int count =0 ; - -/* -* Note: p may not be a blocked task (it could be current or -* another process running on some other CPU. Rather than -* trying to determine if p is really blocked, we just assume -* it's blocked and rely on the unwind routines to fail -* gracefully if the process wasn't really blocked after all. -* --davidm 99/12/15 -*/ -unw_init_from_blocked_task (&info, p); -do { -if (task_is_running (p)) -return 0 ; -if (unw_unwind (&info) <0 ) -return 0 ; -unw_get_ip (&info, &ip); -if (!in_sched_functions (ip)) -return ip; - }while (count++ <16 ); -return 0 ; -} -void cpu_halt (void ) {
arch/microblaze/include/asm/processor.h +0 -2
@@ -68,8 +68,6 @@ static inline void release_thread(struct { } -unsigned long __get_wchan (struct task_struct *p); -/* The size allocated for kernel stacks. This _must_ be a power of two! */ # define KERNEL_STACK_SIZE 0x2000
arch/microblaze/kernel/process.c +0 -6
@@ -112,12 +112,6 @@ int copy_thread(unsigned long clone_flagreturn 0 ; } -unsigned long __get_wchan (struct task_struct *p) -{ -/* TBD (used by procfs) */ -return 0 ; -} -/* Set up a thread for executing a new program */ void start_thread (struct pt_regs *regs,unsigned long pc,unsigned long usp) {
arch/mips/include/asm/processor.h +0 -2
@@ -369,8 +369,6 @@ static inline void flush_thread(void) { } -unsigned long __get_wchan (struct task_struct *p); -#define __KSTK_TOS (tsk) ((unsigned long)task_stack_page(tsk) + \ THREAD_SIZE - 32 - sizeof(struct pt_regs))#define task_pt_regs (tsk) ((struct pt_regs *)__KSTK_TOS(tsk))
arch/mips/kernel/process.c +0 -27
@@ -651,33 +651,6 @@ unsigned long unwind_stack(struct task_s }#endif -/* -* __get_wchan - a maintenance nightmare^W^Wpain in the ass ... -*/ -unsigned long __get_wchan (struct task_struct *task) -{ -unsigned long pc =0 ; -#ifdef CONFIG_KALLSYMS -unsigned long sp; -unsigned long ra =0 ; -#endif - -if (!task_stack_page (task)) - goto out; - - pc =thread_saved_pc (task); - -#ifdef CONFIG_KALLSYMS - sp = task->thread.reg29 + schedule_mfi.frame_size; - -while (in_sched_functions (pc)) - pc =unwind_stack (task, &sp, pc, &ra); -#endif - -out: -return pc; -} -unsigned long mips_stack_top (void ) {unsigned long top =TASK_SIZE &PAGE_MASK ;
arch/nds32/include/asm/processor.h +0 -2
@@ -83,8 +83,6 @@ extern struct task_struct *last_task_use/* Prepare to copy thread state - unlazy all lazy status */ #define prepare_to_copy (tsk) do { } while (0) -unsigned long __get_wchan (struct task_struct *p); -#define cpu_relax () barrier()#define task_pt_regs (task) \
arch/nds32/kernel/process.c +0 -23
@@ -232,26 +232,3 @@ int dump_fpu(struct pt_regs *regs, elf_f }EXPORT_SYMBOL (dump_fpu); - -unsigned long __get_wchan (struct task_struct *p) -{ -unsigned long fp, lr; -unsigned long stack_start, stack_end; -int count =0 ; - -if (IS_ENABLED (CONFIG_FRAME_POINTER )) { - stack_start = (unsigned long )end_of_stack (p); - stack_end = (unsigned long )task_stack_page (p) +THREAD_SIZE ; - - fp =thread_saved_fp (p); -do { -if (fp < stack_start || fp > stack_end) -return 0 ; - lr = ((unsigned long *)fp)[0 ]; -if (!in_sched_functions (lr)) -return lr; - fp = *(unsigned long *)(fp +4 ); - }while (count++ <16 ); - } -return 0 ; -}
arch/openrisc/include/asm/processor.h +0 -1
@@ -73,7 +73,6 @@ struct thread_struct {void start_thread (struct pt_regs *regs,unsigned long nip,unsigned long sp);void release_thread (struct task_struct *); -unsigned long __get_wchan (struct task_struct *p);#define cpu_relax () barrier()
arch/openrisc/kernel/process.c +0 -6
@@ -263,9 +263,3 @@ void dump_elf_thread(elf_greg_t *dest, s dest[35 ] =0 ; } -unsigned long __get_wchan (struct task_struct *p) -{ -/* TODO */ - -return 0 ; -}
arch/parisc/include/asm/processor.h +0 -2
@@ -273,8 +273,6 @@ struct mm_struct;/* Free all resources held by a thread. */ extern void release_thread (struct task_struct *); -extern unsigned long __get_wchan (struct task_struct *p); -#define KSTK_EIP (tsk) ((tsk)->thread.regs.iaoq[0])#define KSTK_ESP (tsk) ((tsk)->thread.regs.gr[30])
arch/parisc/kernel/process.c +0 -24
@@ -239,30 +239,6 @@ copy_thread(unsigned long clone_flags, ureturn 0 ; } -unsigned long -__get_wchan (struct task_struct *p) -{ -struct unwind_frame_info info; -unsigned long ip; -int count =0 ; - -/* -* These bracket the sleeping functions.. -*/ - -unwind_frame_init_from_blocked_task (&info, p); -do { -if (unwind_once (&info) <0 ) -return 0 ; -if (task_is_running (p)) -return 0 ; - ip = info.ip; -if (!in_sched_functions (ip)) -return ip; - }while (count++ <MAX_UNWIND_ENTRIES ); -return 0 ; -} -#ifdef CONFIG_64BIT void *dereference_function_descriptor (void *ptr) {
arch/powerpc/include/asm/processor.h +0 -2
@@ -300,8 +300,6 @@ struct thread_struct {#define task_pt_regs (tsk) ((tsk)->thread.regs) -unsigned long __get_wchan (struct task_struct *p); -#define KSTK_EIP (tsk) ((tsk)->thread.regs? (tsk)->thread.regs->nip: 0)#define KSTK_ESP (tsk) ((tsk)->thread.regs? (tsk)->thread.regs->gpr[1]: 0)
arch/powerpc/kernel/process.c +0 -37
@@ -2111,43 +2111,6 @@ int validate_sp(unsigned long sp, structEXPORT_SYMBOL (validate_sp); -static unsigned long ___get_wchan (struct task_struct *p) -{ -unsigned long ip, sp; -int count =0 ; - - sp = p->thread.ksp; -if (!validate_sp (sp, p,STACK_FRAME_OVERHEAD )) -return 0 ; - -do { - sp = *(unsigned long *)sp; -if (!validate_sp (sp, p,STACK_FRAME_OVERHEAD ) || -task_is_running (p)) -return 0 ; -if (count >0 ) { - ip = ((unsigned long *)sp)[STACK_FRAME_LR_SAVE ]; -if (!in_sched_functions (ip)) -return ip; - } - }while (count++ <16 ); -return 0 ; -} - -unsigned long __get_wchan (struct task_struct *p) -{ -unsigned long ret; - -if (!try_get_task_stack (p)) -return 0 ; - - ret =___get_wchan (p); - -put_task_stack (p); - -return ret; -} -static int kstack_depth_to_print =CONFIG_PRINT_STACK_DEPTH ; void __no_sanitize_address show_stack(struct task_struct *tsk,
arch/riscv/include/asm/processor.h +0 -3
@@ -66,9 +66,6 @@ static inline void release_thread(struct { } -extern unsigned long __get_wchan (struct task_struct *p); - -static inline void wait_for_interrupt (void ) { __asm__ __volatile__ ("wfi" );
arch/riscv/kernel/stacktrace.c +0 -21
@@ -118,27 +118,6 @@ void show_stack(struct task_struct *taskdump_backtrace (NULL , task, loglvl); } -static bool save_wchan (void *arg,unsigned long pc) -{ -if (!in_sched_functions (pc)) { -unsigned long *p = arg; - *p = pc; -return false; - } -return true; -} - -unsigned long __get_wchan (struct task_struct *task) -{ -unsigned long pc =0 ; - -if (!try_get_task_stack (task)) -return 0 ; -walk_stackframe (task,NULL , save_wchan, &pc); -put_task_stack (task); -return pc; -} -#ifdef CONFIG_STACKTRACE noinline void arch_stack_walk(stack_trace_consume_fn consume_entry, void *cookie,
arch/s390/include/asm/processor.h +0 -1
@@ -192,7 +192,6 @@ static inline void release_thread(structvoid guarded_storage_release (struct task_struct *tsk);void gs_load_bc_cb (struct pt_regs *regs); -unsigned long __get_wchan (struct task_struct *p);#define task_pt_regs (tsk) ((struct pt_regs *) \ (task_stack_page(tsk) + THREAD_SIZE) - 1)#define KSTK_EIP (tsk) (task_pt_regs(tsk)->psw.addr)
arch/s390/kernel/process.c +0 -29
@@ -181,35 +181,6 @@ void execve_tail(void) asmvolatile ("sfpc %0" : :"d" (0 )); } -unsigned long __get_wchan (struct task_struct *p) -{ -struct unwind_state state; -unsigned long ip =0 ; - -if (!task_stack_page (p)) -return 0 ; - -if (!try_get_task_stack (p)) -return 0 ; - -unwind_for_each_frame (&state, p,NULL ,0 ) { -if (state.stack_info.type !=STACK_TYPE_TASK ) { - ip =0 ; -break ; - } - - ip =unwind_get_return_address (&state); -if (!ip) -break ; - -if (!in_sched_functions (ip)) -break ; - } - -put_task_stack (p); -return ip; -} -unsigned long arch_align_stack (unsigned long sp) {if (!(current->personality &ADDR_NO_RANDOMIZE ) && randomize_va_space)
arch/sh/include/asm/processor_32.h +0 -2
@@ -180,8 +180,6 @@ static inline void show_code(struct pt_r }#endif -extern unsigned long __get_wchan (struct task_struct *p); -#define KSTK_EIP (tsk) (task_pt_regs(tsk)->pc)#define KSTK_ESP (tsk) (task_pt_regs(tsk)->regs[15])
arch/sh/kernel/process_32.c +0 -19
@@ -181,22 +181,3 @@ __switch_to(struct task_struct *prev, streturn prev; } - -unsigned long __get_wchan (struct task_struct *p) -{ -unsigned long pc; - -/* -* The same comment as on the Alpha applies here, too ... -*/ - pc =thread_saved_pc (p); - -#ifdef CONFIG_FRAME_POINTER -if (in_sched_functions (pc)) { -unsigned long schedule_frame = (unsigned long )p->thread.sp; -return ((unsigned long *)schedule_frame)[21 ]; - } -#endif - -return pc; -}
arch/sparc/include/asm/processor_64.h +0 -2
@@ -183,8 +183,6 @@ do { \/* Free all resources held by a thread. */ #define release_thread (tsk) do { } while (0) -unsigned long __get_wchan (struct task_struct *task); -#define task_pt_regs (tsk) (task_thread_info(tsk)->kregs)#define KSTK_EIP (tsk) (task_pt_regs(tsk)->tpc)#define KSTK_ESP (tsk) (task_pt_regs(tsk)->u_regs[UREG_FP])
arch/sparc/kernel/process_64.c +0 -28
@@ -662,31 +662,3 @@ int arch_dup_task_struct(struct task_str *dst = *src;return 0 ; } - -unsigned long __get_wchan (struct task_struct *task) -{ -unsigned long pc, fp, bias =0 ; -struct thread_info *tp; -struct reg_window *rw; -unsigned long ret =0 ; -int count =0 ; - - tp =task_thread_info (task); - bias =STACK_BIAS ; - fp =task_thread_info (task)->ksp + bias; - -do { -if (!kstack_valid (tp, fp)) -break ; - rw = (struct reg_window *) fp; - pc = rw->ins[7 ]; -if (!in_sched_functions (pc)) { - ret = pc; - goto out; - } - fp = rw->ins[6 ] + bias; - }while (++count <16 ); - -out: -return ret; -}
arch/um/include/asm/processor-generic.h +0 -1
@@ -106,6 +106,5 @@ extern struct cpuinfo_um boot_cpu_data;#define cache_line_size () (boot_cpu_data.cache_alignment)#define KSTK_REG (tsk, reg) get_thread_reg(reg, &tsk->thread.switch_buf) -extern unsigned long __get_wchan (struct task_struct *p);#endif
arch/um/kernel/process.c +0 -32
@@ -364,38 +364,6 @@ unsigned long arch_align_stack(unsigned }#endif -unsigned long __get_wchan (struct task_struct *p) -{ -unsigned long stack_page, sp, ip; -bool seen_sched =0 ; - - stack_page = (unsigned long )task_stack_page (p); -/* Bail if the process has no kernel stack for some reason */ -if (stack_page ==0 ) -return 0 ; - - sp = p->thread.switch_buf->JB_SP; -/* -* Bail if the stack pointer is below the bottom of the kernel -* stack for some reason -*/ -if (sp < stack_page) -return 0 ; - -while (sp < stack_page +THREAD_SIZE ) { - ip = *((unsigned long *) sp); -if (in_sched_functions (ip)) -/* Ignore everything until we're above the scheduler */ - seen_sched =1 ; -else if (kernel_text_address (ip) && seen_sched) -return ip; - - sp +=sizeof (unsigned long ); - } - -return 0 ; -} -int elf_core_copy_fpregs (struct task_struct *t,elf_fpregset_t *fpu) {int cpu =current_thread_info ()->cpu;
arch/x86/include/asm/processor.h +0 -2
@@ -590,8 +590,6 @@ static inline void load_sp0(unsigned lon/* Free all resources held by a thread. */ extern void release_thread (struct task_struct *); -unsigned long __get_wchan (struct task_struct *p); -/* * Generic CPUID function * clear %ecx since some cpus (Cyrix MII) do not set or clear %ecx
arch/x86/kernel/process.c +0 -14
@@ -937,20 +937,6 @@ unsigned long arch_randomize_brk(structreturn randomize_page (mm->brk,0x02000000 ); } -/* -* Called from fs/proc with a reference on @p to find the function -* which called into schedule(). This needs to be done carefully -* because the task might wake up and we might look at a stack -* changing under us. -*/ -unsigned long __get_wchan (struct task_struct *p) -{ -unsigned long entry =0 ; - -stack_trace_save_tsk (p, &entry,1 ,0 ); -return entry; -} -long do_arch_prctl_common (struct task_struct *task,int option,unsigned long cpuid_enabled) {
arch/xtensa/include/asm/processor.h +0 -2
@@ -215,8 +215,6 @@ struct mm_struct;/* Free all resources held by a thread. */ #define release_thread (thread) do { } while(0) -extern unsigned long __get_wchan (struct task_struct *p); -#define KSTK_EIP (tsk) (task_pt_regs(tsk)->pc)#define KSTK_ESP (tsk) (task_pt_regs(tsk)->areg[1])
arch/xtensa/kernel/process.c +0 -29
@@ -293,32 +293,3 @@ int copy_thread(unsigned long clone_flagreturn 0 ; } - -/* -* These bracket the sleeping functions.. -*/ - -unsigned long __get_wchan (struct task_struct *p) -{ -unsigned long sp, pc; -unsigned long stack_page = (unsigned long )task_stack_page (p); -int count =0 ; - - sp = p->thread.sp; - pc =MAKE_PC_FROM_RA (p->thread.ra, p->thread.sp); - -do { -if (sp < stack_page +sizeof (struct task_struct ) || - sp >= (stack_page +THREAD_SIZE ) || - pc ==0 ) -return 0 ; -if (!in_sched_functions (pc)) -return pc; - -/* Stack layout: sp-4: ra, sp-3: sp' */ - - pc =MAKE_PC_FROM_RA (SPILL_SLOT (sp,0 ), sp); - sp =SPILL_SLOT (sp,1 ); - }while (count++ <16 ); -return 0 ; -}
kernel/sched/core.c +15 -0
@@ -1966,6 +1966,21 @@ bool sched_task_on_rq(struct task_structreturn task_on_rq_queued (p); } +#ifdef CONFIG_STACKTRACE +static unsigned long __get_wchan (struct task_struct *p) +{ +unsigned long entry =0 ; + +stack_trace_save_tsk (p, &entry,1 ,0 ); + +return entry; +} +#endif + +/* +* Called from fs/proc with a reference on @p to find the function +* which called into schedule(). +*/ unsigned long get_wchan (struct task_struct *p) {unsigned long ip =0 ;
lib/Kconfig.debug +1 -6
@@ -1531,13 +1531,8 @@ config DEBUG_IRQFLAGS are enabled. config STACKTRACE - bool "Stack backtrace support" + def_bool y depends on STACKTRACE_SUPPORT - help - This option causes the kernel to create a /proc/pid/stack for - every process, showing its current stack trace. - It is also used by various kernel debugging features that require - stack trace generation. config WARN_ALL_UNSEEDED_RANDOM bool "Warn for all uses of unseeded randomness"
Mark Rutland
reviewerRe: [PATCH 6/7] arch: __get_wchan || STACKTRACE_SUPPORT
[Adding Josh, since there might be a concern here from a livepatch pov]
Quoted 1 line · Peter Zijlstra
It's trivial to implement
__get_wchan()withCONFIG_STACKTRACE
Possibly, but I don't think this is quite right -- semantic issue below.
Quoted 50 lines
Signed-off-by Peter Zijlstra (Intel) <[email protected]>---
arch/arm64/include/asm/processor.h +0
-2@@ -257,8 +257,6 @@ struct task_struct;/* Free all resources held by a thread. */ extern void release_thread (struct task_struct *); -unsigned long __get_wchan (struct task_struct *p); -void update_sctlr_el1 (u64 sctlr);/* Thread switching */ arch/arm64/kernel/process.c +0
-26@@ -528,32 +528,6 @@ __notrace_funcgraph struct task_struct *return last; } -unsigned long __get_wchan (struct task_struct *p) -{ -struct stackframe frame; -unsigned long stack_page, ret =0 ; -int count =0 ; - - stack_page = (unsigned long )try_get_task_stack (p); -if (!stack_page) -return 0 ; - -start_backtrace (&frame,thread_saved_fp (p),thread_saved_pc (p)); - -do { -if (unwind_frame (p, &frame)) - goto out; -if (!in_sched_functions (frame.pc)) { - ret = frame.pc; - goto out; - } - }while (count++ <16 ); - -out: -put_task_stack (p); -return ret; -} -
kernel/sched/core.c bool sched_task_on_rq(struct task_struct · line 1974
Quoted 9 lines
kernel/sched/core.c +6
-0@@ -1966,6 +1966,21 @@ bool sched_task_on_rq(struct task_structreturn task_on_rq_queued (p); } +#ifdef CONFIG_STACKTRACE +static unsigned long __get_wchan (struct task_struct *p) +{ +unsigned long entry =0 ; + +stack_trace_save_tsk (p, &entry,1 ,0 );
This assumes stack_trace_save_tsk() will skip sched functions, but I don't think that's ever been a requirement? It's certinaly not documented anywhere that I could find, and arm64 doesn't do so today, and this patch causes wchan to just log __switch_to for everything.
I realise you "fix" that for some arches in the next patch, but it's not clear to me that's the right thing to do -- I would expect that stack_trace_save_tsk() *shouldn't* skip anything unless we've explicitly told it to via skipnr, because I'd expect that stack_trace_save_tsk_reliable() mustn't, in case we ever need to patch anything in the scheduler (or arch ctxsw code) with a livepatch, or if you ever *want* to have the sched functions in a trace.
So I have two big questions:
1) Where precisely should stack_trace_save_tsk() and stack_trace_save_tsk_reliable() start from?
1) What should you do when you *do* want sched functions in a trace?
We could side-step the issue here by using arch_stack_walk(), which'd make it easy to skip sched functions in the core code.
Thanks,
Mark.
Peter Zijlstra
maintainerRe: [PATCH 6/7] arch: __get_wchan || STACKTRACE_SUPPORT
Quoted 13 lines · Mark Rutland
[Adding Josh, since there might be a concern here from a livepatch pov]
kernel/sched/core.c bool sched_task_on_rq(struct task_struct · line 1974
Quoted 5 lines
kernel/sched/core.c +5
-0+static unsigned long __get_wchan (struct task_struct *p) +{ +unsigned long entry =0 ; + +stack_trace_save_tsk (p, &entry,1 ,0 );This assumes
stack_trace_save_tsk()will skip sched functions, but I don't think that's ever been a requirement? It's certinaly not documented anywhere that I could find, and arm64 doesn't do so today, and this patch causes wchan to just log__switch_tofor everything.
Confused, arm64 has arch_stack_walk() and should thus use kernel/stacktrace.c's stack_trace_consume_entry_nosched.
Quoted 2 lines
I realise you "fix" that for some arches in the next patch, but it's not clear to me that's the right thing to do -- I would expect that
I only actually change the behaviour on csky, both mips and nds32 have this 'savesched = (task == current)' logic which ends up being a very confusing way to write things, but for wchan we never call on current, and hence don't save the __sched functions.
Quoted 2 lines
stack_trace_save_tsk()*shouldn't* skip anything unless we've explicitly told it to via skipnr, because I'd expect that
It's what most archs happen to do today and is what stack_trace_save_tsk() as implemented using arch_stack_walk() does. Which is I think the closest to canonical we have.
Quoted 6 lines
stack_trace_save_tsk_reliable()mustn't, in case we ever need to patch anything in the scheduler (or arch ctxsw code) with a livepatch, or if you ever *want* to have the sched functions in a trace.So I have two big questions:
Quoted 7 lines
1) Where precisely should
stack_trace_save_tsk()andstack_trace_save_tsk_reliable()start from?1) What should you do when you *do* want sched functions in a trace?
We could side-step the issue here by using
arch_stack_walk(), which'd make it easy to skip sched functions in the core code.
arch_stack_walk() is the modern API and should be used going forward, and I've gone with the stack_trace_save*() implementation as per that.
Re: [PATCH 6/7] arch: __get_wchan || STACKTRACE_SUPPORT
Quoted 6 lines · Peter Zijlstra
Quoted 2 lines
stack_trace_save_tsk()*shouldn't* skip anything unless we've explicitly told it to via skipnr, because I'd expect thatIt's what most archs happen to do today and is what
stack_trace_save_tsk()as implemented usingarch_stack_walk()does. Which is I think the closest to canonical we have.
It *is* confusing though. Even if 'nosched' may be the normally desired behavior, stack_trace_save_tsk() should probably be named stack_trace_save_tsk_nosched().
Signature · 1 line
Josh
Mark Rutland
reviewerRe: [PATCH 6/7] arch: __get_wchan || STACKTRACE_SUPPORT
Quoted 7 lines · Josh Poimboeuf
Quoted 6 lines · Peter Zijlstra
Quoted 2 lines
stack_trace_save_tsk()*shouldn't* skip anything unless we've explicitly told it to via skipnr, because I'd expect thatIt's what most archs happen to do today and is what
stack_trace_save_tsk()as implemented usingarch_stack_walk()does. Which is I think the closest to canonical we have.
Ah; and arch_stack_walk() itself shouldn't skip anything, which gives the consistent low-level semantic I wanted.
Quoted 3 lines
It *is* confusing though. Even if 'nosched' may be the normally desired behavior,
stack_trace_save_tsk()should probably be namedstack_trace_save_tsk_nosched().
I agree that'd be less confusing!
Josh, am I right in my understanding that the reliable stacktrace functions *shouldn't* skip sched functions, or should those similarly gain a _nosched suffix?
Thanks,
Mark.
Re: [PATCH 6/7] arch: __get_wchan || STACKTRACE_SUPPORT
Quoted 16 lines · Mark Rutland
Quoted 7 lines · Josh Poimboeuf
Quoted 6 lines · Peter Zijlstra
Quoted 2 lines
stack_trace_save_tsk()*shouldn't* skip anything unless we've explicitly told it to via skipnr, because I'd expect thatIt's what most archs happen to do today and is what
stack_trace_save_tsk()as implemented usingarch_stack_walk()does. Which is I think the closest to canonical we have.Ah; and
arch_stack_walk()itself shouldn't skip anything, which gives the consistent low-level semantic I wanted.Quoted 3 lines
It *is* confusing though. Even if 'nosched' may be the normally desired behavior,
stack_trace_save_tsk()should probably be namedstack_trace_save_tsk_nosched().
Quoted 5 lines
I agree that'd be less confusing!
Josh, am I right in my understanding that the reliable stacktrace functions *shouldn't* skip sched functions, or should those similarly gain a
_noschedsuffix?
Correct, the reliable variants need to see the entire call stack and therefore they shouldn't skip sched functions.
Signature · 1 line
Josh
Mark Rutland
reviewerRe: [PATCH 6/7] arch: __get_wchan || STACKTRACE_SUPPORT
In reply to Peter ZijlstraQuoted 15 lines · Peter Zijlstra
Quoted 13 lines · Mark Rutland
[Adding Josh, since there might be a concern here from a livepatch pov]
kernel/sched/core.c bool sched_task_on_rq(struct task_struct · line 1974
Quoted 5 lines
kernel/sched/core.c +5
-0+static unsigned long __get_wchan (struct task_struct *p) +{ +unsigned long entry =0 ; + +stack_trace_save_tsk (p, &entry,1 ,0 );This assumes
stack_trace_save_tsk()will skip sched functions, but I don't think that's ever been a requirement? It's certinaly not documented anywhere that I could find, and arm64 doesn't do so today, and this patch causes wchan to just log__switch_tofor everything.
Quoted 2 lines
Confused, arm64 has
arch_stack_walk()and should thus use kernel/stacktrace.c'sstack_trace_consume_entry_nosched.
Looking at this arm64's *current* get_wchan() unwinds once before checking in_sched_functions(), so it skips __switch_to(). As of this patch, we check in_sched_functions() first, which stops the unwind immediately as __switch_to() isn't marked as __sched.
I think x86 gets away with this because switch_to() is asm, and that tail-calls __switch_to() when returning.
Does switch_to() and below need to be marked __sched?
Thanks,
Mark.
Re: [PATCH 6/7] arch: __get_wchan || STACKTRACE_SUPPORT
Quoted 24 lines · Mark Rutland
Quoted 15 lines · Peter Zijlstra
Quoted 13 lines · Mark Rutland
[Adding Josh, since there might be a concern here from a livepatch pov]
kernel/sched/core.c bool sched_task_on_rq(struct task_struct · line 1974
Quoted 5 lines
kernel/sched/core.c +5
-0+static unsigned long __get_wchan (struct task_struct *p) +{ +unsigned long entry =0 ; + +stack_trace_save_tsk (p, &entry,1 ,0 );This assumes
stack_trace_save_tsk()will skip sched functions, but I don't think that's ever been a requirement? It's certinaly not documented anywhere that I could find, and arm64 doesn't do so today, and this patch causes wchan to just log__switch_tofor everything.Quoted 2 lines
Confused, arm64 has
arch_stack_walk()and should thus use kernel/stacktrace.c'sstack_trace_consume_entry_nosched.Looking at this arm64's *current*
get_wchan()unwinds once before checkingin_sched_functions(), so it skips__switch_to(). As of this patch, we checkin_sched_functions()first, which stops the unwind immediately as__switch_to()isn't marked as__sched.
Quoted 4 lines
I think x86 gets away with this because
switch_to()is asm, and that tail-calls__switch_to()when returning.Does
switch_to()and below need to be marked__sched?
Yes, I would think so, for arches where they otherwise show up on the stacktrace.
Signature · 1 line
Josh
Russell King (Oracle)
maintainerRe: [PATCH 6/7] arch: __get_wchan || STACKTRACE_SUPPORT
In reply to Peter ZijlstraQuoted 3 lines · Peter Zijlstra
It's trivial to implement
__get_wchan()withCONFIG_STACKTRACESigned-off-by Peter Zijlstra (Intel) <[email protected]>
This definitely needs testing, but looking at the code, I think this will be compatible since we're essentially doing the same tests to omit scheduling functions in both the old and replacement code.
Signature · 2 lines
RMK's Patch system: https://www.armlinux.org.uk/developer/patches/ FTTP is here! 40Mbps down 10Mbps up. Decent connectivity at last!
Peter Zijlstra
maintainerPATCH 7/7 arch: Fix STACKTRACE_SUPPORT
In reply to Peter ZijlstraA few archs got save_stack_trace_tsk() vs in_sched_functions() wrong.
--- arch/csky/kernel/stacktrace.c | 7 ++++++- arch/mips/kernel/stacktrace.c | 27 ++++++++++++++++----------- arch/nds32/kernel/stacktrace.c | 21 +++++++++++---------- 3 files changed, 33 insertions(+), 22 deletions(-)
arch/csky/kernel/stacktrace.c +6 -1
@@ -122,12 +122,17 @@ static bool save_trace(unsigned long pc,return __save_trace (pc, arg, false); } +static bool save_trace_nosched (unsigned long pc,void *arg) +{ +return __save_trace (pc, arg, true); +} +/* * Save stack-backtrace addresses into a stack_trace buffer. */ void save_stack_trace_tsk (struct task_struct *tsk,struct stack_trace *trace) { -walk_stackframe (tsk,NULL , save_trace, trace); +walk_stackframe (tsk,NULL , save_trace_nosched, trace); }EXPORT_SYMBOL_GPL (save_stack_trace_tsk);
arch/mips/kernel/stacktrace.c +16 -11
@@ -66,16 +66,7 @@ static void save_context_stack(struct st#endif } -/* -* Save stack-backtrace addresses into a stack_trace buffer. -*/ -void save_stack_trace (struct stack_trace *trace) -{ -save_stack_trace_tsk (current, trace); -} -EXPORT_SYMBOL_GPL (save_stack_trace); - -void save_stack_trace_tsk (struct task_struct *tsk,struct stack_trace *trace) +static void __save_stack_trace_tsk (struct task_struct *tsk,struct stack_trace *trace,bool savesched) {struct pt_regs dummyregs;struct pt_regs *regs = &dummyregs;
@@ -88,6 +79,20 @@ void save_stack_trace_tsk(struct task_st regs->cp0_epc = tsk->thread.reg31; }else prepare_frametrace (regs); -save_context_stack (trace, tsk, regs, tsk == current); +save_context_stack (trace, tsk, regs, savesched); +} + +/* +* Save stack-backtrace addresses into a stack_trace buffer. +*/ +void save_stack_trace (struct stack_trace *trace) +{ +__save_stack_trace_tsk (current, trace, true); +} +EXPORT_SYMBOL_GPL (save_stack_trace); + +void save_stack_trace_tsk (struct task_struct *tsk,struct stack_trace *trace) +{ +__save_stack_trace_tsk (tsk, trace, false); }EXPORT_SYMBOL_GPL (save_stack_trace_tsk);
arch/nds32/kernel/stacktrace.c +11 -10
@@ -6,25 +6,16 @@#include <linux/stacktrace.h> #include <linux/ftrace.h> -void save_stack_trace (struct stack_trace *trace) -{ -save_stack_trace_tsk (current, trace); -} -EXPORT_SYMBOL_GPL (save_stack_trace); - -void save_stack_trace_tsk (struct task_struct *tsk,struct stack_trace *trace) +static void __save_stack_trace_tsk (struct task_struct *tsk,struct stack_trace *trace,bool savesched) {unsigned long *fpn;int skip = trace->skip; -int savesched;int graph_idx =0 ;if (tsk == current) { __asm__ __volatile__("\tori\t%0, $fp, #0\n" :"=r" (fpn)); - savesched =1 ; }else { fpn = (unsigned long *)thread_saved_fp (tsk); - savesched =0 ; } while (!kstack_end(fpn) && !((unsigned long)fpn & 0x3)
@@ -50,4 +41,14 @@ void save_stack_trace_tsk(struct task_st fpn = (unsigned long *)fpp; } } +void save_stack_trace (struct stack_trace *trace) +{ +__save_stack_trace_tsk (current, trace, true); +} +EXPORT_SYMBOL_GPL (save_stack_trace); + +void save_stack_trace_tsk (struct task_struct *tsk,struct stack_trace *trace) +{ +__save_stack_trace_tsk (tsk, trace, false); +}EXPORT_SYMBOL_GPL (save_stack_trace_tsk);
Mark Rutland
reviewerRe: [PATCH 7/7] arch: Fix STACKTRACE_SUPPORT
Quoted 1 line · Peter Zijlstra
A few archs got
save_stack_trace_tsk()vsin_sched_functions()wrong.
As mentioned on the last patch, it's not clear to me what the intended semantic of save_stack_trace_tsk() is w.r.t. sched functions, as the naive reading is that it should report *everything* a task may return to.
If it's meant to skip sched functions, I think we need some explicit documentation/commentary to that effect. In that case, there are other architectures that need a fixup (e.g. arm64).
TBH, I don't think it *should* skip sched functions, and we should filter out sched functions as required at a higher level, or deprecate this interface in favour of arch_stack_walk() where it's easier to have common filter functions invoked during the walk....
Thanks,
Mark.
Quoted 117 lines
Signed-off-by Peter Zijlstra (Intel) <[email protected]>--- arch/csky/kernel/stacktrace.c | 7 ++++++- arch/mips/kernel/stacktrace.c | 27 ++++++++++++++++----------- arch/nds32/kernel/stacktrace.c | 21 +++++++++++---------- 3 files changed, 33 insertions(+), 22 deletions(-)arch/csky/kernel/stacktrace.c +6
-1@@ -122,12 +122,17 @@ static bool save_trace(unsigned long pc,return __save_trace (pc, arg, false); } +static bool save_trace_nosched (unsigned long pc,void *arg) +{ +return __save_trace (pc, arg, true); +} +/* * Save stack-backtrace addresses into a stack_trace buffer. */ void save_stack_trace_tsk (struct task_struct *tsk,struct stack_trace *trace) { -walk_stackframe (tsk,NULL , save_trace, trace); +walk_stackframe (tsk,NULL , save_trace_nosched, trace); }EXPORT_SYMBOL_GPL (save_stack_trace_tsk);arch/mips/kernel/stacktrace.c +16
-11@@ -66,16 +66,7 @@ static void save_context_stack(struct st#endif } -/* -* Save stack-backtrace addresses into a stack_trace buffer. -*/ -void save_stack_trace (struct stack_trace *trace) -{ -save_stack_trace_tsk (current, trace); -} -EXPORT_SYMBOL_GPL (save_stack_trace); - -void save_stack_trace_tsk (struct task_struct *tsk,struct stack_trace *trace) +static void __save_stack_trace_tsk (struct task_struct *tsk,struct stack_trace *trace,bool savesched) {struct pt_regs dummyregs;struct pt_regs *regs = &dummyregs;@@ -88,6 +79,20 @@ void save_stack_trace_tsk(struct task_st regs->cp0_epc = tsk->thread.reg31; }else prepare_frametrace (regs); -save_context_stack (trace, tsk, regs, tsk == current); +save_context_stack (trace, tsk, regs, savesched); +} + +/* +* Save stack-backtrace addresses into a stack_trace buffer. +*/ +void save_stack_trace (struct stack_trace *trace) +{ +__save_stack_trace_tsk (current, trace, true); +} +EXPORT_SYMBOL_GPL (save_stack_trace); + +void save_stack_trace_tsk (struct task_struct *tsk,struct stack_trace *trace) +{ +__save_stack_trace_tsk (tsk, trace, false); }EXPORT_SYMBOL_GPL (save_stack_trace_tsk);arch/nds32/kernel/stacktrace.c +11
-10@@ -6,25 +6,16 @@#include <linux/stacktrace.h> #include <linux/ftrace.h> -void save_stack_trace (struct stack_trace *trace) -{ -save_stack_trace_tsk (current, trace); -} -EXPORT_SYMBOL_GPL (save_stack_trace); - -void save_stack_trace_tsk (struct task_struct *tsk,struct stack_trace *trace) +static void __save_stack_trace_tsk (struct task_struct *tsk,struct stack_trace *trace,bool savesched) {unsigned long *fpn;int skip = trace->skip; -int savesched;int graph_idx =0 ;if (tsk == current) { __asm__ __volatile__("\tori\t%0, $fp, #0\n" :"=r" (fpn)); - savesched =1 ; }else { fpn = (unsigned long *)thread_saved_fp (tsk); - savesched =0 ; } while (!kstack_end(fpn) && !((unsigned long)fpn & 0x3)@@ -50,4 +41,14 @@ void save_stack_trace_tsk(struct task_st fpn = (unsigned long *)fpp; } } +void save_stack_trace (struct stack_trace *trace) +{ +__save_stack_trace_tsk (current, trace, true); +} +EXPORT_SYMBOL_GPL (save_stack_trace); + +void save_stack_trace_tsk (struct task_struct *tsk,struct stack_trace *trace) +{ +__save_stack_trace_tsk (tsk, trace, false); +}EXPORT_SYMBOL_GPL (save_stack_trace_tsk);
Guo Ren
maintainerRe: [PATCH 7/7] arch: Fix STACKTRACE_SUPPORT
In reply to Peter ZijlstraThx Peter,
Quoted 20 lines · Peter Zijlstra
A few archs got
save_stack_trace_tsk()vsin_sched_functions()wrong.Signed-off-by Peter Zijlstra (Intel) <[email protected]>--- arch/csky/kernel/stacktrace.c | 7 ++++++- arch/mips/kernel/stacktrace.c | 27 ++++++++++++++++----------- arch/nds32/kernel/stacktrace.c | 21 +++++++++++---------- 3 files changed, 33 insertions(+), 22 deletions(-)arch/csky/kernel/stacktrace.c +4
-0@@ -122,12 +122,17 @@ static bool save_trace(unsigned long pc,return __save_trace (pc, arg, false); } +static bool save_trace_nosched (unsigned long pc,void *arg) +{ +return __save_trace (pc, arg, true); +}
arch/csky/kernel/stacktrace.c static bool save_trace(unsigned long pc, · line 137
Quoted 10 lines
arch/csky/kernel/stacktrace.c +2
-1+/* * Save stack-backtrace addresses into a stack_trace buffer. */ void save_stack_trace_tsk (struct task_struct *tsk,struct stack_trace *trace) { -walk_stackframe (tsk,NULL , save_trace, trace); +walk_stackframe (tsk,NULL , save_trace_nosched, trace); }EXPORT_SYMBOL_GPL (save_stack_trace_tsk);
I think the patch should be:
@@ -138,7 +138,7 @@ static bool __save_trace(unsigned long pc, void *arg, bool nosched)
static bool save_trace(unsigned long pc, void *arg) {
- return __save_trace(pc, arg, false);
+ return __save_trace(pc, arg, true);
}
Another question:
If we put sched_text in the backtrace buffer, just cause put no useful information in wchan, right?
(I think it wouldn't cause a worse problem than debugging.)
Quoted 79 lines
arch/mips/kernel/stacktrace.c +16
-11@@ -66,16 +66,7 @@ static void save_context_stack(struct st#endif } -/* -* Save stack-backtrace addresses into a stack_trace buffer. -*/ -void save_stack_trace (struct stack_trace *trace) -{ -save_stack_trace_tsk (current, trace); -} -EXPORT_SYMBOL_GPL (save_stack_trace); - -void save_stack_trace_tsk (struct task_struct *tsk,struct stack_trace *trace) +static void __save_stack_trace_tsk (struct task_struct *tsk,struct stack_trace *trace,bool savesched) {struct pt_regs dummyregs;struct pt_regs *regs = &dummyregs;@@ -88,6 +79,20 @@ void save_stack_trace_tsk(struct task_st regs->cp0_epc = tsk->thread.reg31; }else prepare_frametrace (regs); -save_context_stack (trace, tsk, regs, tsk == current); +save_context_stack (trace, tsk, regs, savesched); +} + +/* +* Save stack-backtrace addresses into a stack_trace buffer. +*/ +void save_stack_trace (struct stack_trace *trace) +{ +__save_stack_trace_tsk (current, trace, true); +} +EXPORT_SYMBOL_GPL (save_stack_trace); + +void save_stack_trace_tsk (struct task_struct *tsk,struct stack_trace *trace) +{ +__save_stack_trace_tsk (tsk, trace, false); }EXPORT_SYMBOL_GPL (save_stack_trace_tsk);arch/nds32/kernel/stacktrace.c +2
-10@@ -6,25 +6,16 @@#include <linux/stacktrace.h> #include <linux/ftrace.h> -void save_stack_trace (struct stack_trace *trace) -{ -save_stack_trace_tsk (current, trace); -} -EXPORT_SYMBOL_GPL (save_stack_trace); - -void save_stack_trace_tsk (struct task_struct *tsk,struct stack_trace *trace) +static void __save_stack_trace_tsk (struct task_struct *tsk,struct stack_trace *trace,bool savesched) {unsigned long *fpn;int skip = trace->skip; -int savesched;int graph_idx =0 ;if (tsk == current) { __asm__ __volatile__("\tori\t%0, $fp, #0\n" :"=r" (fpn)); - savesched =1 ; }else { fpn = (unsigned long *)thread_saved_fp (tsk); - savesched =0 ; } while (!kstack_end(fpn) && !((unsigned long)fpn & 0x3)@@ -50,4 +41,14 @@ void save_stack_trace_tsk(struct task_st fpn = (unsigned long *)fpp; } } +void save_stack_trace (struct stack_trace *trace)
arch/nds32/kernel/stacktrace.c void save_stack_trace_tsk(struct task_st · line 54
Quoted 10 lines
arch/nds32/kernel/stacktrace.c +9
-0+{ +__save_stack_trace_tsk (current, trace, true); +} +EXPORT_SYMBOL_GPL (save_stack_trace); + +void save_stack_trace_tsk (struct task_struct *tsk,struct stack_trace *trace) +{ +__save_stack_trace_tsk (tsk, trace, false); +}EXPORT_SYMBOL_GPL (save_stack_trace_tsk);
--
Best Regards
Guo Ren
Russell King (Oracle)
maintainerQuoted 14 lines · Peter Zijlstra
Hi,
This fixes up wchan which is various degrees of broken across the architectures.
Patch 4 fixes wchan for x86, which has been returning 0 for the past many releases.
Patch 5 fixes the fundamental race against scheduling.
Patch 6 deletes a lot and makes STACKTRACE unconditional
patch 7 fixes up a few STACKTRACE arch oddities
Quoted 7 lines
0day says all builds are good, so it must be perfect :-) I'm planning on queueing up at least the first 5 patches, but I'm hoping the last two patches can be too.
Also available here:
git://git.kernel.org/pub/scm/linux/kernel/git/peterz/queue.gitsched/wchan
These patches introduce a regression on ARM. Whereas before, I have /proc/*/wchan populated with non-zero values, with these patches they _all_ contain "0":
root@clearfog21:~# cat /proc/*/wchan 0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000root@clearfog21:~#
I'll try to investigate what is going on later today.
Signature · 2 lines
RMK's Patch system: https://www.armlinux.org.uk/developer/patches/ FTTP is here! 40Mbps down 10Mbps up. Decent connectivity at last!
Russell King (Oracle)
maintainerQuoted 23 lines · Russell King (Oracle)
Quoted 14 lines · Peter Zijlstra
Hi,
This fixes up wchan which is various degrees of broken across the architectures.
Patch 4 fixes wchan for x86, which has been returning 0 for the past many releases.
Patch 5 fixes the fundamental race against scheduling.
Patch 6 deletes a lot and makes STACKTRACE unconditional
patch 7 fixes up a few STACKTRACE arch oddities
Quoted 7 lines
0day says all builds are good, so it must be perfect :-) I'm planning on queueing up at least the first 5 patches, but I'm hoping the last two patches can be too.
Also available here:
git://git.kernel.org/pub/scm/linux/kernel/git/peterz/queue.gitsched/wchan
Quoted 8 lines
These patches introduce a regression on ARM. Whereas before, I have
/proc/*/wchanpopulated with non-zero values, with these patches they _all_ contain "0":root@clearfog21:~# cat /proc/*/wchan 0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000root@clearfog21:~#I'll try to investigate what is going on later today.
What is going on here is that the ARM stacktrace code refuses to trace non-current tasks in a SMP environment due to the racy nature of doing so if the non-current tasks are running.
When walking the stack with frame pointers, we:
- validate that the frame pointer is between the stack pointer and the top of stack defined by that stack pointer.
- we then load the next stack pointer and next frame pointer from the stack.
The reason this is unsafe when the task is not blocked is the stack can change at any moment, which can cause the value read as a stack pointer to be wildly different. If the read frame pointer value is roughly in agreement, we can end up reading any part of memory, which would be an information leak.
The table based unwinding is much more complex being essentially a set of instructions to the unwinder code about which values to read from the stack into a set of pseudo-registers, corrections to the stack pointer, or transfers from the pseudo-registers. I haven't analysed this code enough to really know the implications of what could be possible if the values on the stack change while this code is running on another CPU (it's not my code!) There is an attempt to bounds-limit the virtual stack pointer after each unwind instruction is processed to catch the unwinder doing anything silly, so it may be safe in so far as it will fail should it encounter anything "stupid".
However, get_wchan() is a different case; we know for certain that the task is blocked, so it won't be running on another CPU, and with your patch 4, we have this guarantee. However, that is not true of all callers to the stacktracing code, so I don't see how we can sanely switch to using the stacktracing code for this.
Signature · 2 lines
RMK's Patch system: https://www.armlinux.org.uk/developer/patches/ FTTP is here! 40Mbps down 10Mbps up. Decent connectivity at last!
Quoted 11 lines · Russell King (Oracle)
What is going on here is that the ARM stacktrace code refuses to trace non-current tasks in a SMP environment due to the racy nature of doing so if the non-current tasks are running.
When walking the stack with frame pointers, we:
- validate that the frame pointer is between the stack pointer and the top of stack defined by that stack pointer.
- we then load the next stack pointer and next frame pointer from the stack.
Quoted 5 lines
The reason this is unsafe when the task is not blocked is the stack can change at any moment, which can cause the value read as a stack pointer to be wildly different. If the read frame pointer value is roughly in agreement, we can end up reading any part of memory, which would be an information leak.
It would be a good idea to add some guardrails to prevent that regardless. If there's stack corruption for any reason, the unwinder shouldn't make things worse.
On x86 the unwinder relies on the caller to ensure the task is blocked (or current). If the caller doesn't do that, they might get garbage, and they get to keep the pieces.
But an important part of that is that the unwinder has guardrails to ensure it handles stack corruption gracefully by never accessing out of bounds of the stack.
When multiple stacks are involved in a kernel execution path (task, irq, exception, etc), the stacks link to each other (e.g., last word on the irq stack might point to the task stack). Also the irq/exception stack addresses are stored in percpu variables, and the task stack is in the task struct. So the unwinder can easily make sure it's in-bounds. See get_stack_info() in arch/x86/kernel/dumpstack_64.c.
Signature · 1 line
Josh