This is a note to let you know that I've just added the patch titled
io_uring/net: don't overflow multishot recv
to the 6.5-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-net-don-t-overflow-multishot-recv.patch
and it can be found in the queue-6.5 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From b2e74db55dd93d6db22a813c9a775b5dbf87c560 Mon Sep 17 00:00:00 2001
From: Pavel Begunkov <asml.silence@xxxxxxxxx>
Date: Fri, 11 Aug 2023 13:53:42 +0100
Subject: io_uring/net: don't overflow multishot recv
From: Pavel Begunkov <asml.silence@xxxxxxxxx>
commit b2e74db55dd93d6db22a813c9a775b5dbf87c560 upstream.
Don't allow overflowing multishot recv CQEs, it might get out of
hand, hurt performance, and in the worst case scenario OOM the task.
Cc: stable@xxxxxxxxxxxxxxx
Fixes: b3fdea6ecb55c ("io_uring: multishot recv")
Signed-off-by: Pavel Begunkov <asml.silence@xxxxxxxxx>
Link: https://lore.kernel.org/r/0b295634e8f1b71aa764c984608c22d85f88f75c.1691757663.git.asml.silence@xxxxxxxxx
Signed-off-by: Jens Axboe <axboe@xxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
io_uring/net.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- a/io_uring/net.c
+++ b/io_uring/net.c
@@ -642,7 +642,7 @@ static inline bool io_recv_finish(struct
if (!mshot_finished) {
if (io_aux_cqe(req, issue_flags & IO_URING_F_COMPLETE_DEFER,
- *ret, cflags | IORING_CQE_F_MORE, true)) {
+ *ret, cflags | IORING_CQE_F_MORE, false)) {
io_recv_prep_retry(req);
/* Known not-empty or unknown state, retry */
if (cflags & IORING_CQE_F_SOCK_NONEMPTY ||
Patches currently in stable-queue which might be from asml.silence@xxxxxxxxx are
queue-6.5/io_uring-net-don-t-overflow-multishot-recv.patch
queue-6.5/io_uring-net-don-t-overflow-multishot-accept.patch
queue-6.5/io_uring-fix-drain-stalls-by-invalid-sqe.patch
queue-6.5/io_uring-break-out-of-iowq-iopoll-on-teardown.patch
queue-6.5/io_uring-fix-false-positive-kasan-warnings.patch
queue-6.5/io_uring-break-iopolling-on-signal.patch
