From: Pavel Begunkov <[email protected]>
To: [email protected]
Cc: Jens Axboe <[email protected]>, [email protected]
Subject: [PATCH for-next 01/10] io_uring: make reg buf init consistent
Date: Wed, 15 Jun 2022 17:33:47 +0100 [thread overview]
Message-ID: <c5456aecf03d9627fbd6e65e100e2b5293a6151e.1655310733.git.asml.silence@gmail.com> (raw)
In-Reply-To: <[email protected]>
The default (i.e. empty) state of register buffer is dummy_ubuf, so set
it to dummy on init instead of NULL.
Signed-off-by: Pavel Begunkov <[email protected]>
---
io_uring/rsrc.c | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
diff --git a/io_uring/rsrc.c b/io_uring/rsrc.c
index fef46972c327..fd1323482030 100644
--- a/io_uring/rsrc.c
+++ b/io_uring/rsrc.c
@@ -567,7 +567,7 @@ static int __io_sqe_buffers_update(struct io_ring_ctx *ctx,
io_buffer_unmap(ctx, &imu);
break;
}
- ctx->user_bufs[i] = NULL;
+ ctx->user_bufs[i] = ctx->dummy_ubuf;
needs_switch = true;
}
@@ -1200,14 +1200,11 @@ static int io_sqe_buffer_register(struct io_ring_ctx *ctx, struct iovec *iov,
size_t size;
int ret, nr_pages, i;
- if (!iov->iov_base) {
- *pimu = ctx->dummy_ubuf;
+ *pimu = ctx->dummy_ubuf;
+ if (!iov->iov_base)
return 0;
- }
- *pimu = NULL;
ret = -ENOMEM;
-
pages = io_pin_pages((unsigned long) iov->iov_base, iov->iov_len,
&nr_pages);
if (IS_ERR(pages)) {
--
2.36.1
next prev parent reply other threads:[~2022-06-15 16:34 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-06-15 16:33 [PATCH for-next 00/10] 5.20 cleanups Pavel Begunkov
2022-06-15 16:33 ` Pavel Begunkov [this message]
2022-06-15 16:33 ` [PATCH for-next 02/10] io_uring: move defer_list to slow data Pavel Begunkov
2022-06-15 16:33 ` [PATCH for-next 03/10] io_uring: better caching for ctx timeout fields Pavel Begunkov
2022-06-15 16:33 ` [PATCH for-next 04/10] io_uring: refactor ctx slow data placement Pavel Begunkov
2022-06-15 16:33 ` [PATCH for-next 05/10] io_uring: move small helpers to headers Pavel Begunkov
2022-06-15 16:33 ` [PATCH for-next 06/10] io_uring: explain io_wq_work::cancel_seq placement Pavel Begunkov
2022-06-15 16:33 ` [PATCH for-next 07/10] io_uring: inline ->registered_rings Pavel Begunkov
2022-06-15 16:33 ` [PATCH for-next 08/10] io_uring: never defer-complete multi-apoll Pavel Begunkov
2022-06-15 16:33 ` [PATCH for-next 09/10] io_uring: remove check_cq checking from hot paths Pavel Begunkov
2022-06-15 16:33 ` [PATCH for-next 10/10] io_uring: don't set REQ_F_COMPLETE_INLINE in tw Pavel Begunkov
2022-06-15 21:30 ` [PATCH for-next 00/10] 5.20 cleanups Jens Axboe
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=c5456aecf03d9627fbd6e65e100e2b5293a6151e.1655310733.git.asml.silence@gmail.com \
[email protected] \
[email protected] \
[email protected] \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox