| Message ID | 20191210155742.5844-11-axboe@kernel.dk |
|---|---|
| State | Not Applicable |
| Delegated to: | David Miller |
| Headers | show |
| Series | None | expand |
From: Jens Axboe <axboe@kernel.dk> Date: Tue, 10 Dec 2019 08:57:41 -0700 > 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: David Miller <davem@davemloft.net> > Cc: netdev@vger.kernel.org > Signed-off-by: Jens Axboe <axboe@kernel.dk> I guess this should be OK: Acked-by: David S. Miller <davem@davemloft.net>
On 12/10/19 12:37 PM, David Miller wrote: > From: Jens Axboe <axboe@kernel.dk> > Date: Tue, 10 Dec 2019 08:57:41 -0700 > >> 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: David Miller <davem@davemloft.net> >> Cc: netdev@vger.kernel.org >> Signed-off-by: Jens Axboe <axboe@kernel.dk> > > I guess this should be OK: > > Acked-by: David S. Miller <davem@davemloft.net> Thanks for reviewing!
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)
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: David Miller <davem@davemloft.net> Cc: netdev@vger.kernel.org Signed-off-by: Jens Axboe <axboe@kernel.dk> --- net/socket.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)