diff options
| author | Jens Axboe <axboe@kernel.dk> | 2021-12-03 03:40:15 +0100 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2021-12-03 14:27:32 +0100 |
| commit | a226abcd5d427fe9d42efc442818a4a1821e2664 (patch) | |
| tree | 4b7dc3c924b915a60e7300d0b4d305a8c2e84086 | |
| parent | io_uring: Fix undefined-behaviour in io_issue_sqe (diff) | |
| download | linux-a226abcd5d427fe9d42efc442818a4a1821e2664.tar.xz linux-a226abcd5d427fe9d42efc442818a4a1821e2664.zip | |
io-wq: don't retry task_work creation failure on fatal conditions
We don't want to be retrying task_work creation failure if there's
an actual signal pending for the parent task. If we do, then we can
enter an infinite loop of perpetually retrying and each retry failing
with -ERESTARTNOINTR because a signal is pending.
Fixes: 3146cba99aa2 ("io-wq: make worker creation resilient against signals")
Reported-by: Florian Fischer <florian.fl.fischer@fau.de>
Link: https://lore.kernel.org/io-uring/20211202165606.mqryio4yzubl7ms5@pasture/
Tested-by: Florian Fischer <florian.fl.fischer@fau.de>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
| -rw-r--r-- | fs/io-wq.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/fs/io-wq.c b/fs/io-wq.c index 88202de519f6..50cf9f92da36 100644 --- a/fs/io-wq.c +++ b/fs/io-wq.c @@ -714,6 +714,13 @@ static bool io_wq_work_match_all(struct io_wq_work *work, void *data) static inline bool io_should_retry_thread(long err) { + /* + * Prevent perpetual task_work retry, if the task (or its group) is + * exiting. + */ + if (fatal_signal_pending(current)) + return false; + switch (err) { case -EAGAIN: case -ERESTARTSYS: |