| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <CAJF2gTRTbOjqfNcm16E_XCtBSxTiUyczsWYR9uy6ZYqSuR41Pg@mail.gmail.com>
Date: Sat, 9 Oct 2021 17:36:19 +0800
From: Guo Ren <guoren@...nel.org>
To: Peter Zijlstra <peterz@...radead.org>
Cc: Kees Cook <keescook@...omium.org>, Jann Horn <jannh@...gle.com>,
Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
vcaputo@...garu.com, Ingo Molnar <mingo@...hat.com>,
Juri Lelli <juri.lelli@...hat.com>,
Vincent Guittot <vincent.guittot@...aro.org>,
Dietmar Eggemann <dietmar.eggemann@....com>,
Steven Rostedt <rostedt@...dmis.org>,
Ben Segall <bsegall@...gle.com>, Mel Gorman <mgorman@...e.de>,
Daniel Bristot de Oliveira <bristot@...hat.com>,
Andrew Morton <akpm@...ux-foundation.org>,
christian.brauner@...ntu.com, amistry@...gle.com,
Kenta.Tada@...y.com, legion@...nel.org,
michael.weiss@...ec.fraunhofer.de, mhocko@...e.com,
Helge Deller <deller@....de>, zhengqi.arch@...edance.com,
me@...in.cc, tycho@...ho.pizza,
Thomas Gleixner <tglx@...utronix.de>,
Borislav Petkov <bp@...en8.de>,
"H. Peter Anvin" <hpa@...or.com>,
Mark Rutland <mark.rutland@....com>,
Jens Axboe <axboe@...nel.dk>, metze@...ba.org,
laijs@...ux.alibaba.com, Andy Lutomirski <luto@...nel.org>,
Dave Hansen <dave.hansen@...ux.intel.com>,
"Eric W. Biederman" <ebiederm@...ssion.com>,
ohoono.kwon@...sung.com, kaleshsingh@...gle.com,
yifeifz2@...inois.edu, jpoimboe@...hat.com,
linux-hardening@...r.kernel.org,
linux-arch <linux-arch@...r.kernel.org>, vgupta@...nel.org,
Russell King <linux@...linux.org.uk>,
Will Deacon <will@...nel.org>,
Brian Cain <bcain@...eaurora.org>,
Michal Simek <monstr@...str.eu>,
Thomas Bogendoerfer <tsbogend@...ha.franken.de>,
Nick Hu <nickhu@...estech.com>,
Jonas Bonn <jonas@...thpole.se>,
Michael Ellerman <mpe@...erman.id.au>,
Paul Walmsley <paul.walmsley@...ive.com>,
Heiko Carstens <hca@...ux.ibm.com>,
Yoshinori Sato <ysato@...rs.sourceforge.jp>,
David Miller <davem@...emloft.net>,
Chris Zankel <chris@...kel.net>
Subject: Re: [PATCH 7/7] arch: Fix STACKTRACE_SUPPORT
Thx Peter,
On Fri, Oct 8, 2021 at 7:18 PM Peter Zijlstra <peterz@...radead.org> wrote:
>
> A few archs got save_stack_trace_tsk() vs in_sched_functions() wrong.
>
> Signed-off-by: Peter Zijlstra (Intel) <peterz@...radead.org>
> ---
> 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(-)
>
> --- a/arch/csky/kernel/stacktrace.c
> +++ b/arch/csky/kernel/stacktrace.c
> @@ -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);
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.)
>
> --- a/arch/mips/kernel/stacktrace.c
> +++ b/arch/mips/kernel/stacktrace.c
> @@ -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);
> --- a/arch/nds32/kernel/stacktrace.c
> +++ b/arch/nds32/kernel/stacktrace.c
> @@ -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);
>
>
--
Best Regards
Guo Ren
ML: https://lore.kernel.org/linux-csky/
Powered by blists - more mailing lists