This is a note to let you know that I've just added the patch titled
io_uring/sqpoll: ensure that normal task_work is also run timely
to the 6.9-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
io_uring-sqpoll-ensure-that-normal-task_work-is-also-run-timely.patch
and it can be found in the queue-6.9 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From d13ddd9c893f0e8498526bf88c6b5fad01f0edd8 Mon Sep 17 00:00:00 2001
From: Jens Axboe <axboe@xxxxxxxxx>
Date: Tue, 21 May 2024 12:31:12 -0600
Subject: io_uring/sqpoll: ensure that normal task_work is also run timely
From: Jens Axboe <axboe@xxxxxxxxx>
commit d13ddd9c893f0e8498526bf88c6b5fad01f0edd8 upstream.
With the move to private task_work, SQPOLL neglected to also run the
normal task_work, if any is pending. This will eventually get run, but
we should run it with the private task_work to ensure that things like
a final fput() is processed in a timely fashion.
Cc: stable@xxxxxxxxxxxxxxx
Link: https://lore.kernel.org/all/313824bc-799d-414f-96b7-e6de57c7e21d@xxxxxxxxx/
Reported-by: Andrew Udvare <audvare@xxxxxxxxx>
Fixes: af5d68f8892f ("io_uring/sqpoll: manage task_work privately")
Tested-by: Christian Heusel <christian@xxxxxxxxx>
Tested-by: Andrew Udvare <audvare@xxxxxxxxx>
Signed-off-by: Jens Axboe <axboe@xxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
io_uring/sqpoll.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/io_uring/sqpoll.c b/io_uring/sqpoll.c
index 554c7212aa46..b3722e5275e7 100644
--- a/io_uring/sqpoll.c
+++ b/io_uring/sqpoll.c
@@ -238,11 +238,13 @@ static unsigned int io_sq_tw(struct llist_node **retry_list, int max_entries)
if (*retry_list) {
*retry_list = io_handle_tw_list(*retry_list, &count, max_entries);
if (count >= max_entries)
- return count;
+ goto out;
max_entries -= count;
}
-
*retry_list = tctx_task_work_run(tctx, max_entries, &count);
+out:
+ if (task_work_pending(current))
+ task_work_run();
return count;
}
--
2.45.1
Patches currently in stable-queue which might be from axboe@xxxxxxxxx are
queue-6.9/io_uring-fail-nop-if-non-zero-op-flags-is-passed-in.patch
queue-6.9/io_uring-sqpoll-ensure-that-normal-task_work-is-also-run-timely.patch
