diff options
| author | Jens Axboe <axboe@kernel.dk> | 2019-12-10 04:58:56 +0100 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2019-12-11 00:33:23 +0100 |
| commit | ebfcd8955c0b52eb793bcbc9e71140e3d0cdb228 (patch) | |
| tree | 09f98f4fd317b1a146576e62c700dfd6ef1a4931 /net/socket.c | |
| parent | io_uring: only hash regular files for async work execution (diff) | |
| download | linux-ebfcd8955c0b52eb793bcbc9e71140e3d0cdb228.tar.xz linux-ebfcd8955c0b52eb793bcbc9e71140e3d0cdb228.zip | |
net: make socket read/write_iter() honor IOCB_NOWAIT
The socket read/write helpers only look at the file O_NONBLOCK. not
the iocb IOCB_NOWAIT flag. This breaks users like preadv2/pwritev2
and io_uring that rely on not having the file itself marked nonblocking,
but rather the iocb itself.
Cc: netdev@vger.kernel.org
Acked-by: David Miller <davem@davemloft.net>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'net/socket.c')
| -rw-r--r-- | net/socket.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/socket.c b/net/socket.c index b343db1489bd..b116e58d6438 100644 --- a/net/socket.c +++ b/net/socket.c @@ -957,7 +957,7 @@ static ssize_t sock_read_iter(struct kiocb *iocb, struct iov_iter *to) .msg_iocb = iocb}; ssize_t res; - if (file->f_flags & O_NONBLOCK) + if (file->f_flags & O_NONBLOCK || (iocb->ki_flags & IOCB_NOWAIT)) msg.msg_flags = MSG_DONTWAIT; if (iocb->ki_pos != 0) @@ -982,7 +982,7 @@ static ssize_t sock_write_iter(struct kiocb *iocb, struct iov_iter *from) if (iocb->ki_pos != 0) return -ESPIPE; - if (file->f_flags & O_NONBLOCK) + if (file->f_flags & O_NONBLOCK || (iocb->ki_flags & IOCB_NOWAIT)) msg.msg_flags = MSG_DONTWAIT; if (sock->type == SOCK_SEQPACKET) |