This is a note to let you know that I've just added the patch titled io_uring: improve io_double_lock_ctx fail handling to the 6.0-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-improve-io_double_lock_ctx-fail-handling.patch and it can be found in the queue-6.0 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let <stable@xxxxxxxxxxxxxxx> know about it. >From 4c979eaefa4356d385b7c7d2877dc04d7fe88969 Mon Sep 17 00:00:00 2001 From: Pavel Begunkov <asml.silence@xxxxxxxxx> Date: Wed, 7 Dec 2022 03:53:27 +0000 Subject: io_uring: improve io_double_lock_ctx fail handling From: Pavel Begunkov <asml.silence@xxxxxxxxx> commit 4c979eaefa4356d385b7c7d2877dc04d7fe88969 upstream. msg_ring will fail the request if it can't lock rings, instead punt it to io-wq as was originally intended. Cc: stable@xxxxxxxxxxxxxxx Signed-off-by: Pavel Begunkov <asml.silence@xxxxxxxxx> Link: https://lore.kernel.org/r/4697f05afcc37df5c8f89e2fe6d9c7c19f0241f9.1670384893.git.asml.silence@xxxxxxxxx Signed-off-by: Jens Axboe <axboe@xxxxxxxxx> Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> --- io_uring/msg_ring.c | 2 ++ 1 file changed, 2 insertions(+) --- a/io_uring/msg_ring.c +++ b/io_uring/msg_ring.c @@ -164,6 +164,8 @@ int io_msg_ring(struct io_kiocb *req, un } done: + if (ret == -EAGAIN) + return -EAGAIN; if (ret < 0) req_set_fail(req); io_req_set_res(req, ret, 0); Patches currently in stable-queue which might be from asml.silence@xxxxxxxxx are queue-6.0/io_uring-net-fix-cleanup-after-recycle.patch queue-6.0/io_uring-protect-cq_timeouts-with-timeout_lock.patch queue-6.0/io_uring-add-completion-locking-for-iopoll.patch queue-6.0/io_uring-improve-io_double_lock_ctx-fail-handling.patch