io_uring: allow async accept on O_NONBLOCK sockets
PATCH 1/1 io_uring: allow 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.
note: If multiple accepts are queued up, then when a single connection comes in they all complete, one with the connection, and the remaining with EAGAIN. This could be improved in the future but will require a lot of io_uring changes.
--- fs/io_uring.c | 3 --- 1 file changed, 3 deletions(-)
fs/io_uring.c +0 -3
@@ -5603,9 +5603,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 ))
base-commit: 8a3e8ee56417f5e0e66580d93941ed9d6f4c8274
Signature · 1 line
2.30.2
Jens Axboe
maintainerQuoted 11 lines · Dylan Yudaken
Do not set
REQ_F_NOWAITif 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.
note: If multiple accepts are queued up, then when a single connection comes in they all complete, one with the connection, and the remaining with EAGAIN. This could be improved in the future but will require a lot of
io_uringchanges.
Not true - all you'd need to do is have behavior similar to EPOLLEXCLUSIVE, which we already support for separate poll. Could be done for internal poll quite easily, and _probably_ makes sense to do by default for most cases in fact.
Signature · 1 line
Jens Axboe
Jens Axboe
maintainerQuoted 13 lines · Jens Axboe
Quoted 11 lines · Dylan Yudaken
Do not set
REQ_F_NOWAITif 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.
note: If multiple accepts are queued up, then when a single connection comes in they all complete, one with the connection, and the remaining with EAGAIN. This could be improved in the future but will require a lot of
io_uringchanges.
Quoted 4 lines
Not true - all you'd need to do is have behavior similar to EPOLLEXCLUSIVE, which we already support for separate poll. Could be done for internal poll quite easily, and _probably_ makes sense to do by default for most cases in fact.
Quick wire-up below. Not tested at all, but really should basically as simple as this.
fs/io_uring.c +4 -0
@@ -967,6 +967,7 @@ struct io_op_def {/* set if opcode supports polled "wait" */ unsigned pollin : 1; unsigned pollout : 1; + unsigned poll_exclusive : 1;/* op supports buffer selection */ unsigned buffer_select : 1;/* do prep async if is going to be punted */
@@ -1061,6 +1062,7 @@ static const struct io_op_def io_op_defs[] = { .needs_file = 1, .unbound_nonreg_file = 1, .pollin = 1, + .poll_exclusive = 1, }, [IORING_OP_ASYNC_CANCEL] = { .audit_skip = 1,
@@ -6293,6 +6295,8 @@ static int io_arm_poll_handler(struct io_kiocb *req, unsigned issue_flags) }else { mask |=POLLOUT |POLLWRNORM ; } +if (def->poll_exclusive) + mask |=EPOLLEXCLUSIVE ;if (!(issue_flags &IO_URING_F_UNLOCKED ) && !list_empty (&ctx->apoll_cache)) {
Signature · 1 line
Jens Axboe
Quoted 58 lines · Jens Axboe
Quoted 19 lines · Jens Axboe
Quoted 10 lines · Dylan Yudaken
Do not set
REQ_F_NOWAITif 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.Quoted 7 lines
note: If multiple accepts are queued up, then when a single connection
comes in they all complete, one with the connection, and the remaining
with EAGAIN. This could be improved in the future but will require a lot
ofio_uringchanges.Quoted 6 lines
Not true - all you'd need to do is have behavior similar to EPOLLEXCLUSIVE, which we already support for separate poll. Could be
done for internal poll quite easily, and _probably_ makes sense to do by
default for most cases in fact.Quick wire-up below. Not tested at all, but really should basically as
simple as this.fs/io_uring.c +4
-0@@ -967,6 +967,7 @@ struct io_op_def { /* set if opcode supports polled "wait" */ unsigned pollin : 1; unsigned pollout : 1; + unsigned poll_exclusive : 1; /* op supports buffer selection */ unsigned buffer_select : 1; /* do prep async if is going to be punted */@@ -1061,6 +1062,7 @@ static const struct io_op_def io_op_defs[] = { .needs_file = 1, .unbound_nonreg_file = 1, .pollin = 1, + .poll_exclusive = 1, }, [IORING_OP_ASYNC_CANCEL] = { .audit_skip = 1,@@ -6293,6 +6295,8 @@ static int io_arm_poll_handler(struct io_kiocb *req, unsigned issue_flags) } else { mask |= POLLOUT | POLLWRNORM; } + if (def->poll_exclusive) + mask |= EPOLLEXCLUSIVE;
Quoted 4 lines
if (!(issue_flags &IO_URING_F_UNLOCKED) && !list_empty(&ctx->apoll_cache)) {
Thanks!
Will take a look and update the test case to check it.
Quoted 8 lines · Dylan Yudaken
Do not set
REQ_F_NOWAITif 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.
[...]
Applied, thanks!
[1/1] io_uring: allow async accept on O_NONBLOCK sockets
commit: 6d4809f49bec8dc3b244debcb97f78239e52f5bb
Best regards,
Signature · 1 line
Jens Axboe