Skip to content

Commit

Permalink
io_uring: fix multishot accept ordering
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Dylan Yudaken authored and Jens Axboe committed Jul 25, 2022
1 parent a2da676 commit cbd2574
Showing 1 changed file with 7 additions and 4 deletions.
11 changes: 7 additions & 4 deletions io_uring/net.c
Original file line number Diff line number Diff line change
Expand Up @@ -656,11 +656,14 @@ int io_accept(struct io_kiocb *req, unsigned int issue_flags)
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)
Expand Down

0 comments on commit cbd2574

Please sign in to comment.