diff options
| author | Pavel Begunkov <asml.silence@gmail.com> | 2021-11-08 15:10:03 +0000 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-11-18 19:16:03 +0100 |
| commit | 4cac487a4730e4b8e4a106a3258660d49a239fa1 (patch) | |
| tree | c2795aaaa8b418e11681ef2dddd579cf2ddd18c2 /fs/io_uring.c | |
| parent | e1bb995036c7611177e4d7ac5e932e0fca06cf88 (diff) | |
| download | linux-stable-4cac487a4730e4b8e4a106a3258660d49a239fa1.tar.gz linux-stable-4cac487a4730e4b8e4a106a3258660d49a239fa1.tar.bz2 linux-stable-4cac487a4730e4b8e4a106a3258660d49a239fa1.zip | |
io_uring: honour zeroes as io-wq worker limits
commit bad119b9a00019054f0c9e2045f312ed63ace4f4 upstream.
When we pass in zero as an io-wq worker number limit it shouldn't
actually change the limits but return the old value, follow that
behaviour with deferred limits setup as well.
Cc: stable@kernel.org # 5.15
Reported-by: Beld Zhang <beldzhang@gmail.com>
Fixes: e139a1ec92f8d ("io_uring: apply max_workers limit to all future users")
Signed-off-by: Pavel Begunkov <asml.silence@gmail.com>
Link: https://lore.kernel.org/r/1b222a92f7a78a24b042763805e891a4cdd4b544.1636384034.git.asml.silence@gmail.com
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'fs/io_uring.c')
| -rw-r--r-- | fs/io_uring.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/fs/io_uring.c b/fs/io_uring.c index bc18af5e0a93..365f8b350b7f 100644 --- a/fs/io_uring.c +++ b/fs/io_uring.c @@ -10684,7 +10684,9 @@ static int io_register_iowq_max_workers(struct io_ring_ctx *ctx, BUILD_BUG_ON(sizeof(new_count) != sizeof(ctx->iowq_limits)); - memcpy(ctx->iowq_limits, new_count, sizeof(new_count)); + for (i = 0; i < ARRAY_SIZE(new_count); i++) + if (new_count[i]) + ctx->iowq_limits[i] = new_count[i]; ctx->iowq_limits_set = true; ret = -EINVAL; |