public inbox for [email protected]
 help / color / mirror / Atom feed
From: Jens Axboe <[email protected]>
To: Josef <[email protected]>, [email protected]
Cc: [email protected]
Subject: Re: SQPOLL question
Date: Tue, 8 Sep 2020 11:46:23 -0600	[thread overview]
Message-ID: <[email protected]> (raw)
In-Reply-To: <CAAss7+oJF-KMRAnkjMWmW9Zd-dNnTojFOeC7LR-AoHcJDOc36Q@mail.gmail.com>

On 9/8/20 11:42 AM, Josef wrote:
>> Are you using for-5.10 and SQEPOLL + ASYNC accept? I'll give that a
>> test spin.
> 
> yes exactly
> 
>> This should do it for your testing, need to confirm this is absolutely
>> safe. But it'll make it work for the 5.10/io_uring setup of allowing
>> file open/closes.
>>
>> diff --git a/fs/io_uring.c b/fs/io_uring.c
>> index 80913973337a..e21a7a9c6a59 100644
>> --- a/fs/io_uring.c
>> +++ b/fs/io_uring.c
>> @@ -6757,7 +6757,7 @@ static enum sq_ret __io_sq_thread(struct io_ring_ctx *ctx,
>>
>>         mutex_lock(&ctx->uring_lock);
>>         if (likely(!percpu_ref_is_dying(&ctx->refs)))
>> -               ret = io_submit_sqes(ctx, to_submit, NULL, -1);
>> +               ret = io_submit_sqes(ctx, to_submit, ctx->ring_file, ctx->ring_fd);
>>         mutex_unlock(&ctx->uring_lock);
>>
>>         if (!io_sqring_full(ctx) && wq_has_sleeper(&ctx->sqo_sq_wait))
>> @@ -8966,6 +8966,11 @@ static int io_uring_create(unsigned entries, struct io_uring_params *p,
>>                 goto err;
>>         }
>>
>> +       if (p->flags & IORING_SETUP_SQPOLL) {
>> +               ctx->ring_fd = fd;
>> +               ctx->ring_file = file;
>> +       }
>> +
>>         ret = io_sq_offload_create(ctx, p);
>>         if (ret)
>>                 goto err;
>>
> 
> sorry I couldn't apply this patch, my last commit is
> https://git.kernel.org/pub/scm/linux/kernel/git/axboe/linux-block.git/commit/?h=for-5.10/io_uring&id=9c2446cffaf55da88e7a9a7c0a5aeb02a9eba2c0
> what's your last commit?
> 
> it's a small patch, so I'll try it manually :)

Oops sorry, pushed out the queue. Should apply cleanly on top of that.

-- 
Jens Axboe


      reply	other threads:[~2020-09-08 17:46 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-09-06 15:44 SQPOLL question Josef
2020-09-06 15:49 ` Jens Axboe
2020-09-06 16:24   ` Josef
2020-09-06 16:25     ` Jens Axboe
2020-09-07 10:23       ` Josef
2020-09-07 12:49         ` Jens Axboe
2020-09-07 14:58           ` Josef
2020-09-07 15:51             ` Jens Axboe
2020-09-08  6:47               ` Josef
2020-09-08 14:36                 ` Jens Axboe
2020-09-08 14:57                   ` Jens Axboe
2020-09-08 17:42                     ` Josef
2020-09-08 17:46                       ` Jens Axboe [this message]

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