]> git.ipfire.org Git - thirdparty/linux.git/commit - fs/io_uring.c
io_uring: use cond_resched() in io_ring_ctx_wait_and_kill()
authorXiaoguang Wang <xiaoguang.wang@linux.alibaba.com>
Fri, 1 May 2020 00:52:56 +0000 (08:52 +0800)
committerJens Axboe <axboe@kernel.dk>
Fri, 1 May 2020 04:24:27 +0000 (22:24 -0600)
commit3fd44c86711f71156b586c22b0495c58f69358bb
treef68fdffa820b90785254cabbebee9c8f0563dbac
parentdd461af65946de060bff2dab08a63676d2731afe
io_uring: use cond_resched() in io_ring_ctx_wait_and_kill()

While working on to make io_uring sqpoll mode support syscalls that need
struct files_struct, I got cpu soft lockup in io_ring_ctx_wait_and_kill(),

    while (ctx->sqo_thread && !wq_has_sleeper(&ctx->sqo_wait))
        cpu_relax();

above loop never has an chance to exit, it's because preempt isn't enabled
in the kernel, and the context calling io_ring_ctx_wait_and_kill() and
io_sq_thread() run in the same cpu, if io_sq_thread calls a cond_resched()
yield cpu and another context enters above loop, then io_sq_thread() will
always in runqueue and never exit.

Use cond_resched() can fix this issue.

Reported-by: syzbot+66243bb7126c410cefe6@syzkaller.appspotmail.com
Signed-off-by: Xiaoguang Wang <xiaoguang.wang@linux.alibaba.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
fs/io_uring.c