diff options
| author |   Pavel Begunkov <asml.silence@gmail.com> | 2021-03-10 13:13:53 +0000 |
|---|---|---|
| committer |   Jens Axboe <axboe@kernel.dk> | 2021-03-10 07:29:59 -0700 |
| commit | 78d7f6ba82edb7f8763390982be29051c4216772 (patch) | |
| tree | d51954e554ee3f20efe5f3471896c24370ddd327 /fs | |
| parent | kernel: make IO threads unfreezable by default (diff) | |
| download | linux-dev-78d7f6ba82edb7f8763390982be29051c4216772.tar.xz linux-dev-78d7f6ba82edb7f8763390982be29051c4216772.zip | |
io_uring: fix invalid ctx->sq_thread_idle
We have to set ctx->sq_thread_idle before adding a ring to an SQ task,
otherwise sqd races for seeing zero and accounting it as such.
Signed-off-by: Pavel Begunkov <asml.silence@gmail.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/io_uring.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/io_uring.c b/fs/io_uring.c index 14165e18020c..7072c0eb22c1 100644 --- a/fs/io_uring.c +++ b/fs/io_uring.c @@ -7829,14 +7829,14 @@ static int io_sq_offload_create(struct io_ring_ctx *ctx, ctx->sq_creds = get_current_cred(); ctx->sq_data = sqd; - io_sq_thread_park(sqd); - list_add(&ctx->sqd_list, &sqd->ctx_new_list); - io_sq_thread_unpark(sqd); - ctx->sq_thread_idle = msecs_to_jiffies(p->sq_thread_idle); if (!ctx->sq_thread_idle) ctx->sq_thread_idle = HZ; + io_sq_thread_park(sqd); + list_add(&ctx->sqd_list, &sqd->ctx_new_list); + io_sq_thread_unpark(sqd); + if (sqd->thread) return 0; |