* [PATCH] io_uring: include file O_NONBLOCK state for, recvmsg/sendmsg
@ 2020-05-22 19:15 Jens Axboe
0 siblings, 0 replies; only message in thread
From: Jens Axboe @ 2020-05-22 19:15 UTC (permalink / raw)
To: io-uring
We only check for MSG_DONTWAIT in terms of whether or not we should
be completing with -EAGAIN or retrying, ensure that we check the
file O_NONBLOCK flag as well.
Cc: [email protected] # v5.3+
Fixes: 0fa03c624d8f ("io_uring: add support for sendmsg()")
Fixes: aa1fa28fc73e ("io_uring: add support for recvmsg()")
Signed-off-by: Jens Axboe <[email protected]>
---
fs/io_uring.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/fs/io_uring.c b/fs/io_uring.c
index 0b51f21e5432..792720b2c01e 100644
--- a/fs/io_uring.c
+++ b/fs/io_uring.c
@@ -3654,7 +3654,7 @@ static int io_sendmsg(struct io_kiocb *req, bool force_nonblock)
}
flags = req->sr_msg.msg_flags;
- if (flags & MSG_DONTWAIT)
+ if ((flags & MSG_DONTWAIT) || (req->file->f_flags & O_NONBLOCK))
req->flags |= REQ_F_NOWAIT;
else if (force_nonblock)
flags |= MSG_DONTWAIT;
@@ -3899,7 +3899,7 @@ static int io_recvmsg(struct io_kiocb *req, bool force_nonblock)
}
flags = req->sr_msg.msg_flags;
- if (flags & MSG_DONTWAIT)
+ if ((flags & MSG_DONTWAIT) || (req->file->f_flags & O_NONBLOCK))
req->flags |= REQ_F_NOWAIT;
else if (force_nonblock)
flags |= MSG_DONTWAIT;
--
2.26.2
--
Jens Axboe
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2020-05-22 19:15 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-05-22 19:15 [PATCH] io_uring: include file O_NONBLOCK state for, recvmsg/sendmsg Jens Axboe
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox