diff options
| author |   Pavel Begunkov <asml.silence@gmail.com> | 2019-12-30 21:24:44 +0300 |
|---|---|---|
| committer |   Jens Axboe <axboe@kernel.dk> | 2020-01-20 17:04:02 -0700 |
| commit | 9ef4f124894b7b9241a3cf5f9b40db0812783d66 (patch) | |
| tree | ccba047a1b7d6ac914928ad170f469ae88a6aa18 /fs/io_uring.c | |
| parent | io_uring: add support for IORING_SETUP_CLAMP (diff) | |
| download | linux-dev-9ef4f124894b7b9241a3cf5f9b40db0812783d66.tar.xz linux-dev-9ef4f124894b7b9241a3cf5f9b40db0812783d66.zip | |
io_uring: clamp to_submit in io_submit_sqes()
Make io_submit_sqes() to clamp @to_submit itself. It removes duplicated
code and prepares for following changes.
Signed-off-by: Pavel Begunkov <asml.silence@gmail.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to '')
| -rw-r--r-- | fs/io_uring.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/io_uring.c b/fs/io_uring.c index 7c44b0ef10d7..497ed610e8b2 100644 --- a/fs/io_uring.c +++ b/fs/io_uring.c @@ -4577,6 +4577,8 @@ static int io_submit_sqes(struct io_ring_ctx *ctx, unsigned int nr, return -EBUSY; } + nr = min(nr, ctx->sq_entries); + if (!percpu_ref_tryget_many(&ctx->refs, nr)) return -EAGAIN; @@ -4751,7 +4753,6 @@ static int io_sq_thread(void *data) ctx->rings->sq_flags &= ~IORING_SQ_NEED_WAKEUP; } - to_submit = min(to_submit, ctx->sq_entries); mutex_lock(&ctx->uring_lock); ret = io_submit_sqes(ctx, to_submit, NULL, -1, &cur_mm, true); mutex_unlock(&ctx->uring_lock); @@ -6100,7 +6101,6 @@ SYSCALL_DEFINE6(io_uring_enter, unsigned int, fd, u32, to_submit, goto out; } - to_submit = min(to_submit, ctx->sq_entries); mutex_lock(&ctx->uring_lock); /* already have mm, so io_submit_sqes() won't try to grab it */ cur_mm = ctx->sqo_mm; |