diff options
| author | Jens Axboe <[email protected]> | 2021-09-27 10:04:10 -0600 |
|---|---|---|
| committer | Jens Axboe <[email protected]> | 2021-09-27 11:03:43 -0600 |
| commit | 78f8876c2d9f6fdeb9ff62ed1911505156cd7b3d (patch) | |
| tree | 48df289241a4c4c339cb74be7cd6cfa75679d650 | |
| parent | 7df778be2f61e1a23002d1f2f5d6aaf702771eb8 (diff) | |
io-wq: exclusively gate signal based exit on get_signal() return
io-wq threads block all signals, except SIGKILL and SIGSTOP. We should not
need any extra checking of signal_pending or fatal_signal_pending, rely
exclusively on whether or not get_signal() tells us to exit.
The original debugging of this issue led to the false positive that we
were exiting on non-fatal signals, but that is not the case. The issue
was around races with nr_workers accounting.
Fixes: 87c169665578 ("io-wq: ensure we exit if thread group is exiting")
Fixes: 15e20db2e0ce ("io-wq: only exit on fatal signals")
Reported-by: Eric W. Biederman <[email protected]>
Reported-by: Linus Torvalds <[email protected]>
Acked-by: "Eric W. Biederman" <[email protected]>
Signed-off-by: Jens Axboe <[email protected]>
| -rw-r--r-- | fs/io-wq.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/fs/io-wq.c b/fs/io-wq.c index c2360cdc403d..5bf8aa81715e 100644 --- a/fs/io-wq.c +++ b/fs/io-wq.c @@ -584,10 +584,7 @@ loop: if (!get_signal(&ksig)) continue; - if (fatal_signal_pending(current) || - signal_group_exit(current->signal)) - break; - continue; + break; } last_timeout = !ret; } |