diff options
author | Dylan Yudaken <dylany@fb.com> | 2022-06-30 02:12:28 -0700 |
---|---|---|
committer | Jens Axboe <axboe@kernel.dk> | 2022-07-24 18:39:17 -0600 |
commit | cbd25748545c709d35734deb9220e0af0a69e5d2 (patch) | |
tree | eb9ad1c2e5cb27e4f1cd4414e35fba07b75e906c | |
parent | a2da676376feb79224eacb9ac1f554bb3232b5de (diff) | |
download | linux-stable-cbd25748545c709d35734deb9220e0af0a69e5d2.tar.gz linux-stable-cbd25748545c709d35734deb9220e0af0a69e5d2.tar.bz2 linux-stable-cbd25748545c709d35734deb9220e0af0a69e5d2.zip |
io_uring: fix multishot accept ordering
Similar to multishot poll, drop multishot accept when CQE overflow occurs.
Signed-off-by: Dylan Yudaken <dylany@fb.com>
Link: https://lore.kernel.org/r/20220630091231.1456789-10-dylany@fb.com
Signed-off-by: Jens Axboe <axboe@kernel.dk>
-rw-r--r-- | io_uring/net.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/io_uring/net.c b/io_uring/net.c index 601955fdb124..e1eaf902f3b2 100644 --- a/io_uring/net.c +++ b/io_uring/net.c @@ -656,11 +656,14 @@ retry: return IOU_OK; } - if (ret < 0) - return ret; - if (io_post_aux_cqe(ctx, req->cqe.user_data, ret, IORING_CQE_F_MORE, true)) + if (ret >= 0 && + io_post_aux_cqe(ctx, req->cqe.user_data, ret, IORING_CQE_F_MORE, false)) goto retry; - return -ECANCELED; + + io_req_set_res(req, ret, 0); + if (req->flags & REQ_F_POLLED) + return IOU_STOP_MULTISHOT; + return IOU_OK; } int io_socket_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe) |