korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-30 23:54:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

io_uring: apply max_workers limit to all future users

Browse Source 
Currently, IORING_REGISTER_IOWQ_MAX_WORKERS applies only to the task
that issued it, it's unexpected for users. If one task creates a ring,
limits workers and then passes it to another task the limit won't be
applied to the other task.

Another pitfall is that a task should either create a ring or submit at
least one request for IORING_REGISTER_IOWQ_MAX_WORKERS to work at all,
furher complicating the picture.

Change the API, save the limits and apply to all future users. Note, it
should be done first before giving away the ring or submitting new
requests otherwise the result is not guaranteed.

Fixes: 2e480058dd ("io-wq: provide a way to limit max number of workers")
Link: https://github.com/axboe/liburing/issues/460
Reported-by: Beld Zhang <beldzhang@gmail.com>
Signed-off-by: Pavel Begunkov <asml.silence@gmail.com>
Link: https://lore.kernel.org/r/51d0bae97180e08ab722c0d5c93e7439cfb6f697.1634683237.git.asml.silence@gmail.com
Signed-off-by: Jens Axboe <axboe@kernel.dk>
This commit is contained in:
Pavel Begunkov 2021-10-19 23:43:46 +01:00 committed by Jens Axboe
parent bc369921d6
commit e139a1ec92
1 changed files with 23 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
fs/io_uring.c
View File

@ -456,6 +456,8 @@ struct io_ring_ctx {
struct work_struct exit_work; struct work_struct exit_work;
struct list_head tctx_list; struct list_head tctx_list;
struct completion ref_comp; struct completion ref_comp;
u32 iowq_limits[2];
bool iowq_limits_set;
}; };
}; };
@ -9638,7 +9640,16 @@ static int __io_uring_add_tctx_node(struct io_ring_ctx *ctx)
ret = io_uring_alloc_task_context(current, ctx); ret = io_uring_alloc_task_context(current, ctx);
if (unlikely(ret)) if (unlikely(ret))
return ret; return ret;
tctx = current->io_uring; tctx = current->io_uring;
if (ctx->iowq_limits_set) {
unsigned int limits[2] = { ctx->iowq_limits[0],
ctx->iowq_limits[1], };
ret = io_wq_max_workers(tctx->io_wq, limits);
if (ret)
return ret;
}
} }
if (!xa_load(&tctx->xa, (unsigned long)ctx)) { if (!xa_load(&tctx->xa, (unsigned long)ctx)) {
node = kmalloc(sizeof(*node), GFP_KERNEL); node = kmalloc(sizeof(*node), GFP_KERNEL);
@ -10674,13 +10685,19 @@ static int io_register_iowq_max_workers(struct io_ring_ctx *ctx,
tctx = current->io_uring; tctx = current->io_uring;
} }
ret = -EINVAL; BUILD_BUG_ON(sizeof(new_count) != sizeof(ctx->iowq_limits));
if (!tctx || !tctx->io_wq)
goto err;
ret = io_wq_max_workers(tctx->io_wq, new_count); memcpy(ctx->iowq_limits, new_count, sizeof(new_count));
if (ret) ctx->iowq_limits_set = true;
goto err;
ret = -EINVAL;
if (tctx && tctx->io_wq) {
ret = io_wq_max_workers(tctx->io_wq, new_count);
if (ret)
goto err;
} else {
memset(new_count, 0, sizeof(new_count));
}
if (sqd) { if (sqd) {
mutex_unlock(&sqd->lock); mutex_unlock(&sqd->lock);