This is a note to let you know that I've just added the patch titled
io_uring/poll: move poll execution helpers higher up
to the 6.6-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-poll-move-poll-execution-helpers-higher-up.patch
and it can be found in the queue-6.6 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From 582cc8795c22337041abc7ee06f9de34f1592922 Mon Sep 17 00:00:00 2001
From: Jens Axboe <axboe@xxxxxxxxx>
Date: Mon, 29 Jan 2024 11:52:54 -0700
Subject: io_uring/poll: move poll execution helpers higher up
From: Jens Axboe <axboe@xxxxxxxxx>
Commit e84b01a880f635e3084a361afba41f95ff500d12 upstream.
In preparation for calling __io_poll_execute() higher up, move the
functions to avoid forward declarations.
No functional changes in this patch.
Signed-off-by: Jens Axboe <axboe@xxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
io_uring/poll.c | 30 +++++++++++++++---------------
1 file changed, 15 insertions(+), 15 deletions(-)
--- a/io_uring/poll.c
+++ b/io_uring/poll.c
@@ -228,6 +228,21 @@ enum {
IOU_POLL_REISSUE = 3,
};
+static void __io_poll_execute(struct io_kiocb *req, int mask)
+{
+ io_req_set_res(req, mask, 0);
+ req->io_task_work.func = io_poll_task_func;
+
+ trace_io_uring_task_add(req, mask);
+ io_req_task_work_add(req);
+}
+
+static inline void io_poll_execute(struct io_kiocb *req, int res)
+{
+ if (io_poll_get_ownership(req))
+ __io_poll_execute(req, res);
+}
+
/*
* All poll tw should go through this. Checks for poll events, manages
* references, does rewait, etc.
@@ -364,21 +379,6 @@ void io_poll_task_func(struct io_kiocb *
}
}
-static void __io_poll_execute(struct io_kiocb *req, int mask)
-{
- io_req_set_res(req, mask, 0);
- req->io_task_work.func = io_poll_task_func;
-
- trace_io_uring_task_add(req, mask);
- io_req_task_work_add(req);
-}
-
-static inline void io_poll_execute(struct io_kiocb *req, int res)
-{
- if (io_poll_get_ownership(req))
- __io_poll_execute(req, res);
-}
-
static void io_poll_cancel_req(struct io_kiocb *req)
{
io_poll_mark_cancelled(req);
Patches currently in stable-queue which might be from axboe@xxxxxxxxx are
queue-6.6/io_uring-poll-add-requeue-return-code-from-poll-multishot-handling.patch
queue-6.6/io_uring-net-limit-inline-multishot-retries.patch
queue-6.6/blk-iocost-fix-an-ubsan-shift-out-of-bounds-warning.patch
queue-6.6/io_uring-net-fix-sr-len-for-ioring_op_recv-with-msg_waitall-and-buffers.patch
queue-6.6/io_uring-net-un-indent-mshot-retry-path-in-io_recv_finish.patch
queue-6.6/io_uring-poll-move-poll-execution-helpers-higher-up.patch
