public inbox for [email protected]
 help / color / mirror / Atom feed
From: Jens Axboe <[email protected]>
To: [email protected]
Cc: Jens Axboe <[email protected]>
Subject: [PATCH 07/11] io_uring: add buffer selection support to IORING_OP_NOP
Date: Fri, 29 Apr 2022 11:56:31 -0600	[thread overview]
Message-ID: <[email protected]> (raw)
In-Reply-To: <[email protected]>

Obviously not really useful since it's not transferring data, but it
is helpful in benchmarking overhead of provided buffers.

Signed-off-by: Jens Axboe <[email protected]>
---
 fs/io_uring.c | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/fs/io_uring.c b/fs/io_uring.c
index 4bd2f4d868c2..d4004c3a88a1 100644
--- a/fs/io_uring.c
+++ b/fs/io_uring.c
@@ -1052,7 +1052,9 @@ struct io_op_def {
 };
 
 static const struct io_op_def io_op_defs[] = {
-	[IORING_OP_NOP] = {},
+	[IORING_OP_NOP] = {
+		.buffer_select		= 1,
+	},
 	[IORING_OP_READV] = {
 		.needs_file		= 1,
 		.unbound_nonreg_file	= 1,
@@ -4905,11 +4907,20 @@ static int io_splice(struct io_kiocb *req, unsigned int issue_flags)
 static int io_nop(struct io_kiocb *req, unsigned int issue_flags)
 {
 	struct io_ring_ctx *ctx = req->ctx;
+	void __user *buf;
 
 	if (unlikely(ctx->flags & IORING_SETUP_IOPOLL))
 		return -EINVAL;
 
-	__io_req_complete(req, issue_flags, 0, 0);
+	if (req->flags & REQ_F_BUFFER_SELECT) {
+		size_t len = 1;
+
+		buf = io_buffer_select(req, &len, issue_flags);
+		if (IS_ERR(buf))
+			return PTR_ERR(buf);
+	}
+
+	__io_req_complete(req, issue_flags, 0, io_put_kbuf(req, issue_flags));
 	return 0;
 }
 
-- 
2.35.1


  parent reply	other threads:[~2022-04-29 17:56 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-04-29 17:56 [PATCHSET v2 RFC 0/11] Add support for ring mapped provided buffers Jens Axboe
2022-04-29 17:56 ` [PATCH 01/11] io_uring: kill io_recv_buffer_select() wrapper Jens Axboe
2022-04-29 17:56 ` [PATCH 02/11] io_uring: make io_buffer_select() return the user address directly Jens Axboe
2022-04-29 17:56 ` [PATCH 03/11] io_uring: kill io_rw_buffer_select() wrapper Jens Axboe
2022-04-29 17:56 ` [PATCH 04/11] io_uring: ignore ->buf_index if REQ_F_BUFFER_SELECT isn't set Jens Axboe
2022-04-29 17:56 ` [PATCH 05/11] io_uring: always use req->buf_index for the provided buffer group Jens Axboe
2022-04-29 17:56 ` [PATCH 06/11] io_uring: cache last io_buffer_list lookup Jens Axboe
2022-04-29 17:56 ` Jens Axboe [this message]
2022-04-29 17:56 ` [PATCH 08/11] io_uring: add io_pin_pages() helper Jens Axboe
2022-04-29 17:56 ` [PATCH 09/11] io_uring: abstract out provided buffer list selection Jens Axboe
2022-04-29 17:56 ` [PATCH 10/11] io_uring: relocate io_buffer_get_list() Jens Axboe
2022-04-29 17:56 ` [PATCH 11/11] io_uring: add support for ring mapped supplied buffers Jens Axboe
2022-05-01 13:14 ` [PATCHSET v2 RFC 0/11] Add support for ring mapped provided buffers Pavel Begunkov
2022-05-01 13:28   ` Jens Axboe
2022-05-01 13:39     ` Pavel Begunkov
2022-05-01 14:25       ` Jens Axboe
2022-05-01 15:00         ` 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 \
    [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