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

[ Upstream commit 6e014c621e7271649f0d51e54dbe1db4c10486c8 ]

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>
Link: https://lore.kernel.org/r/76152096-2bbb-7682-8fce-4cb498bcd909@kernel.dk
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/fs/ext4/file.c b/fs/ext4/file.c
index b8e69f9e3858779ef0192fbafa169f5a4ee7a060..2a01e31a032c4ce393ea5e9514b92e1950d1f5fa 100644 (file)
--- a/fs/ext4/file.c
+++ b/fs/ext4/file.c
@@ -502,6 +502,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;