Skip to content

Commit 8b9a022

Browse files
committed
Merge tag 'io_uring-5.16-2021-12-03' of git://git.kernel.dk/linux-block
Pull io_uring fix from Jens Axboe: "Just a single fix preventing repeated retries of task_work based io-wq thread creation, fixing a regression from when io-wq was made more (a bit too much) resilient against signals" * tag 'io_uring-5.16-2021-12-03' of git://git.kernel.dk/linux-block: io-wq: don't retry task_work creation failure on fatal conditions
2 parents e3b8bb4 + a226abc commit 8b9a022

1 file changed

Lines changed: 7 additions & 0 deletions

File tree

fs/io-wq.c

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -714,6 +714,13 @@ static bool io_wq_work_match_all(struct io_wq_work *work, void *data)
714714

715715
static inline bool io_should_retry_thread(long err)
716716
{
717+
/*
718+
* Prevent perpetual task_work retry, if the task (or its group) is
719+
* exiting.
720+
*/
721+
if (fatal_signal_pending(current))
722+
return false;
723+
717724
switch (err) {
718725
case -EAGAIN:
719726
case -ERESTARTSYS:

0 commit comments

Comments
 (0)