This is a note to let you know that I've just added the patch titled
io_uring/rw: return IOU_ISSUE_SKIP_COMPLETE for multishot retry
to the 6.7-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-rw-return-iou_issue_skip_complete-for-multi.patch
and it can be found in the queue-6.7 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
commit e07876be273e825b1d6b2a9171b7d5223097715e
Author: Jens Axboe <axboe@xxxxxxxxx>
Date: Tue Mar 12 08:29:47 2024 -0600
io_uring/rw: return IOU_ISSUE_SKIP_COMPLETE for multishot retry
[ Upstream commit 0a3737db8479b77f95f4bfda8e71b03c697eb56a ]
If read multishot is being invoked from the poll retry handler, then we
should return IOU_ISSUE_SKIP_COMPLETE rather than -EAGAIN. If not, then
a CQE will be posted with -EAGAIN rather than triggering the retry when
the file is flagged as readable again.
Cc: stable@xxxxxxxxxxxxxxx
Reported-by: Sargun Dhillon <sargun@xxxxxxxx>
Fixes: fc68fcda04910 ("io_uring/rw: add support for IORING_OP_READ_MULTISHOT")
Signed-off-by: Jens Axboe <axboe@xxxxxxxxx>
Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>
diff --git a/io_uring/rw.c b/io_uring/rw.c
index f66ace04403f7..70c5beb05d4e9 100644
--- a/io_uring/rw.c
+++ b/io_uring/rw.c
@@ -942,6 +942,8 @@ int io_read_mshot(struct io_kiocb *req, unsigned int issue_flags)
*/
if (io_kbuf_recycle(req, issue_flags))
rw->len = 0;
+ if (issue_flags & IO_URING_F_MULTISHOT)
+ return IOU_ISSUE_SKIP_COMPLETE;
return -EAGAIN;
}
