2021-06-22 18:46:29

by Olivier Langlois

[permalink] [raw]
Subject: [PATCH 1/2] io_uring: Fix race condition when sqp thread goes to sleep

If an asynchronous completion happens before the task is preparing
itself to wait and set its state to TASK_INTERRUPTABLE, the completion
will not wake up the sqp thread.

Signed-off-by: Olivier Langlois <[email protected]>
---
fs/io_uring.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fs/io_uring.c b/fs/io_uring.c
index fc8637f591a6..02f789e07d4c 100644
--- a/fs/io_uring.c
+++ b/fs/io_uring.c
@@ -6902,7 +6902,7 @@ static int io_sq_thread(void *data)
}

prepare_to_wait(&sqd->wait, &wait, TASK_INTERRUPTIBLE);
- if (!io_sqd_events_pending(sqd)) {
+ if (!io_sqd_events_pending(sqd) && !current->task_works) {
needs_sched = true;
list_for_each_entry(ctx, &sqd->ctx_list, sqd_list) {
io_ring_set_wakeup_flag(ctx);
--
2.32.0


2021-06-22 18:54:46

by Olivier Langlois

[permalink] [raw]
Subject: Re: [PATCH 1/2] io_uring: Fix race condition when sqp thread goes to sleep

On Tue, 2021-06-22 at 11:45 -0700, Olivier Langlois wrote:
> If an asynchronous completion happens before the task is preparing
> itself to wait and set its state to TASK_INTERRUPTABLE, the
> completion
> will not wake up the sqp thread.
>
I have just noticed that I made a typo in the description. I will send
a v2 of that patch.

Sorry about that. I was too excited to share my discovery...


2021-06-22 18:56:58

by Pavel Begunkov

[permalink] [raw]
Subject: Re: [PATCH 1/2] io_uring: Fix race condition when sqp thread goes to sleep

On 6/22/21 7:53 PM, Olivier Langlois wrote:
> On Tue, 2021-06-22 at 11:45 -0700, Olivier Langlois wrote:
>> If an asynchronous completion happens before the task is preparing
>> itself to wait and set its state to TASK_INTERRUPTABLE, the
>> completion
>> will not wake up the sqp thread.
>>
> I have just noticed that I made a typo in the description. I will send
> a v2 of that patch.
>
> Sorry about that. I was too excited to share my discovery...

git format-patch --cover-letter --thread=shallow ...

would be even better, but the fix looks right

--
Pavel Begunkov

2021-06-22 19:09:00

by Olivier Langlois

[permalink] [raw]
Subject: Re: [PATCH 1/2] io_uring: Fix race condition when sqp thread goes to sleep

On Tue, 2021-06-22 at 19:55 +0100, Pavel Begunkov wrote:
> On 6/22/21 7:53 PM, Olivier Langlois wrote:
> > On Tue, 2021-06-22 at 11:45 -0700, Olivier Langlois wrote:
> > > If an asynchronous completion happens before the task is
> > > preparing
> > > itself to wait and set its state to TASK_INTERRUPTABLE, the
> > > completion
> > > will not wake up the sqp thread.
> > >
> > I have just noticed that I made a typo in the description. I will
> > send
> > a v2 of that patch.
> >
> > Sorry about that. I was too excited to share my discovery...
>
> git format-patch --cover-letter --thread=shallow ...
>
> would be even better, but the fix looks right
>
You are too good... I thought that I could get away from hacking
manually the patch file for such a minor change...

It seems that I got caught...

Let me know if you need me to redo it the right way...