diff options
| author | Pavel Begunkov <asml.silence@gmail.com> | 2020-11-20 17:10:28 +0000 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-04-16 11:46:38 +0200 |
| commit | 8119a2b42028c7ab722aad73cd21efd8c0e580e2 (patch) | |
| tree | 72cfb67e5be52cb208cfe0563c1f4931388eef8e | |
| parent | 2d71bffbe9a0f2b25d4ba03df21bddd5dbdfa9cc (diff) | |
| download | linux-8119a2b42028c7ab722aad73cd21efd8c0e580e2.tar.gz linux-8119a2b42028c7ab722aad73cd21efd8c0e580e2.tar.bz2 linux-8119a2b42028c7ab722aad73cd21efd8c0e580e2.zip | |
block: don't ignore REQ_NOWAIT for direct IO
[ Upstream commit f8b78caf21d5bc3fcfc40c18898f9d52ed1451a5 ]
If IOCB_NOWAIT is set on submission, then that needs to get propagated to
REQ_NOWAIT on the block side. Otherwise we completely lose this
information, and any issuer of IOCB_NOWAIT IO will potentially end up
blocking on eg request allocation on the storage side.
Signed-off-by: Pavel Begunkov <asml.silence@gmail.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Signed-off-by: Sasha Levin <sashal@kernel.org>
| -rw-r--r-- | fs/block_dev.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/fs/block_dev.c b/fs/block_dev.c index 79272cdbe827..bd93563477a4 100644 --- a/fs/block_dev.c +++ b/fs/block_dev.c @@ -246,6 +246,8 @@ __blkdev_direct_IO_simple(struct kiocb *iocb, struct iov_iter *iter, bio.bi_opf = dio_bio_write_op(iocb); task_io_account_write(ret); } + if (iocb->ki_flags & IOCB_NOWAIT) + bio.bi_opf |= REQ_NOWAIT; if (iocb->ki_flags & IOCB_HIPRI) bio_set_polled(&bio, iocb); @@ -399,6 +401,8 @@ __blkdev_direct_IO(struct kiocb *iocb, struct iov_iter *iter, int nr_pages) bio->bi_opf = dio_bio_write_op(iocb); task_io_account_write(bio->bi_iter.bi_size); } + if (iocb->ki_flags & IOCB_NOWAIT) + bio->bi_opf |= REQ_NOWAIT; dio->size += bio->bi_iter.bi_size; pos += bio->bi_iter.bi_size; |