Skip to content

Commit 1f29309

Browse files
committed
io_uring/io-wq: don't trigger hung task for syzbot craziness
Use the same trick that blk_io_schedule() does to avoid triggering the hung task warning (and potential reboot/panic, depending on system settings), and only wait for half the hung task timeout at the time. If we exceed the default IO_URING_EXIT_WAIT_MAX period where we expect things to certainly have finished unless there's a bug, then throw a WARN_ON_ONCE() for that case. Reported-by: syzbot+4eb282331cab6d5b6588@syzkaller.appspotmail.com Tested-by: syzbot+4eb282331cab6d5b6588@syzkaller.appspotmail.com Signed-off-by: Jens Axboe <axboe@kernel.dk>
1 parent dd120bd commit 1f29309

1 file changed

Lines changed: 21 additions & 1 deletion

File tree

io_uring/io-wq.c

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
#include <linux/task_work.h>
1818
#include <linux/audit.h>
1919
#include <linux/mmu_context.h>
20+
#include <linux/sched/sysctl.h>
2021
#include <uapi/linux/io_uring.h>
2122

2223
#include "io-wq.h"
@@ -1316,6 +1317,8 @@ static void io_wq_cancel_tw_create(struct io_wq *wq)
13161317

13171318
static void io_wq_exit_workers(struct io_wq *wq)
13181319
{
1320+
unsigned long timeout, warn_timeout;
1321+
13191322
if (!wq->task)
13201323
return;
13211324

@@ -1325,7 +1328,24 @@ static void io_wq_exit_workers(struct io_wq *wq)
13251328
io_wq_for_each_worker(wq, io_wq_worker_wake, NULL);
13261329
rcu_read_unlock();
13271330
io_worker_ref_put(wq);
1328-
wait_for_completion(&wq->worker_done);
1331+
1332+
/*
1333+
* Shut up hung task complaint, see for example
1334+
*
1335+
* https://lore.kernel.org/all/696fc9e7.a70a0220.111c58.0006.GAE@google.com/
1336+
*
1337+
* where completely overloading the system with tons of long running
1338+
* io-wq items can easily trigger the hung task timeout. Only sleep
1339+
* uninterruptibly for half that time, and warn if we exceeded end
1340+
* up waiting more than IO_URING_EXIT_WAIT_MAX.
1341+
*/
1342+
timeout = sysctl_hung_task_timeout_secs * HZ / 2;
1343+
warn_timeout = jiffies + IO_URING_EXIT_WAIT_MAX;
1344+
do {
1345+
if (wait_for_completion_timeout(&wq->worker_done, timeout))
1346+
break;
1347+
WARN_ON_ONCE(time_after(jiffies, warn_timeout));
1348+
} while (1);
13291349

13301350
spin_lock_irq(&wq->hash->wait.lock);
13311351
list_del_init(&wq->wait.entry);

0 commit comments

Comments
 (0)