diff mbox series

[5.4,12/18] block: dont ignore REQ_NOWAIT for direct IO

Message ID	20210415144413.434725034@linuxfoundation.org
State	New
Headers	show Return-Path: <stable-owner@kernel.org> From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>, stable@vger.kernel.org, Pavel Begunkov <asml.silence@gmail.com>, Jens Axboe <axboe@kernel.dk>, Sasha Levin <sashal@kernel.org> Subject: [PATCH 5.4 12/18] block: dont ignore REQ_NOWAIT for direct IO Date: Thu, 15 Apr 2021 16:48:05 +0200 Message-Id: <20210415144413.434725034@linuxfoundation.org> In-Reply-To: <20210415144413.055232956@linuxfoundation.org> References: <20210415144413.055232956@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk
Series	None \| expand [5.4,02/18] KVM: arm64: Hide system instruction access to Trace registers [5.4,03/18] KVM: arm64: Disable guest access to trace filter controls [5.4,04/18] drm/imx: imx-ldb: fix out of bounds array access warning [5.4,05/18] gfs2: report "already frozen/thawed" errors [5.4,06/18] drm/tegra: dc: Dont set PLL clock to 0Hz [5.4,07/18] block: only update parent bi_status when bio fail [5.4,08/18] radix tree test suite: Register the main thread with the RCU library [5.4,09/18] idr test suite: Take RCU read lock in idr_find_test_1 [5.4,10/18] idr test suite: Create anchor before launching throbber [5.4,11/18] riscv,entry: fix misaligned base for excp_vect_table [5.4,12/18] block: dont ignore REQ_NOWAIT for direct IO [5.4,13/18] netfilter: x_tables: fix compat match/target pad out-of-bound write [5.4,14/18] driver core: Fix locking bug in deferred_probe_timeout_work_func() [5.4,15/18] perf tools: Use %define api.pure full instead of %pure-parser [5.4,16/18] perf tools: Use %zd for size_t printf formats on 32-bit [5.4,17/18] perf map: Tighten snprintf() string precision to pass gcc check on some 32-bit arches [5.4,18/18] xen/events: fix setting irq affinity

Commit Message

Greg Kroah-Hartman April 15, 2021, 2:48 p.m. UTC

From: Pavel Begunkov <asml.silence@gmail.com>

[ 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>
---
 fs/block_dev.c | 4 ++++
 1 file changed, 4 insertions(+)

diff mbox series

Patch

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;