diff options
| author | Dylan Yudaken <dylany@fb.com> | 2022-03-24 15:34:35 +0100 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2022-03-24 23:10:29 +0100 |
| commit | a73825ba70c93e1eb39a845bb3d9885a787f8ffe (patch) | |
| tree | 983509d071b6ce33493327fe3cfc5236911536fc /fs | |
| parent | io_uring: remove IORING_CQE_F_MSG (diff) | |
| download | linux-a73825ba70c93e1eb39a845bb3d9885a787f8ffe.tar.xz linux-a73825ba70c93e1eb39a845bb3d9885a787f8ffe.zip | |
io_uring: fix async accept on O_NONBLOCK sockets
Do not set REQ_F_NOWAIT if the socket is non blocking. When enabled this
causes the accept to immediately post a CQE with EAGAIN, which means you
cannot perform an accept SQE on a NONBLOCK socket asynchronously.
By removing the flag if there is no pending accept then poll is armed as
usual and when a connection comes in the CQE is posted.
Signed-off-by: Dylan Yudaken <dylany@fb.com>
Link: https://lore.kernel.org/r/20220324143435.2875844-1-dylany@fb.com
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/io_uring.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/fs/io_uring.c b/fs/io_uring.c index 28b7a1b8abb6..a76e91fe277c 100644 --- a/fs/io_uring.c +++ b/fs/io_uring.c @@ -5602,9 +5602,6 @@ static int io_accept(struct io_kiocb *req, unsigned int issue_flags) struct file *file; int ret, fd; - if (req->file->f_flags & O_NONBLOCK) - req->flags |= REQ_F_NOWAIT; - if (!fixed) { fd = __get_unused_fd_flags(accept->flags, accept->nofile); if (unlikely(fd < 0)) |