From: Mark Rutland <mark.rutland@arm.com>
To: Valentin Schneider <valentin.schneider@arm.com>
Cc: linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org, catalin.marinas@arm.com,
dvyukov@google.com, peterz@infradead.org,
quic_qiancai@quicinc.com, will@kernel.org, woodylin@google.com
Subject: Re: [PATCH] Reset task stack state in bringup_cpu()
Date: Mon, 15 Nov 2021 14:09:27 +0000 [thread overview]
Message-ID: <YZJqF83s8LrV7Zei@FVFF77S0Q05N.cambridge.arm.com> (raw)
In-Reply-To: <87pmr1r4vl.mognet@arm.com>
On Mon, Nov 15, 2021 at 12:16:14PM +0000, Valentin Schneider wrote:
>
> Hi Mark,
>
> Thanks for tackling this and glueing the pieces back together. LGTM, though
> I couldn't stop myself from playing changelog police - I also have a
> question/comment wrt the BP.
I'll go fix the various typos for v2; replies to the more substantial comments
below.
> On 15/11/21 11:33, Mark Rutland wrote:
> > To hot unplug a CPU, the idle task on that CPU calls a few layers of C
> > code before finally leaving the kernel. When KASAN is in use, poisoned
> > shadow is left around for each of the active stack frames, and when
> > shadow call stacks are in use. When shadow call stacks are in use the
> > task's SCS SP is left pointing at an arbitrary point within the task's
> > shadow call stack.
> > Fix both of these consistently and more robustly by resetting the SCS SP
> > and KASAN shadow immediately before we online a CPU.
> Reviewed-by: Valentin Schneider <valentin.schneider@arm.com>
Thanks!
> > diff --git a/kernel/sched/core.c b/kernel/sched/core.c
> > index 3c9b0fda64ac..76f9deeaa942 100644
> > --- a/kernel/sched/core.c
> > +++ b/kernel/sched/core.c
> > @@ -8619,9 +8619,6 @@ void __init init_idle(struct task_struct *idle, int cpu)
> > idle->flags |= PF_IDLE | PF_KTHREAD | PF_NO_SETAFFINITY;
> > kthread_set_per_cpu(idle, cpu);
> >
> > - scs_task_reset(idle);
> > - kasan_unpoison_task_stack(idle);
> > -
>
> So those are no longer invoked for the BP during bootup (via sched_init());
> that looks OK for KASAN per:
>
> e1b77c92981a ("sched/kasan: remove stale KASAN poison after hotplug")
>
> I didn't find any explicit commit for SCS but from the looks of
> arm64/include/asm/thread_info.h we seem to be initializing things
> correctly, so IIUC the removed hunk wasn't actually necessary for the BP's
> first boot.
Correct. For the init task:
* The KASAN shadow starts out empty, and there's no poison to remove.
* The saved SCS SP is initialized statically as part of INIT_THREAD_INFO(), via
INIT_SCS().
... so that requires no special care.
For every task created thereafter (including idle threads):
* dup_task_struct() allocates the new task's stack via
alloc_thread_stack_node(), which either explicitly removes KASAN poison from
the shadow of a cached stack, or acquires a stack via __vmalloc_node_range(),
whose shadow starts out empty.
* dup_task_struct() calls scs_prepare() which allocates the task's shadow stack
and initializes the SCS SP for the task.
The idle threads get created via fork_idle(), which calls copy_process() (and
therefore dup_task_struct) to allocate the idle thread, then calls init_idle()
on the result.
Thanks
Mark.
next prev parent reply other threads:[~2021-11-15 14:10 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-11-15 11:33 Mark Rutland
2021-11-15 12:16 ` Valentin Schneider
2021-11-15 14:09 ` Mark Rutland [this message]
2021-11-15 18:16 ` Mark Rutland
2021-11-16 16:31 ` Qian Cai
2021-11-17 11:52 ` Mark Rutland
2021-11-17 23:39 ` Qian Cai
2023-03-11 10:52 ` David Woodhouse
2023-03-11 20:29 ` Johannes Berg
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=YZJqF83s8LrV7Zei@FVFF77S0Q05N.cambridge.arm.com \
--to=mark.rutland@arm.com \
--cc=catalin.marinas@arm.com \
--cc=dvyukov@google.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=peterz@infradead.org \
--cc=quic_qiancai@quicinc.com \
--cc=valentin.schneider@arm.com \
--cc=will@kernel.org \
--cc=woodylin@google.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®