diff mbox series

ext4: don't block for O_DIRECT if IOCB_NOWAIT is set

Message ID 76152096-2bbb-7682-8fce-4cb498bcd909@kernel.dk
State Accepted
Headers show
Series ext4: don't block for O_DIRECT if IOCB_NOWAIT is set | expand

Commit Message

Jens Axboe May 24, 2020, 10:53 p.m. UTC
Running with some debug patches to detect illegal blocking triggered the
extend/unaligned condition in ext4. If ext4 needs to extend the file (and
hence go to buffered IO), or if the app is doing unaligned IO, then ext4
asks the iomap code to wait for IO completion. If the caller asked for
no-wait semantics by setting IOCB_NOWAIT, then ext4 should return -EAGAIN
instead.

Signed-off-by: Jens Axboe <axboe@kernel.dk>

---

Comments

Theodore Y. Ts'o May 29, 2020, 3:15 a.m. UTC | #1
On Sun, May 24, 2020 at 04:53:16PM -0600, Jens Axboe wrote:
> Running with some debug patches to detect illegal blocking triggered the
> extend/unaligned condition in ext4. If ext4 needs to extend the file (and
> hence go to buffered IO), or if the app is doing unaligned IO, then ext4
> asks the iomap code to wait for IO completion. If the caller asked for
> no-wait semantics by setting IOCB_NOWAIT, then ext4 should return -EAGAIN
> instead.
> 
> Signed-off-by: Jens Axboe <axboe@kernel.dk>

Thanks, applied.

					- Ted
diff mbox series

Patch

diff --git a/fs/ext4/file.c b/fs/ext4/file.c
index 0d624250a62b..3ac95f4cada6 100644
--- a/fs/ext4/file.c
+++ b/fs/ext4/file.c
@@ -495,6 +495,12 @@  static ssize_t ext4_dio_write_iter(struct kiocb *iocb, struct iov_iter *from)
 	if (ret <= 0)
 		return ret;
 
+	/* if we're going to block and IOCB_NOWAIT is set, return -EAGAIN */
+	if ((iocb->ki_flags & IOCB_NOWAIT) && (unaligned_io || extend)) {
+		ret = -EAGAIN;
+		goto out;
+	}
+
 	offset = iocb->ki_pos;
 	count = ret;