exit: Move preemption fixup up, move blocking operations down
PATCH 1/1 exit: Move preemption fixup up, move blocking operations down
With CONFIG_DEBUG_ATOMIC_SLEEP=y and CONFIG_CGROUPS=y, kernel oopses in non-preemptible context look untidy; after the main oops, the kernel prints a "sleeping function called from invalid context" report because exit_signals() -> cgroup_threadgroup_change_begin() -> percpu_down_read() can sleep, and that happens before the preempt_count_set(PREEMPT_ENABLED) fixup.
It looks like the same thing applies to profile_task_exit() and kcov_task_exit().
Fix it by moving the preemption fixup up and the calls to profile_task_exit() and kcov_task_exit() down.
---
As so often, I have no idea which tree this should go through. tip? mm?
kernel/exit.c | 26 +++++++++++++++++--------- 1 file changed, 17 insertions(+), 9 deletions(-)
kernel/exit.c +17 -9
@@ -713,8 +713,12 @@ void __noreturn do_exit(long code)struct task_struct *tsk = current;int group_dead; -profile_task_exit (tsk); -kcov_task_exit (tsk); +/* +* We can get here from a kernel oops, sometimes with preemption off. +* Start by checking for critical errors. +* Then fix up important state like USER_DS and preemption. +* Then do everything else. +*/ WARN_ON (blk_needs_flush_plug (tsk));
@@ -732,6 +736,17 @@ void __noreturn do_exit(long code)*/ set_fs (USER_DS ); +if (unlikely (in_atomic ())) { +pr_info ("note: %s[%d] exited with preempt_count %d\n" , + current->comm,task_pid_nr (current), +preempt_count ()); +preempt_count_set (PREEMPT_ENABLED ); + } + +profile_task_exit (tsk); +kcov_task_exit (tsk); + +ptrace_event (PTRACE_EVENT_EXIT , code);validate_creds_for_do_exit (tsk);
@@ -749,13 +764,6 @@ void __noreturn do_exit(long code)exit_signals (tsk);/* sets PF_EXITING */ -if (unlikely (in_atomic ())) { -pr_info ("note: %s[%d] exited with preempt_count %d\n" , - current->comm,task_pid_nr (current), -preempt_count ()); -preempt_count_set (PREEMPT_ENABLED ); - } -/* sync mm's RSS info before statistics gathering */ if (tsk->mm)sync_mm_rss (tsk->mm);
base-commit: 9f65ed5fe41ce08ed1cb1f6a950f9ec694c142ad
Signature · 1 line
2.25.0.265.gbab2e86ba0-goog
Quoted 46 lines · Jann Horn
With
CONFIG_DEBUG_ATOMIC_SLEEP=yandCONFIG_CGROUPS=y, kernel oopses in non-preemptible context look untidy; after the main oops, the kernel prints a "sleeping function called from invalid context" report becauseexit_signals()->cgroup_threadgroup_change_begin()->percpu_down_read()can sleep, and that happens before thepreempt_count_set(PREEMPT_ENABLED)fixup.It looks like the same thing applies to
profile_task_exit()andkcov_task_exit().Fix it by moving the preemption fixup up and the calls to
profile_task_exit()andkcov_task_exit()down.Fixes 1dc0fffc48af ("sched/core: Robustify preemption leak checks")Signed-off-by Jann Horn <[email protected]>---
As so often, I have no idea which tree this should go through. tip? mm?kernel/exit.c | 26 +++++++++++++++++--------- 1 file changed, 17 insertions(+), 9 deletions(-)kernel/exit.c +8
-2@@ -713,8 +713,12 @@ void __noreturn do_exit(long code)struct task_struct *tsk = current;int group_dead; -profile_task_exit (tsk); -kcov_task_exit (tsk); +/* +* We can get here from a kernel oops, sometimes with preemption off. +* Start by checking for critical errors. +* Then fix up important state like USER_DS and preemption. +* Then do everything else. +*/ WARN_ON (blk_needs_flush_plug (tsk));@@ -732,6 +736,17 @@ void __noreturn do_exit(long code)*/ set_fs (USER_DS ); +if (unlikely (in_atomic ())) { + pr_info("note: %s[%d] exited with preempt_count %d\n",
kernel/exit.c void __noreturn do_exit(long code) · line 750
Quoted 10 lines
kernel/exit.c +9
-0+ current->comm,task_pid_nr (current), + preempt_count()); +preempt_count_set (PREEMPT_ENABLED ); + } + +profile_task_exit (tsk); +kcov_task_exit (tsk); + +ptrace_event (PTRACE_EVENT_EXIT , code);
Ugh, I don't know where that extra whitespace comes from... I'll resend.