* [PATCH v2 1/3] direct-io: clean up error paths of do_blockdev_direct_IO
2020-09-03 20:04 [PATCH v2 0/3] Unaligned DIO read error path fix and clean ups Gabriel Krisman Bertazi
@ 2020-09-03 20:04 ` Gabriel Krisman Bertazi
2020-09-04 7:47 ` Jan Kara
2020-09-03 20:04 ` [PATCH v2 2/3] direct-io: don't force writeback for reads beyond EOF Gabriel Krisman Bertazi
2020-09-03 20:04 ` [PATCH v2 3/3] direct-io: defer alignment check until after the EOF check Gabriel Krisman Bertazi
2 siblings, 1 reply; 7+ messages in thread
From: Gabriel Krisman Bertazi @ 2020-09-03 20:04 UTC (permalink / raw)
To: viro; +Cc: linux-fsdevel, jack, khazhy, Gabriel Krisman Bertazi, kernel
In preparation to resort DIO checks, reduce code duplication of error
handling in do_blockdev_direct_IO.
Signed-off-by: Gabriel Krisman Bertazi <krisman@collabora.com>
---
fs/direct-io.c | 30 +++++++++++++++---------------
1 file changed, 15 insertions(+), 15 deletions(-)
diff --git a/fs/direct-io.c b/fs/direct-io.c
index 183299892465..04aae41323d7 100644
--- a/fs/direct-io.c
+++ b/fs/direct-io.c
@@ -1170,7 +1170,7 @@ do_blockdev_direct_IO(struct kiocb *iocb, struct inode *inode,
blkbits = blksize_bits(bdev_logical_block_size(bdev));
blocksize_mask = (1 << blkbits) - 1;
if (align & blocksize_mask)
- goto out;
+ return -EINVAL;
}
/* watch out for a 0 len io from a tricksy fs */
@@ -1178,9 +1178,8 @@ do_blockdev_direct_IO(struct kiocb *iocb, struct inode *inode,
return 0;
dio = kmem_cache_alloc(dio_cache, GFP_KERNEL);
- retval = -ENOMEM;
if (!dio)
- goto out;
+ return -ENOMEM;
/*
* Believe it or not, zeroing out the page array caused a .5%
* performance regression in a database benchmark. So, we take
@@ -1199,22 +1198,16 @@ do_blockdev_direct_IO(struct kiocb *iocb, struct inode *inode,
retval = filemap_write_and_wait_range(mapping, offset,
end - 1);
- if (retval) {
- inode_unlock(inode);
- kmem_cache_free(dio_cache, dio);
- goto out;
- }
+ if (retval)
+ goto fail_dio;
}
}
/* Once we sampled i_size check for reads beyond EOF */
dio->i_size = i_size_read(inode);
if (iov_iter_rw(iter) == READ && offset >= dio->i_size) {
- if (dio->flags & DIO_LOCKING)
- inode_unlock(inode);
- kmem_cache_free(dio_cache, dio);
retval = 0;
- goto out;
+ goto fail_dio;
}
/*
@@ -1263,8 +1256,7 @@ do_blockdev_direct_IO(struct kiocb *iocb, struct inode *inode,
* We grab i_mutex only for reads so we don't have
* to release it here
*/
- kmem_cache_free(dio_cache, dio);
- goto out;
+ goto fail_dio_unlocked;
}
}
@@ -1368,7 +1360,15 @@ do_blockdev_direct_IO(struct kiocb *iocb, struct inode *inode,
} else
BUG_ON(retval != -EIOCBQUEUED);
-out:
+ return retval;
+
+fail_dio:
+ if (dio->flags & DIO_LOCKING) {
+ inode_unlock(inode);
+ }
+fail_dio_unlocked:
+ kmem_cache_free(dio_cache, dio);
+
return retval;
}
--
2.28.0
^ permalink raw reply related [flat|nested] 7+ messages in thread* Re: [PATCH v2 1/3] direct-io: clean up error paths of do_blockdev_direct_IO
2020-09-03 20:04 ` [PATCH v2 1/3] direct-io: clean up error paths of do_blockdev_direct_IO Gabriel Krisman Bertazi
@ 2020-09-04 7:47 ` Jan Kara
0 siblings, 0 replies; 7+ messages in thread
From: Jan Kara @ 2020-09-04 7:47 UTC (permalink / raw)
To: Gabriel Krisman Bertazi; +Cc: viro, linux-fsdevel, jack, khazhy, kernel
On Thu 03-09-20 16:04:12, Gabriel Krisman Bertazi wrote:
> In preparation to resort DIO checks, reduce code duplication of error
> handling in do_blockdev_direct_IO.
>
> Signed-off-by: Gabriel Krisman Bertazi <krisman@collabora.com>
Two comments below:
> @@ -1368,7 +1360,15 @@ do_blockdev_direct_IO(struct kiocb *iocb, struct inode *inode,
> } else
> BUG_ON(retval != -EIOCBQUEUED);
>
> -out:
> + return retval;
> +
> +fail_dio:
> + if (dio->flags & DIO_LOCKING) {
> + inode_unlock(inode);
> + }
No need for braces here. Also please add '&& iov_iter_rw(iter) == READ' to
the condition for unlocking to make fail_dio safe also for writes.
Currently you jump to fail_dio only for reads but in 3/3 you can jump to it
also for writes and that is a bug.
Honza
> +fail_dio_unlocked:
> + kmem_cache_free(dio_cache, dio);
> +
> return retval;
> }
>
> --
> 2.28.0
>
--
Jan Kara <jack@suse.com>
SUSE Labs, CR
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH v2 2/3] direct-io: don't force writeback for reads beyond EOF
2020-09-03 20:04 [PATCH v2 0/3] Unaligned DIO read error path fix and clean ups Gabriel Krisman Bertazi
2020-09-03 20:04 ` [PATCH v2 1/3] direct-io: clean up error paths of do_blockdev_direct_IO Gabriel Krisman Bertazi
@ 2020-09-03 20:04 ` Gabriel Krisman Bertazi
2020-09-04 7:48 ` Jan Kara
2020-09-03 20:04 ` [PATCH v2 3/3] direct-io: defer alignment check until after the EOF check Gabriel Krisman Bertazi
2 siblings, 1 reply; 7+ messages in thread
From: Gabriel Krisman Bertazi @ 2020-09-03 20:04 UTC (permalink / raw)
To: viro; +Cc: linux-fsdevel, jack, khazhy, Gabriel Krisman Bertazi, kernel
If a DIO read starts past EOF, the kernel won't attempt it, so we don't
need to flush dirty pages before failing the syscall.
Suggested-by: Jan Kara <jack@suse.cz>
Signed-off-by: Gabriel Krisman Bertazi <krisman@collabora.com>
---
fs/direct-io.c | 24 +++++++++++-------------
1 file changed, 11 insertions(+), 13 deletions(-)
diff --git a/fs/direct-io.c b/fs/direct-io.c
index 04aae41323d7..43460c8e0f90 100644
--- a/fs/direct-io.c
+++ b/fs/direct-io.c
@@ -1188,19 +1188,9 @@ do_blockdev_direct_IO(struct kiocb *iocb, struct inode *inode,
memset(dio, 0, offsetof(struct dio, pages));
dio->flags = flags;
- if (dio->flags & DIO_LOCKING) {
- if (iov_iter_rw(iter) == READ) {
- struct address_space *mapping =
- iocb->ki_filp->f_mapping;
-
- /* will be released by direct_io_worker */
- inode_lock(inode);
-
- retval = filemap_write_and_wait_range(mapping, offset,
- end - 1);
- if (retval)
- goto fail_dio;
- }
+ if (dio->flags & DIO_LOCKING && iov_iter_rw(iter) == READ) {
+ /* will be released by direct_io_worker */
+ inode_lock(inode);
}
/* Once we sampled i_size check for reads beyond EOF */
@@ -1210,6 +1200,14 @@ do_blockdev_direct_IO(struct kiocb *iocb, struct inode *inode,
goto fail_dio;
}
+ if (dio->flags & DIO_LOCKING && iov_iter_rw(iter) == READ) {
+ struct address_space *mapping = iocb->ki_filp->f_mapping;
+
+ retval = filemap_write_and_wait_range(mapping, offset, end - 1);
+ if (retval)
+ goto fail_dio;
+ }
+
/*
* For file extending writes updating i_size before data writeouts
* complete can expose uninitialized blocks in dumb filesystems.
--
2.28.0
^ permalink raw reply related [flat|nested] 7+ messages in thread* Re: [PATCH v2 2/3] direct-io: don't force writeback for reads beyond EOF
2020-09-03 20:04 ` [PATCH v2 2/3] direct-io: don't force writeback for reads beyond EOF Gabriel Krisman Bertazi
@ 2020-09-04 7:48 ` Jan Kara
0 siblings, 0 replies; 7+ messages in thread
From: Jan Kara @ 2020-09-04 7:48 UTC (permalink / raw)
To: Gabriel Krisman Bertazi; +Cc: viro, linux-fsdevel, jack, khazhy, kernel
On Thu 03-09-20 16:04:13, Gabriel Krisman Bertazi wrote:
> If a DIO read starts past EOF, the kernel won't attempt it, so we don't
> need to flush dirty pages before failing the syscall.
>
> Suggested-by: Jan Kara <jack@suse.cz>
> Signed-off-by: Gabriel Krisman Bertazi <krisman@collabora.com>
This patch looks good to me. You can add:
Reviewed-by: Jan Kara <jack@suse.cz>
Honza
> ---
> fs/direct-io.c | 24 +++++++++++-------------
> 1 file changed, 11 insertions(+), 13 deletions(-)
>
> diff --git a/fs/direct-io.c b/fs/direct-io.c
> index 04aae41323d7..43460c8e0f90 100644
> --- a/fs/direct-io.c
> +++ b/fs/direct-io.c
> @@ -1188,19 +1188,9 @@ do_blockdev_direct_IO(struct kiocb *iocb, struct inode *inode,
> memset(dio, 0, offsetof(struct dio, pages));
>
> dio->flags = flags;
> - if (dio->flags & DIO_LOCKING) {
> - if (iov_iter_rw(iter) == READ) {
> - struct address_space *mapping =
> - iocb->ki_filp->f_mapping;
> -
> - /* will be released by direct_io_worker */
> - inode_lock(inode);
> -
> - retval = filemap_write_and_wait_range(mapping, offset,
> - end - 1);
> - if (retval)
> - goto fail_dio;
> - }
> + if (dio->flags & DIO_LOCKING && iov_iter_rw(iter) == READ) {
> + /* will be released by direct_io_worker */
> + inode_lock(inode);
> }
>
> /* Once we sampled i_size check for reads beyond EOF */
> @@ -1210,6 +1200,14 @@ do_blockdev_direct_IO(struct kiocb *iocb, struct inode *inode,
> goto fail_dio;
> }
>
> + if (dio->flags & DIO_LOCKING && iov_iter_rw(iter) == READ) {
> + struct address_space *mapping = iocb->ki_filp->f_mapping;
> +
> + retval = filemap_write_and_wait_range(mapping, offset, end - 1);
> + if (retval)
> + goto fail_dio;
> + }
> +
> /*
> * For file extending writes updating i_size before data writeouts
> * complete can expose uninitialized blocks in dumb filesystems.
> --
> 2.28.0
>
--
Jan Kara <jack@suse.com>
SUSE Labs, CR
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH v2 3/3] direct-io: defer alignment check until after the EOF check
2020-09-03 20:04 [PATCH v2 0/3] Unaligned DIO read error path fix and clean ups Gabriel Krisman Bertazi
2020-09-03 20:04 ` [PATCH v2 1/3] direct-io: clean up error paths of do_blockdev_direct_IO Gabriel Krisman Bertazi
2020-09-03 20:04 ` [PATCH v2 2/3] direct-io: don't force writeback for reads beyond EOF Gabriel Krisman Bertazi
@ 2020-09-03 20:04 ` Gabriel Krisman Bertazi
2020-09-04 7:49 ` Jan Kara
2 siblings, 1 reply; 7+ messages in thread
From: Gabriel Krisman Bertazi @ 2020-09-03 20:04 UTC (permalink / raw)
To: viro
Cc: linux-fsdevel, jack, khazhy, Gabriel Krisman Bertazi, kernel, Jamie Liu
Prior to commit 9fe55eea7e4b ("Fix race when checking i_size on direct
i/o read"), an unaligned direct read past end of file would trigger EOF,
since generic_file_aio_read detected this read-at-EOF condition and
skipped the direct IO read entirely, returning 0. After that change, the
read now reaches dio_generic, which detects the misalignment and returns
EINVAL.
This consolidates the generic direct-io to follow the same behavior of
filesystems. Apparently, this fix will only affect ocfs2 since other
filesystems do this verification before calling do_blockdev_direct_IO,
with the exception of f2fs, which has the same bug, but is fixed in the
next patch.
it can be verified by a read loop on a file that does a partial read
before EOF (On file that doesn't end at an aligned address). The
following code fails on an unaligned file on filesystems without
prior validation without this patch, but not on btrfs, ext4, and xfs.
while (done < total) {
ssize_t delta = pread(fd, buf + done, total - done, off + done);
if (!delta)
break;
...
}
Fix this regression by moving the misalignment check to after the EOF
check added by commit 74cedf9b6c60 ("direct-io: Fix negative return from
dio read beyond eof").
Based on a patch by Jamie Liu.
Reported-by: Jamie Liu <jamieliu@google.com>
Signed-off-by: Gabriel Krisman Bertazi <krisman@collabora.com>
---
fs/direct-io.c | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/fs/direct-io.c b/fs/direct-io.c
index 43460c8e0f90..01131a1674b8 100644
--- a/fs/direct-io.c
+++ b/fs/direct-io.c
@@ -1165,14 +1165,6 @@ do_blockdev_direct_IO(struct kiocb *iocb, struct inode *inode,
* the early prefetch in the caller enough time.
*/
- if (align & blocksize_mask) {
- if (bdev)
- blkbits = blksize_bits(bdev_logical_block_size(bdev));
- blocksize_mask = (1 << blkbits) - 1;
- if (align & blocksize_mask)
- return -EINVAL;
- }
-
/* watch out for a 0 len io from a tricksy fs */
if (iov_iter_rw(iter) == READ && !count)
return 0;
@@ -1200,6 +1192,14 @@ do_blockdev_direct_IO(struct kiocb *iocb, struct inode *inode,
goto fail_dio;
}
+ if (align & blocksize_mask) {
+ if (bdev)
+ blkbits = blksize_bits(bdev_logical_block_size(bdev));
+ blocksize_mask = (1 << blkbits) - 1;
+ if (align & blocksize_mask)
+ goto fail_dio;
+ }
+
if (dio->flags & DIO_LOCKING && iov_iter_rw(iter) == READ) {
struct address_space *mapping = iocb->ki_filp->f_mapping;
--
2.28.0
^ permalink raw reply related [flat|nested] 7+ messages in thread* Re: [PATCH v2 3/3] direct-io: defer alignment check until after the EOF check
2020-09-03 20:04 ` [PATCH v2 3/3] direct-io: defer alignment check until after the EOF check Gabriel Krisman Bertazi
@ 2020-09-04 7:49 ` Jan Kara
0 siblings, 0 replies; 7+ messages in thread
From: Jan Kara @ 2020-09-04 7:49 UTC (permalink / raw)
To: Gabriel Krisman Bertazi
Cc: viro, linux-fsdevel, jack, khazhy, kernel, Jamie Liu
On Thu 03-09-20 16:04:14, Gabriel Krisman Bertazi wrote:
> Prior to commit 9fe55eea7e4b ("Fix race when checking i_size on direct
> i/o read"), an unaligned direct read past end of file would trigger EOF,
> since generic_file_aio_read detected this read-at-EOF condition and
> skipped the direct IO read entirely, returning 0. After that change, the
> read now reaches dio_generic, which detects the misalignment and returns
> EINVAL.
>
> This consolidates the generic direct-io to follow the same behavior of
> filesystems. Apparently, this fix will only affect ocfs2 since other
> filesystems do this verification before calling do_blockdev_direct_IO,
> with the exception of f2fs, which has the same bug, but is fixed in the
> next patch.
>
> it can be verified by a read loop on a file that does a partial read
> before EOF (On file that doesn't end at an aligned address). The
> following code fails on an unaligned file on filesystems without
> prior validation without this patch, but not on btrfs, ext4, and xfs.
>
> while (done < total) {
> ssize_t delta = pread(fd, buf + done, total - done, off + done);
> if (!delta)
> break;
> ...
> }
>
> Fix this regression by moving the misalignment check to after the EOF
> check added by commit 74cedf9b6c60 ("direct-io: Fix negative return from
> dio read beyond eof").
>
> Based on a patch by Jamie Liu.
>
> Reported-by: Jamie Liu <jamieliu@google.com>
> Signed-off-by: Gabriel Krisman Bertazi <krisman@collabora.com>
This patch also looks good except for the fail_dio jump...
Honza
> ---
> fs/direct-io.c | 16 ++++++++--------
> 1 file changed, 8 insertions(+), 8 deletions(-)
>
> diff --git a/fs/direct-io.c b/fs/direct-io.c
> index 43460c8e0f90..01131a1674b8 100644
> --- a/fs/direct-io.c
> +++ b/fs/direct-io.c
> @@ -1165,14 +1165,6 @@ do_blockdev_direct_IO(struct kiocb *iocb, struct inode *inode,
> * the early prefetch in the caller enough time.
> */
>
> - if (align & blocksize_mask) {
> - if (bdev)
> - blkbits = blksize_bits(bdev_logical_block_size(bdev));
> - blocksize_mask = (1 << blkbits) - 1;
> - if (align & blocksize_mask)
> - return -EINVAL;
> - }
> -
> /* watch out for a 0 len io from a tricksy fs */
> if (iov_iter_rw(iter) == READ && !count)
> return 0;
> @@ -1200,6 +1192,14 @@ do_blockdev_direct_IO(struct kiocb *iocb, struct inode *inode,
> goto fail_dio;
> }
>
> + if (align & blocksize_mask) {
> + if (bdev)
> + blkbits = blksize_bits(bdev_logical_block_size(bdev));
> + blocksize_mask = (1 << blkbits) - 1;
> + if (align & blocksize_mask)
> + goto fail_dio;
> + }
> +
> if (dio->flags & DIO_LOCKING && iov_iter_rw(iter) == READ) {
> struct address_space *mapping = iocb->ki_filp->f_mapping;
>
> --
> 2.28.0
>
--
Jan Kara <jack@suse.com>
SUSE Labs, CR
^ permalink raw reply [flat|nested] 7+ messages in thread