OSDN Git Service

io_uring: fix multishot accept ordering
authorDylan Yudaken <dylany@fb.com>
Thu, 30 Jun 2022 09:12:28 +0000 (02:12 -0700)
committerJens Axboe <axboe@kernel.dk>
Mon, 25 Jul 2022 00:39:17 +0000 (18:39 -0600)
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>
io_uring/net.c

index 601955f..e1eaf90 100644 (file)
@@ -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)