io_uring: check file O_NONBLOCK state for accept
authorJiufei Xue <jiufei.xue@linux.alibaba.com>
Wed, 10 Jun 2020 05:41:59 +0000 (13:41 +0800)
committerJens Axboe <axboe@kernel.dk>
Thu, 11 Jun 2020 00:06:16 +0000 (18:06 -0600)
If the socket is O_NONBLOCK, we should complete the accept request
with -EAGAIN when data is not ready.

Signed-off-by: Jiufei Xue <jiufei.xue@linux.alibaba.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
fs/io_uring.c

index d72b2a9463cad8d86306437d2d14410cd6e59352..5b0249140ff5907c8647d9a97e7dddcdf6191840 100644 (file)
@@ -3909,6 +3909,9 @@ static int io_accept(struct io_kiocb *req, bool force_nonblock)
        unsigned int file_flags = force_nonblock ? O_NONBLOCK : 0;
        int ret;
 
+       if (req->file->f_flags & O_NONBLOCK)
+               req->flags |= REQ_F_NOWAIT;
+
        ret = __sys_accept4_file(req->file, file_flags, accept->addr,
                                        accept->addr_len, accept->flags,
                                        accept->nofile);