diff mbox series

[5.10,20/25] block: dont ignore REQ_NOWAIT for direct IO

Message ID	20210415144413.791984438@linuxfoundation.org
State	Superseded
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.10 20/25] block: dont ignore REQ_NOWAIT for direct IO Date: Thu, 15 Apr 2021 16:48:14 +0200 Message-Id: <20210415144413.791984438@linuxfoundation.org> In-Reply-To: <20210415144413.165663182@linuxfoundation.org> References: <20210415144413.165663182@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.10,02/25] gfs2: Flag a withdraw if init_threads() fails [5.10,03/25] KVM: arm64: Hide system instruction access to Trace registers [5.10,04/25] KVM: arm64: Disable guest access to trace filter controls [5.10,05/25] drm/imx: imx-ldb: fix out of bounds array access warning [5.10,06/25] gfs2: report "already frozen/thawed" errors [5.10,07/25] ftrace: Check if pages were allocated before calling free_pages() [5.10,08/25] tools/kvm_stat: Add restart delay [5.10,09/25] drm/tegra: dc: Dont set PLL clock to 0Hz [5.10,10/25] gpu: host1x: Use different lock classes for each client [5.10,11/25] XArray: Fix splitting to non-zero orders [5.10,13/25] block: only update parent bi_status when bio fail [5.10,14/25] radix tree test suite: Register the main thread with the RCU library [5.10,15/25] idr test suite: Take RCU read lock in idr_find_test_1 [5.10,16/25] idr test suite: Create anchor before launching throbber [5.10,17/25] null_blk: fix command timeout completion handling [5.10,18/25] io_uring: dont mark S_ISBLK async work as unbounded [5.10,19/25] riscv,entry: fix misaligned base for excp_vect_table [5.10,20/25] block: dont ignore REQ_NOWAIT for direct IO [5.10,21/25] netfilter: x_tables: fix compat match/target pad out-of-bound write [5.10,22/25] perf map: Tighten snprintf() string precision to pass gcc check on some 32-bit arches [5.10,23/25] net: sfp: relax bitrate-derived mode check [5.10,24/25] net: sfp: cope with SFPs that set both LOS normal and LOS inverted [5.10,25/25] 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 6516051807b8..718533f0fb90 100644
--- a/fs/block_dev.c
+++ b/fs/block_dev.c
@@ -280,6 +280,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);
 
@@ -433,6 +435,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;