History

sched/scs: Reset task stack state in bringup_cpu()

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 (SCS) are in use the task's saved SCS SP is left pointing at an arbitrary point within the task's shadow call stack. When a CPU is offlined than onlined back into the kernel, this stale state can adversely affect execution. Stale KASAN shadow can alias new stackframes and result in bogus KASAN warnings. A stale SCS SP is effectively a memory leak, and prevents a portion of the shadow call stack being used. Across a number of hotplug cycles the idle task's entire shadow call stack can become unusable. We previously fixed the KASAN issue in commit: e1b77c92981a5222 ("sched/kasan: remove stale KASAN poison after hotplug") ... by removing any stale KASAN stack poison immediately prior to onlining a CPU. Subsequently in commit: f1a0a376ca0c4ef1 ("sched/core: Initialize the idle task with preemption disabled") ... the refactoring left the KASAN and SCS cleanup in one-time idle thread initialization code rather than something invoked prior to each CPU being onlined, breaking both as above. We fixed SCS (but not KASAN) in commit: 63acd42c0d4942f7 ("sched/scs: Reset the shadow stack when idle_task_exit") ... but as this runs in the context of the idle task being offlined it's potentially fragile. To fix these consistently and more robustly, reset the SCS SP and KASAN shadow of a CPU's idle task immediately before we online that CPU in bringup_cpu(). This ensures the idle task always has a consistent state when it is running, and removes the need to so so when exiting an idle task. Whenever any thread is created, dup_task_struct() will give the task a stack which is free of KASAN shadow, and initialize the task's SCS SP, so there's no need to specially initialize either for idle thread within init_idle(), as this was only necessary to handle hotplug cycles. I've tested this on arm64 with: * gcc 11.1.0, defconfig +KASAN_INLINE, KASAN_STACK * clang 12.0.0, defconfig +KASAN_INLINE, KASAN_STACK, SHADOW_CALL_STACK ... offlining and onlining CPUS with: | while true; do | for C in /sys/devices/system/cpu/cpu*/online; do | echo 0 > $C; | echo 1 > $C; | done | done

Mark Rutland committed 4 years ago

Commit dce1ca01 parent 13605722 files · +7 −4Browse files

Showing the changes to kernel/cpu.c (1 of 2 files). Show all

Unified · Split

kernel/cpu.c+7−0
@@ -31,6 +31,7 @@ · 30 unmodified lines
31#include <linux/smpboot.h>31#include <linux/smpboot.h>
32#include <linux/relay.h>32#include <linux/relay.h>
33#include <linux/slab.h>33#include <linux/slab.h>
34#include <linux/scs.h>
34#include <linux/percpu-rwsem.h>35#include <linux/percpu-rwsem.h>
35#include <linux/cpuset.h>36#include <linux/cpuset.h>
36 37
@@ -587,6 +588,12 @@ static int bringup_cpu(unsigned int cpu) · 550 unmodified lines
587 struct task_struct *idle = idle_thread_get(cpu);588 struct task_struct *idle = idle_thread_get(cpu);
588 int ret;589 int ret;
589 590
591 /*
592 * Reset stale stack state from the last time this CPU was online.
593 */
594 scs_task_reset(idle);
595 kasan_unpoison_task_stack(idle);
596
590 /*597 /*
591 * Some architectures have to walk the irq descriptors to598 * Some architectures have to walk the irq descriptors to
592 * setup the vector space for the cpu which comes online.599 * setup the vector space for the cpu which comes online.

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t