Skip to content

Commit a7c01fa

Browse files
zx2c4ebiederm
authored andcommitted
signal: break out of wait loops on kthread_stop()
I was recently surprised to learn that msleep_interruptible(), wait_for_completion_interruptible_timeout(), and related functions simply hung when I called kthread_stop() on kthreads using them. The solution to fixing the case with msleep_interruptible() was more simply to move to schedule_timeout_interruptible(). Why? The reason is that msleep_interruptible(), and many functions just like it, has a loop like this: while (timeout && !signal_pending(current)) timeout = schedule_timeout_interruptible(timeout); The call to kthread_stop() woke up the thread, so schedule_timeout_ interruptible() returned early, but because signal_pending() returned true, it went back into another timeout, which was never woken up. This wait loop pattern is common to various pieces of code, and I suspect that the subtle misuse in a kthread that caused a deadlock in the code I looked at last week is also found elsewhere. So this commit causes signal_pending() to return true when kthread_stop() is called, by setting TIF_NOTIFY_SIGNAL. The same also probably applies to the similar kthread_park() functionality, but that can be addressed later, as its semantics are slightly different. Cc: Eric W. Biederman <[email protected]> Signed-off-by: Jason A. Donenfeld <[email protected]> v1: https://lkml.kernel.org/r/[email protected] v2: https://lkml.kernel.org/r/[email protected] v3: https://lkml.kernel.org/r/[email protected] v4: https://lkml.kernel.org/r/[email protected] v5: https://lkml.kernel.org/r/[email protected] Signed-off-by: Eric W. Biederman <[email protected]>
1 parent f2906aa commit a7c01fa

File tree

1 file changed

+1
-0
lines changed

1 file changed

+1
-0
lines changed

kernel/kthread.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -704,6 +704,7 @@ int kthread_stop(struct task_struct *k)
704704
kthread = to_kthread(k);
705705
set_bit(KTHREAD_SHOULD_STOP, &kthread->flags);
706706
kthread_unpark(k);
707+
set_tsk_thread_flag(k, TIF_NOTIFY_SIGNAL);
707708
wake_up_process(k);
708709
wait_for_completion(&kthread->exited);
709710
ret = kthread->result;

0 commit comments

Comments
 (0)