public inbox for [email protected]
 help / color / mirror / Atom feed
From: Jens Axboe <[email protected]>
To: Dylan Yudaken <[email protected]>,
	"[email protected]" <[email protected]>,
	"[email protected]" <[email protected]>
Subject: Re: [PATCH 5.19 2/3] Revert "io_uring: add buffer selection support to IORING_OP_NOP"
Date: Tue, 14 Jun 2022 12:26:39 -0600	[thread overview]
Message-ID: <[email protected]> (raw)
In-Reply-To: <[email protected]>

On 6/14/22 12:21 PM, Dylan Yudaken wrote:
> On Tue, 2022-06-14 at 17:51 +0100, Pavel Begunkov wrote:
>> This reverts commit 3d200242a6c968af321913b635fc4014b238cba4.
>>
>> Buffer selection with nops was used for debugging and benchmarking
>> but
>> is useless in real life. Let's revert it before it's released.
>>
>> Signed-off-by: Pavel Begunkov <[email protected]>
>> ---
>>  fs/io_uring.c | 15 +--------------
>>  1 file changed, 1 insertion(+), 14 deletions(-)
>>
>> diff --git a/fs/io_uring.c b/fs/io_uring.c
>> index bf556f77d4ab..1b95c6750a81 100644
>> --- a/fs/io_uring.c
>> +++ b/fs/io_uring.c
>> @@ -1114,7 +1114,6 @@ static const struct io_op_def io_op_defs[] = {
>>         [IORING_OP_NOP] = {
>>                 .audit_skip             = 1,
>>                 .iopoll                 = 1,
>> -               .buffer_select          = 1,
>>         },
>>         [IORING_OP_READV] = {
>>                 .needs_file             = 1,
>> @@ -5269,19 +5268,7 @@ static int io_nop_prep(struct io_kiocb *req,
>> const struct io_uring_sqe *sqe)
>>   */
>>  static int io_nop(struct io_kiocb *req, unsigned int issue_flags)
>>  {
>> -       unsigned int cflags;
>> -       void __user *buf;
>> -
>> -       if (req->flags & REQ_F_BUFFER_SELECT) {
>> -               size_t len = 1;
>> -
>> -               buf = io_buffer_select(req, &len, issue_flags);
>> -               if (!buf)
>> -                       return -ENOBUFS;
>> -       }
>> -
>> -       cflags = io_put_kbuf(req, issue_flags);
>> -       __io_req_complete(req, issue_flags, 0, cflags);
>> +       __io_req_complete(req, issue_flags, 0, 0);
>>         return 0;
>>  }
>>  
> 
> The liburing test case I added in "buf-ring: add tests that cycle
> through the provided buffer ring" relies on this.

Good point.

> I don't mind either way if this is kept or that liburing patch is
> reverted, but it should be consistent. What do you think?

It was useful for benchmarking as well, but it'd be a trivial patch to
do for targeted testing.

I'm fine with killing it, but can also be persuaded not to ;-)

-- 
Jens Axboe


  reply	other threads:[~2022-06-14 18:26 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-06-14 16:51 [PATCH 5.19 0/3] 5.19 reverts Pavel Begunkov
2022-06-14 16:51 ` [PATCH 5.19 1/3] Revert "io_uring: support CQE32 for nop operation" Pavel Begunkov
2022-06-14 16:51 ` [PATCH 5.19 2/3] Revert "io_uring: add buffer selection support to IORING_OP_NOP" Pavel Begunkov
2022-06-14 18:21   ` Dylan Yudaken
2022-06-14 18:26     ` Jens Axboe [this message]
2022-06-15  7:33       ` Dylan Yudaken
2022-06-15 10:08         ` Pavel Begunkov
2022-06-14 16:51 ` [PATCH 5.19 3/3] io_uring: remove IORING_CLOSE_FD_AND_FILE_SLOT Pavel Begunkov
2022-06-14 17:02 ` [PATCH 5.19 0/3] 5.19 reverts 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] \
    [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