Re: [PATCH] do_direct_IO: Use inode->i_blkbits to compute block count to be cleaned
On Sun 08-01-17 20:17:10, Chandan Rajendra wrote: > The code currently uses sdio->blkbits to compute the number of blocks to > be cleaned. However sdio->blkbits is derived from the logical block size > of the underlying block device (Refer to the definition of > do_blockdev_direct_IO()). Due to this, generic/299 test would rarely > fail when executed on an ext4 filesystem with 64k as the block size and > when using a virtio based disk (having 512 byte as the logical block > size) inside a kvm guest. > > This commit fixes the bug by using inode->i_blkbits to compute the > number of blocks to be cleaned. Ah, good catch. You can add: Reviewed-by: Jan KaraHonza > Signed-off-by: Chandan Rajendra > --- > fs/direct-io.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/fs/direct-io.c b/fs/direct-io.c > index aeae8c0..b20adf9 100644 > --- a/fs/direct-io.c > +++ b/fs/direct-io.c > @@ -905,6 +905,7 @@ static inline void dio_zero_block(struct dio *dio, struct > dio_submit *sdio, > static int do_direct_IO(struct dio *dio, struct dio_submit *sdio, > struct buffer_head *map_bh) > { > + const unsigned i_blkbits = dio->inode->i_blkbits; > const unsigned blkbits = sdio->blkbits; > int ret = 0; > > @@ -949,7 +950,7 @@ static int do_direct_IO(struct dio *dio, struct > dio_submit *sdio, > clean_bdev_aliases( > map_bh->b_bdev, > map_bh->b_blocknr, > - map_bh->b_size >> blkbits); > + map_bh->b_size >> i_blkbits); > } > > if (!sdio->blkfactor) > -- > 2.5.5 > -- Jan Kara SUSE Labs, CR
Re: [PATCH] do_direct_IO: Use inode->i_blkbits to compute block count to be cleaned
Chandan Rajendrawrites: > The code currently uses sdio->blkbits to compute the number of blocks to > be cleaned. However sdio->blkbits is derived from the logical block size > of the underlying block device (Refer to the definition of > do_blockdev_direct_IO()). Due to this, generic/299 test would rarely > fail when executed on an ext4 filesystem with 64k as the block size and > when using a virtio based disk (having 512 byte as the logical block > size) inside a kvm guest. > > This commit fixes the bug by using inode->i_blkbits to compute the > number of blocks to be cleaned. > > Signed-off-by: Chandan Rajendra > --- > fs/direct-io.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/fs/direct-io.c b/fs/direct-io.c > index aeae8c0..b20adf9 100644 > --- a/fs/direct-io.c > +++ b/fs/direct-io.c > @@ -905,6 +905,7 @@ static inline void dio_zero_block(struct dio *dio, struct > dio_submit *sdio, > static int do_direct_IO(struct dio *dio, struct dio_submit *sdio, > struct buffer_head *map_bh) > { > + const unsigned i_blkbits = dio->inode->i_blkbits; NAK. Please see commit ab73857e354 ("direct-io: don't read inode->i_blkbits multiple times"). I think you want: const unsigned i_blkbits = sdio->blkbits + sdio->blkfactor; as is used elsewhere in the code. Cheers, Jeff
Re: [PATCH] do_direct_IO: Use inode->i_blkbits to compute block count to be cleaned
On 01/08/2017 07:47 AM, Chandan Rajendra wrote: > The code currently uses sdio->blkbits to compute the number of blocks to > be cleaned. However sdio->blkbits is derived from the logical block size > of the underlying block device (Refer to the definition of > do_blockdev_direct_IO()). Due to this, generic/299 test would rarely > fail when executed on an ext4 filesystem with 64k as the block size and > when using a virtio based disk (having 512 byte as the logical block > size) inside a kvm guest. > > This commit fixes the bug by using inode->i_blkbits to compute the > number of blocks to be cleaned. Thanks, added for 4.10. -- Jens Axboe
Re: [PATCH] do_direct_IO: Use inode->i_blkbits to compute block count to be cleaned
On Sun, Jan 08, 2017 at 08:17:10PM +0530, Chandan Rajendra wrote: > The code currently uses sdio->blkbits to compute the number of blocks to > be cleaned. However sdio->blkbits is derived from the logical block size > of the underlying block device (Refer to the definition of > do_blockdev_direct_IO()). Due to this, generic/299 test would rarely > fail when executed on an ext4 filesystem with 64k as the block size and > when using a virtio based disk (having 512 byte as the logical block > size) inside a kvm guest. > > This commit fixes the bug by using inode->i_blkbits to compute the > number of blocks to be cleaned. Looks fine, Reviewed-by: Christoph Hellwig