btrfs: Allow btrfs_truncate_block() to fallback to nocow for data space reservation
PATCH 1/1 btrfs: Allow btrfs_truncate_block() to fallback to nocow for data space reservation
[BUG]
When the data space is exhausted, even the inode has NOCOW attribute, btrfs will still refuse to truncate unaligned range due to ENOSPC.
The following script can reproduce it pretty easily:
#!/bin/bash
dev=/dev/test/test
mnt=/mnt/btrfs
umount $dev &> /dev/null
umount $mnt&> /dev/null
mkfs.btrfs -f $dev -b 1G
mount -o nospace_cache $dev $mnt
touch $mnt/foobar
chattr +C $mnt/foobar
xfs_io -f -c "pwrite -b 4k 0 4k" $mnt/foobar > /dev/null xfs_io -f -c "pwrite -b 4k 0 1G" $mnt/padding &> /dev/null sync
xfs_io -c "fpunch 0 2k" $mnt/foobar
umount $mnt
Current btrfs will fail at the fpunch part.
[CAUSE]
Because btrfs_truncate_block() always reserve space without checking the NOCOW attribute.
Since the writeback path follows NOCOW bit, we only need to bother the space reservation code in btrfs_truncate_block().
[FIX]
Make btrfs_truncate_block() to follow btrfs_buffered_write() to try to reserve data space first, and falls back to NOCOW check only when we don't have enough space.
Such always-try-reserve is an optimization introduced in btrfs_buffered_write(), to avoid expensive btrfs_check_can_nocow() call.
Since now check_can_nocow() is needed outside of inode.c, also export it and rename it to btrfs_check_can_nocow().
---
Test case will be submitted to fstests by the reporter.
--- fs/btrfs/ctree.h | 2 ++ fs/btrfs/file.c | 10 +++++----- fs/btrfs/inode.c | 41 ++++++++++++++++++++++++++++++++++------- 3 files changed, 41 insertions(+), 12 deletions(-)
fs/btrfs/ctree.h +2 -0
@@ -2954,6 +2954,8 @@ int btrfs_fdatawrite_range(struct inode *inode, loff_t start, loff_t end);loff_t btrfs_remap_file_range (struct file *file_in,loff_t pos_in,struct file *file_out,loff_t pos_out,loff_t len,unsigned int remap_flags); +int btrfs_check_can_nocow (struct btrfs_inode *inode,loff_t pos, +size_t *write_bytes);/* tree-defrag.c */ int btrfs_defrag_leaves(struct btrfs_trans_handle *trans,
fs/btrfs/file.c +5 -5
@@ -1544,8 +1544,8 @@ lock_and_cleanup_extent_if_need(struct btrfs_inode *inode, struct page **pages,return ret; } -static noinline int check_can_nocow(struct btrfs_inode *inode, loff_t pos, -size_t *write_bytes) +int btrfs_check_can_nocow (struct btrfs_inode *inode,loff_t pos, +size_t *write_bytes) {struct btrfs_fs_info *fs_info = inode->root->fs_info;struct btrfs_root *root = inode->root;
@@ -1645,8 +1645,8 @@ static noinline ssize_t btrfs_buffered_write(struct kiocb *iocb,if (ret <0 ) {if ((BTRFS_I (inode)->flags & (BTRFS_INODE_NODATACOW |BTRFS_INODE_PREALLOC )) && -check_can_nocow (BTRFS_I (inode), pos, - &write_bytes) >0 ) { +btrfs_check_can_nocow (BTRFS_I (inode), pos, + &write_bytes) >0 ) {/* * For nodata cow case, no need to reserve * data space.
@@ -1923,7 +1923,7 @@ static ssize_t btrfs_file_write_iter(struct kiocb *iocb,*/ if (!(BTRFS_I (inode)->flags & (BTRFS_INODE_NODATACOW |BTRFS_INODE_PREALLOC )) || -check_can_nocow (BTRFS_I (inode), pos, &count) <=0 ) { +btrfs_check_can_nocow (BTRFS_I (inode), pos, &count) <=0 ) {inode_unlock (inode);return -EAGAIN ; }
fs/btrfs/inode.c +34 -7
66 lines not on this page · raw message
Signature · 1 line
2.25.0
Quoted 43 lines · Qu Wenruo
[BUG]
When the data space is exhausted, even the inode has NOCOW attribute, btrfs will still refuse to truncate unaligned range due to ENOSPC.The following script can reproduce it pretty easily:
#!/bin/bashdev=/dev/test/test
mnt=/mnt/btrfsumount $dev &>
/dev/null
umount $mnt&>/dev/nullmkfs.btrfs -f $dev -b 1G
mount -onospace_cache$dev $mnt
touch $mnt/foobar
chattr +C $mnt/foobar
xfs_io-f -c "pwrite -b 4k 0 4k" $mnt/foobar >/dev/nullxfs_io-f -c "pwrite -b 4k 0 1G" $mnt/padding &>/dev/nullsync
xfs_io-c "fpunch 0 2k" $mnt/foobar
umount $mntCurrent btrfs will fail at the fpunch part.
[CAUSE]
Becausebtrfs_truncate_block()always reserve space without checking the NOCOW attribute.Since the writeback path follows NOCOW bit, we only need to bother the space reservation code in
btrfs_truncate_block().[FIX]
Makebtrfs_truncate_block()to followbtrfs_buffered_write()to try to reserve data space first, and falls back to NOCOW check only when we don't have enough space.Such always-try-reserve is an optimization introduced in
btrfs_buffered_write(), to avoid expensivebtrfs_check_can_nocow()call.
Quoted 7 lines
Since now
check_can_nocow()is needed outside ofinode.c, also export it and rename it tobtrfs_check_can_nocow().Reported-by Martin Doucha <[email protected]>Signed-off-by Qu Wenruo <[email protected]>---
Test case will be submitted to fstests by the reporter.
Well, this is a sudden change of mind, isn't it? :)
We had btrfs/172, which you removed very recently, that precisely tested this:
Even though there are several reasons why this can still fail (at writeback time), like regular buffered writes through the family of write() syscalls can, I think it's perfectly fine to have this behaviour.
So I think we can just resurrect btrfs/172 now...
Quoted 113 lines
--- fs/btrfs/ctree.h | 2 ++ fs/btrfs/file.c | 10 +++++----- fs/btrfs/inode.c | 41 ++++++++++++++++++++++++++++++++++------- 3 files changed, 41 insertions(+), 12 deletions(-)fs/btrfs/ctree.h +2
-0@@ -2954,6 +2954,8 @@ int btrfs_fdatawrite_range(struct inode *inode, loff_t start, loff_t end);loff_t btrfs_remap_file_range (struct file *file_in,loff_t pos_in,struct file *file_out,loff_t pos_out,loff_t len,unsigned int remap_flags); +int btrfs_check_can_nocow (struct btrfs_inode *inode,loff_t pos, +size_t *write_bytes);/* tree-defrag.c */ int btrfs_defrag_leaves(struct btrfs_trans_handle *trans,fs/btrfs/file.c +5
-5@@ -1544,8 +1544,8 @@ lock_and_cleanup_extent_if_need(struct btrfs_inode *inode, struct page **pages,return ret; } -static noinline int check_can_nocow(struct btrfs_inode *inode, loff_t pos, -size_t *write_bytes) +int btrfs_check_can_nocow (struct btrfs_inode *inode,loff_t pos, +size_t *write_bytes) {struct btrfs_fs_info *fs_info = inode->root->fs_info;struct btrfs_root *root = inode->root;@@ -1645,8 +1645,8 @@ static noinline ssize_t btrfs_buffered_write(struct kiocb *iocb,if (ret <0 ) {if ((BTRFS_I (inode)->flags & (BTRFS_INODE_NODATACOW |BTRFS_INODE_PREALLOC )) && -check_can_nocow (BTRFS_I (inode), pos, - &write_bytes) >0 ) { +btrfs_check_can_nocow (BTRFS_I (inode), pos, + &write_bytes) >0 ) {/* * For nodata cow case, no need to reserve * data space. @@ -1923,7 +1923,7 @@ static ssize_t btrfs_file_write_iter(struct kiocb *iocb,*/ if (!(BTRFS_I (inode)->flags & (BTRFS_INODE_NODATACOW |BTRFS_INODE_PREALLOC )) || -check_can_nocow (BTRFS_I (inode), pos, &count) <=0 ) { +btrfs_check_can_nocow (BTRFS_I (inode), pos, &count) <=0 ) {inode_unlock (inode);return -EAGAIN ; }fs/btrfs/inode.c +26
-4@@ -4974,11 +4974,13 @@ int btrfs_truncate_block(struct inode *inode, loff_t from, loff_t len,struct extent_state *cached_state =NULL ;struct extent_changeset *data_reserved =NULL ;char *kaddr; +bool only_release_metadata = false;u32 blocksize = fs_info->sectorsize;pgoff_t index = from >>PAGE_SHIFT ;unsigned offset = from & (blocksize -1 );struct page *page;gfp_t mask =btrfs_alloc_write_mask (mapping); +size_t write_bytes = blocksize;int ret =0 ;u64 block_start;u64 block_end;@@ -4990,11 +4992,26 @@ int btrfs_truncate_block(struct inode *inode, loff_t from, loff_t len, block_start =round_down (from, blocksize); block_end = block_start + blocksize -1 ; - ret =btrfs_delalloc_reserve_space (inode, &data_reserved, - block_start, blocksize); -if (ret) + ret =btrfs_check_data_free_space (inode, &data_reserved, block_start, + blocksize); +if (ret <0 ) { +if ((BTRFS_I (inode)->flags & (BTRFS_INODE_NODATACOW | +BTRFS_INODE_PREALLOC )) && +btrfs_check_can_nocow (BTRFS_I (inode), block_start, + &write_bytes) >0 ) { +/* For nocow case, no need to reserve data space. */ + only_release_metadata = true; + }else { + goto out; + } + } + ret =btrfs_delalloc_reserve_metadata (BTRFS_I (inode), blocksize); +if (ret <0 ) { +if (!only_release_metadata) +btrfs_free_reserved_data_space (inode, data_reserved, + block_start, blocksize); goto out; - + } again: page =find_or_create_page (mapping, index, mask);if (!page) {@@ -5063,10 +5080,20 @@ int btrfs_truncate_block(struct inode *inode, loff_t from, loff_t len,set_page_dirty (page);unlock_extent_cached (io_tree, block_start, block_end, &cached_state); +if (only_release_metadata) +set_extent_bit (&BTRFS_I (inode)->io_tree, block_start, + block_end,EXTENT_NORESERVE ,NULL ,NULL , +GFP_NOFS ); + out_unlock:
fs/btrfs/inode.c int btrfs_truncate_block(struct inode *inode, loff_t from, loff_t len, · line 5095
Quoted 10 lines
fs/btrfs/inode.c +7
-3-if (ret) -btrfs_delalloc_release_space (inode, data_reserved, block_start, - blocksize, true); +if (ret) { +if (!only_release_metadata) +btrfs_delalloc_release_space (inode, data_reserved, + block_start, blocksize, true); +else +btrfs_delalloc_release_metadata (BTRFS_I (inode), + blocksize, true);
I usually find it more intuitive to have it the other way around:
if (only_release_metadata)
...
else
...
E.g., positive case first, negative in the else branch. But that's likely too much of a personal preference.
Thanks.
Quoted 7 lines
fs/btrfs/inode.c +1
-1+ }btrfs_delalloc_release_extents (BTRFS_I (inode), blocksize);unlock_page (page);put_page (page); --2.25.0
Signature · 3 lines
Filipe David Manana, “Whether you think you can, or you think you can't — you're right.”
Quoted 52 lines · Filipe Manana
Quoted 43 lines · Qu Wenruo
[BUG]
When the data space is exhausted, even the inode has NOCOW attribute, btrfs will still refuse to truncate unaligned range due to ENOSPC.The following script can reproduce it pretty easily:
#!/bin/bashdev=/dev/test/test
mnt=/mnt/btrfsumount $dev &>
/dev/null
umount $mnt&>/dev/nullmkfs.btrfs -f $dev -b 1G
mount -onospace_cache$dev $mnt
touch $mnt/foobar
chattr +C $mnt/foobar
xfs_io-f -c "pwrite -b 4k 0 4k" $mnt/foobar >/dev/nullxfs_io-f -c "pwrite -b 4k 0 1G" $mnt/padding &>/dev/nullsync
xfs_io-c "fpunch 0 2k" $mnt/foobar
umount $mntCurrent btrfs will fail at the fpunch part.
[CAUSE]
Becausebtrfs_truncate_block()always reserve space without checking the NOCOW attribute.Since the writeback path follows NOCOW bit, we only need to bother the space reservation code in
btrfs_truncate_block().[FIX]
Makebtrfs_truncate_block()to followbtrfs_buffered_write()to try to reserve data space first, and falls back to NOCOW check only when we don't have enough space.Such always-try-reserve is an optimization introduced in
btrfs_buffered_write(), to avoid expensivebtrfs_check_can_nocow()call.Quoted 7 lines
Since now
check_can_nocow()is needed outside ofinode.c, also export it and rename it tobtrfs_check_can_nocow().Reported-by Martin Doucha <[email protected]>Signed-off-by Qu Wenruo <[email protected]>---
Test case will be submitted to fstests by the reporter.
Quoted 5 lines
Well, this is a sudden change of mind, isn't it? :)
We had btrfs/172, which you removed very recently, that precisely tested this:
I didn't notice the nodatacow mount option. Super duper big facepalm.
All my bad, especially feel sorry for Anand.
With nodatacow mount option there, that test case in fact makes a lot of sense.
Sorry again for that.
Anand, mind to resubmit it to generic group?
Thanks,
Qu
Quoted 155 lines
Even though there are several reasons why this can still fail (at writeback time), like regular buffered writes through the family of
write()syscalls can, I think it's perfectly fine to have this behaviour.Reviewed-by Filipe Manana <[email protected]>So I think we can just resurrect btrfs/172 now...
Quoted 113 lines
--- fs/btrfs/ctree.h | 2 ++ fs/btrfs/file.c | 10 +++++----- fs/btrfs/inode.c | 41 ++++++++++++++++++++++++++++++++++------- 3 files changed, 41 insertions(+), 12 deletions(-)fs/btrfs/ctree.h +2
-0@@ -2954,6 +2954,8 @@ int btrfs_fdatawrite_range(struct inode *inode, loff_t start, loff_t end);loff_t btrfs_remap_file_range (struct file *file_in,loff_t pos_in,struct file *file_out,loff_t pos_out,loff_t len,unsigned int remap_flags); +int btrfs_check_can_nocow (struct btrfs_inode *inode,loff_t pos, +size_t *write_bytes);/* tree-defrag.c */ int btrfs_defrag_leaves(struct btrfs_trans_handle *trans,fs/btrfs/file.c +5
-5@@ -1544,8 +1544,8 @@ lock_and_cleanup_extent_if_need(struct btrfs_inode *inode, struct page **pages,return ret; } -static noinline int check_can_nocow(struct btrfs_inode *inode, loff_t pos, -size_t *write_bytes) +int btrfs_check_can_nocow (struct btrfs_inode *inode,loff_t pos, +size_t *write_bytes) {struct btrfs_fs_info *fs_info = inode->root->fs_info;struct btrfs_root *root = inode->root;@@ -1645,8 +1645,8 @@ static noinline ssize_t btrfs_buffered_write(struct kiocb *iocb,if (ret <0 ) {if ((BTRFS_I (inode)->flags & (BTRFS_INODE_NODATACOW |BTRFS_INODE_PREALLOC )) && -check_can_nocow (BTRFS_I (inode), pos, - &write_bytes) >0 ) { +btrfs_check_can_nocow (BTRFS_I (inode), pos, + &write_bytes) >0 ) {/* * For nodata cow case, no need to reserve * data space. @@ -1923,7 +1923,7 @@ static ssize_t btrfs_file_write_iter(struct kiocb *iocb,*/ if (!(BTRFS_I (inode)->flags & (BTRFS_INODE_NODATACOW |BTRFS_INODE_PREALLOC )) || -check_can_nocow (BTRFS_I (inode), pos, &count) <=0 ) { +btrfs_check_can_nocow (BTRFS_I (inode), pos, &count) <=0 ) {inode_unlock (inode);return -EAGAIN ; }fs/btrfs/inode.c +26
-4@@ -4974,11 +4974,13 @@ int btrfs_truncate_block(struct inode *inode, loff_t from, loff_t len,struct extent_state *cached_state =NULL ;struct extent_changeset *data_reserved =NULL ;char *kaddr; +bool only_release_metadata = false;u32 blocksize = fs_info->sectorsize;pgoff_t index = from >>PAGE_SHIFT ;unsigned offset = from & (blocksize -1 );struct page *page;gfp_t mask =btrfs_alloc_write_mask (mapping); +size_t write_bytes = blocksize;int ret =0 ;u64 block_start;u64 block_end;@@ -4990,11 +4992,26 @@ int btrfs_truncate_block(struct inode *inode, loff_t from, loff_t len, block_start =round_down (from, blocksize); block_end = block_start + blocksize -1 ; - ret =btrfs_delalloc_reserve_space (inode, &data_reserved, - block_start, blocksize); -if (ret) + ret =btrfs_check_data_free_space (inode, &data_reserved, block_start, + blocksize); +if (ret <0 ) { +if ((BTRFS_I (inode)->flags & (BTRFS_INODE_NODATACOW | +BTRFS_INODE_PREALLOC )) && +btrfs_check_can_nocow (BTRFS_I (inode), block_start, + &write_bytes) >0 ) { +/* For nocow case, no need to reserve data space. */ + only_release_metadata = true; + }else { + goto out; + } + } + ret =btrfs_delalloc_reserve_metadata (BTRFS_I (inode), blocksize); +if (ret <0 ) { +if (!only_release_metadata) +btrfs_free_reserved_data_space (inode, data_reserved, + block_start, blocksize); goto out; - + } again: page =find_or_create_page (mapping, index, mask);if (!page) {@@ -5063,10 +5080,20 @@ int btrfs_truncate_block(struct inode *inode, loff_t from, loff_t len,set_page_dirty (page);unlock_extent_cached (io_tree, block_start, block_end, &cached_state); +if (only_release_metadata) +set_extent_bit (&BTRFS_I (inode)->io_tree, block_start, + block_end,EXTENT_NORESERVE ,NULL ,NULL , +GFP_NOFS ); + out_unlock:fs/btrfs/inode.c int btrfs_truncate_block(struct inode *inode, loff_t from, loff_t len, · line 5095
Quoted 10 lines
fs/btrfs/inode.c +7
-3-if (ret) -btrfs_delalloc_release_space (inode, data_reserved, block_start, - blocksize, true); +if (ret) { +if (!only_release_metadata) +btrfs_delalloc_release_space (inode, data_reserved, + block_start, blocksize, true); +else +btrfs_delalloc_release_metadata (BTRFS_I (inode), + blocksize, true);I usually find it more intuitive to have it the other way around:
if (
only_release_metadata)
...
else
...E.g., positive case first, negative in the else branch. But that's likely too much of a personal preference.
Thanks.
Quoted 7 lines
fs/btrfs/inode.c +1
-1+ }btrfs_delalloc_release_extents (BTRFS_I (inode), blocksize);unlock_page (page);put_page (page); --2.25.0
Quoted 64 lines · Qu Wenruo
Quoted 52 lines · Filipe Manana
Quoted 43 lines · Qu Wenruo
[BUG]
When the data space is exhausted, even the inode has NOCOW attribute, btrfs will still refuse to truncate unaligned range due to ENOSPC.The following script can reproduce it pretty easily:
#!/bin/bashdev=/dev/test/test
mnt=/mnt/btrfsumount $dev &>
/dev/null
umount $mnt&>/dev/nullmkfs.btrfs -f $dev -b 1G
mount -onospace_cache$dev $mnt
touch $mnt/foobar
chattr +C $mnt/foobar
xfs_io-f -c "pwrite -b 4k 0 4k" $mnt/foobar >/dev/nullxfs_io-f -c "pwrite -b 4k 0 1G" $mnt/padding &>/dev/nullsync
xfs_io-c "fpunch 0 2k" $mnt/foobar
umount $mntCurrent btrfs will fail at the fpunch part.
[CAUSE]
Becausebtrfs_truncate_block()always reserve space without checking the NOCOW attribute.Since the writeback path follows NOCOW bit, we only need to bother the space reservation code in
btrfs_truncate_block().[FIX]
Makebtrfs_truncate_block()to followbtrfs_buffered_write()to try to reserve data space first, and falls back to NOCOW check only when we don't have enough space.Such always-try-reserve is an optimization introduced in
btrfs_buffered_write(), to avoid expensivebtrfs_check_can_nocow()call.Quoted 7 lines
Since now
check_can_nocow()is needed outside ofinode.c, also export it and rename it tobtrfs_check_can_nocow().Reported-by Martin Doucha <[email protected]>Signed-off-by Qu Wenruo <[email protected]>---
Test case will be submitted to fstests by the reporter.Quoted 5 lines
Well, this is a sudden change of mind, isn't it? :)
We had btrfs/172, which you removed very recently, that precisely tested this:
I didn't notice the nodatacow mount option. Super duper big facepalm.
Quoted 7 lines
All my bad, especially feel sorry for Anand.
With nodatacow mount option there, that test case in fact makes a lot of sense.
Sorry again for that.Anand, mind to resubmit it to generic group?
Why the generic group?
The nodatacow mount option is btrfs specific, and most filesystems don't support chattr +C (ext4 for example).
Quoted 160 lines
Thanks,
QuQuoted 155 lines
Even though there are several reasons why this can still fail (at writeback time), like regular buffered writes through the family of
write()syscalls can, I think it's perfectly fine to have this behaviour.Reviewed-by Filipe Manana <[email protected]>So I think we can just resurrect btrfs/172 now...
Quoted 113 lines
--- fs/btrfs/ctree.h | 2 ++ fs/btrfs/file.c | 10 +++++----- fs/btrfs/inode.c | 41 ++++++++++++++++++++++++++++++++++------- 3 files changed, 41 insertions(+), 12 deletions(-)fs/btrfs/ctree.h +2
-0@@ -2954,6 +2954,8 @@ int btrfs_fdatawrite_range(struct inode *inode, loff_t start, loff_t end);loff_t btrfs_remap_file_range (struct file *file_in,loff_t pos_in,struct file *file_out,loff_t pos_out,loff_t len,unsigned int remap_flags); +int btrfs_check_can_nocow (struct btrfs_inode *inode,loff_t pos, +size_t *write_bytes);/* tree-defrag.c */ int btrfs_defrag_leaves(struct btrfs_trans_handle *trans,fs/btrfs/file.c +5
-5@@ -1544,8 +1544,8 @@ lock_and_cleanup_extent_if_need(struct btrfs_inode *inode, struct page **pages,return ret; } -static noinline int check_can_nocow(struct btrfs_inode *inode, loff_t pos, -size_t *write_bytes) +int btrfs_check_can_nocow (struct btrfs_inode *inode,loff_t pos, +size_t *write_bytes) {struct btrfs_fs_info *fs_info = inode->root->fs_info;struct btrfs_root *root = inode->root;@@ -1645,8 +1645,8 @@ static noinline ssize_t btrfs_buffered_write(struct kiocb *iocb,if (ret <0 ) {if ((BTRFS_I (inode)->flags & (BTRFS_INODE_NODATACOW |BTRFS_INODE_PREALLOC )) && -check_can_nocow (BTRFS_I (inode), pos, - &write_bytes) >0 ) { +btrfs_check_can_nocow (BTRFS_I (inode), pos, + &write_bytes) >0 ) {/* * For nodata cow case, no need to reserve * data space. @@ -1923,7 +1923,7 @@ static ssize_t btrfs_file_write_iter(struct kiocb *iocb,*/ if (!(BTRFS_I (inode)->flags & (BTRFS_INODE_NODATACOW |BTRFS_INODE_PREALLOC )) || -check_can_nocow (BTRFS_I (inode), pos, &count) <=0 ) { +btrfs_check_can_nocow (BTRFS_I (inode), pos, &count) <=0 ) {inode_unlock (inode);return -EAGAIN ; }fs/btrfs/inode.c +26
-4@@ -4974,11 +4974,13 @@ int btrfs_truncate_block(struct inode *inode, loff_t from, loff_t len,struct extent_state *cached_state =NULL ;struct extent_changeset *data_reserved =NULL ;char *kaddr; +bool only_release_metadata = false;u32 blocksize = fs_info->sectorsize;pgoff_t index = from >>PAGE_SHIFT ;unsigned offset = from & (blocksize -1 );struct page *page;gfp_t mask =btrfs_alloc_write_mask (mapping); +size_t write_bytes = blocksize;int ret =0 ;u64 block_start;u64 block_end;@@ -4990,11 +4992,26 @@ int btrfs_truncate_block(struct inode *inode, loff_t from, loff_t len, block_start =round_down (from, blocksize); block_end = block_start + blocksize -1 ; - ret =btrfs_delalloc_reserve_space (inode, &data_reserved, - block_start, blocksize); -if (ret) + ret =btrfs_check_data_free_space (inode, &data_reserved, block_start, + blocksize); +if (ret <0 ) { +if ((BTRFS_I (inode)->flags & (BTRFS_INODE_NODATACOW | +BTRFS_INODE_PREALLOC )) && +btrfs_check_can_nocow (BTRFS_I (inode), block_start, + &write_bytes) >0 ) { +/* For nocow case, no need to reserve data space. */ + only_release_metadata = true; + }else { + goto out; + } + } + ret =btrfs_delalloc_reserve_metadata (BTRFS_I (inode), blocksize); +if (ret <0 ) { +if (!only_release_metadata) +btrfs_free_reserved_data_space (inode, data_reserved, + block_start, blocksize); goto out; - + } again: page =find_or_create_page (mapping, index, mask);if (!page) {@@ -5063,10 +5080,20 @@ int btrfs_truncate_block(struct inode *inode, loff_t from, loff_t len,set_page_dirty (page);unlock_extent_cached (io_tree, block_start, block_end, &cached_state); +if (only_release_metadata) +set_extent_bit (&BTRFS_I (inode)->io_tree, block_start, + block_end,EXTENT_NORESERVE ,NULL ,NULL , +GFP_NOFS ); + out_unlock:fs/btrfs/inode.c int btrfs_truncate_block(struct inode *inode, loff_t from, loff_t len, · line 5095
Quoted 10 lines
fs/btrfs/inode.c +7
-3-if (ret) -btrfs_delalloc_release_space (inode, data_reserved, block_start, - blocksize, true); +if (ret) { +if (!only_release_metadata) +btrfs_delalloc_release_space (inode, data_reserved, + block_start, blocksize, true); +else +btrfs_delalloc_release_metadata (BTRFS_I (inode), + blocksize, true);I usually find it more intuitive to have it the other way around:
if (
only_release_metadata)
...
else
...E.g., positive case first, negative in the else branch. But that's likely too much of a personal preference.
Thanks.
Quoted 7 lines
fs/btrfs/inode.c +1
-1+ }btrfs_delalloc_release_extents (BTRFS_I (inode), blocksize);unlock_page (page);put_page (page); --2.25.0
Signature · 3 lines
Filipe David Manana, “Whether you think you can, or you think you can't — you're right.”
Quoted 67 lines · Filipe Manana
Quoted 66 lines · Qu Wenruo
Quoted 52 lines · Filipe Manana
Quoted 43 lines · Qu Wenruo
[BUG]
When the data space is exhausted, even the inode has NOCOW attribute, btrfs will still refuse to truncate unaligned range due to ENOSPC.The following script can reproduce it pretty easily:
#!/bin/bashdev=/dev/test/test
mnt=/mnt/btrfsumount $dev &>
/dev/null
umount $mnt&>/dev/nullmkfs.btrfs -f $dev -b 1G
mount -onospace_cache$dev $mnt
touch $mnt/foobar
chattr +C $mnt/foobar
xfs_io-f -c "pwrite -b 4k 0 4k" $mnt/foobar >/dev/nullxfs_io-f -c "pwrite -b 4k 0 1G" $mnt/padding &>/dev/nullsync
xfs_io-c "fpunch 0 2k" $mnt/foobar
umount $mntCurrent btrfs will fail at the fpunch part.
[CAUSE]
Becausebtrfs_truncate_block()always reserve space without checking the NOCOW attribute.Since the writeback path follows NOCOW bit, we only need to bother the space reservation code in
btrfs_truncate_block().[FIX]
Makebtrfs_truncate_block()to followbtrfs_buffered_write()to try to reserve data space first, and falls back to NOCOW check only when we don't have enough space.Such always-try-reserve is an optimization introduced in
btrfs_buffered_write(), to avoid expensivebtrfs_check_can_nocow()call.Quoted 7 lines
Since now
check_can_nocow()is needed outside ofinode.c, also export it and rename it tobtrfs_check_can_nocow().Reported-by Martin Doucha <[email protected]>Signed-off-by Qu Wenruo <[email protected]>---
Test case will be submitted to fstests by the reporter.Quoted 5 lines
Well, this is a sudden change of mind, isn't it? :)
We had btrfs/172, which you removed very recently, that precisely tested this:
I didn't notice the nodatacow mount option. Super duper big facepalm.
All my bad, especially feel sorry for Anand.
Quoted 7 lines
Quoted 5 lines
With nodatacow mount option there, that test case in fact makes a lot of sense.
Sorry again for that.Anand, mind to resubmit it to generic group?
Why the generic group?
Since all other fses should have the same behavior.
Either it supports COW, and get disabled by that chattr, and go ahead. Or it doesn't support COW, the truncate should go overwrite directly with or without that chattr +C.
Quoted 2 lines
The nodatacow mount option is btrfs specific, and most filesystems don't support chattr +C (ext4 for example).
We can just ignore the chattr call for unsupported fs, and go ahead without any problem.
Thanks,
Qu
Quoted 163 lines
Quoted 161 lines
Thanks,
QuQuoted 155 lines
Even though there are several reasons why this can still fail (at writeback time), like regular buffered writes through the family of
write()syscalls can, I think it's perfectly fine to have this behaviour.Reviewed-by Filipe Manana <[email protected]>So I think we can just resurrect btrfs/172 now...
Quoted 113 lines
--- fs/btrfs/ctree.h | 2 ++ fs/btrfs/file.c | 10 +++++----- fs/btrfs/inode.c | 41 ++++++++++++++++++++++++++++++++++------- 3 files changed, 41 insertions(+), 12 deletions(-)fs/btrfs/ctree.h +2
-0@@ -2954,6 +2954,8 @@ int btrfs_fdatawrite_range(struct inode *inode, loff_t start, loff_t end);loff_t btrfs_remap_file_range (struct file *file_in,loff_t pos_in,struct file *file_out,loff_t pos_out,loff_t len,unsigned int remap_flags); +int btrfs_check_can_nocow (struct btrfs_inode *inode,loff_t pos, +size_t *write_bytes);/* tree-defrag.c */ int btrfs_defrag_leaves(struct btrfs_trans_handle *trans,fs/btrfs/file.c +5
-5@@ -1544,8 +1544,8 @@ lock_and_cleanup_extent_if_need(struct btrfs_inode *inode, struct page **pages,return ret; } -static noinline int check_can_nocow(struct btrfs_inode *inode, loff_t pos, -size_t *write_bytes) +int btrfs_check_can_nocow (struct btrfs_inode *inode,loff_t pos, +size_t *write_bytes) {struct btrfs_fs_info *fs_info = inode->root->fs_info;struct btrfs_root *root = inode->root;@@ -1645,8 +1645,8 @@ static noinline ssize_t btrfs_buffered_write(struct kiocb *iocb,if (ret <0 ) {if ((BTRFS_I (inode)->flags & (BTRFS_INODE_NODATACOW |BTRFS_INODE_PREALLOC )) && -check_can_nocow (BTRFS_I (inode), pos, - &write_bytes) >0 ) { +btrfs_check_can_nocow (BTRFS_I (inode), pos, + &write_bytes) >0 ) {/* * For nodata cow case, no need to reserve * data space. @@ -1923,7 +1923,7 @@ static ssize_t btrfs_file_write_iter(struct kiocb *iocb,*/ if (!(BTRFS_I (inode)->flags & (BTRFS_INODE_NODATACOW |BTRFS_INODE_PREALLOC )) || -check_can_nocow (BTRFS_I (inode), pos, &count) <=0 ) { +btrfs_check_can_nocow (BTRFS_I (inode), pos, &count) <=0 ) {inode_unlock (inode);return -EAGAIN ; }fs/btrfs/inode.c +26
-4@@ -4974,11 +4974,13 @@ int btrfs_truncate_block(struct inode *inode, loff_t from, loff_t len,struct extent_state *cached_state =NULL ;struct extent_changeset *data_reserved =NULL ;char *kaddr; +bool only_release_metadata = false;u32 blocksize = fs_info->sectorsize;pgoff_t index = from >>PAGE_SHIFT ;unsigned offset = from & (blocksize -1 );struct page *page;gfp_t mask =btrfs_alloc_write_mask (mapping); +size_t write_bytes = blocksize;int ret =0 ;u64 block_start;u64 block_end;@@ -4990,11 +4992,26 @@ int btrfs_truncate_block(struct inode *inode, loff_t from, loff_t len, block_start =round_down (from, blocksize); block_end = block_start + blocksize -1 ; - ret =btrfs_delalloc_reserve_space (inode, &data_reserved, - block_start, blocksize); -if (ret) + ret =btrfs_check_data_free_space (inode, &data_reserved, block_start, + blocksize); +if (ret <0 ) { +if ((BTRFS_I (inode)->flags & (BTRFS_INODE_NODATACOW | +BTRFS_INODE_PREALLOC )) && +btrfs_check_can_nocow (BTRFS_I (inode), block_start, + &write_bytes) >0 ) { +/* For nocow case, no need to reserve data space. */ + only_release_metadata = true; + }else { + goto out; + } + } + ret =btrfs_delalloc_reserve_metadata (BTRFS_I (inode), blocksize); +if (ret <0 ) { +if (!only_release_metadata) +btrfs_free_reserved_data_space (inode, data_reserved, + block_start, blocksize); goto out; - + } again: page =find_or_create_page (mapping, index, mask);if (!page) {@@ -5063,10 +5080,20 @@ int btrfs_truncate_block(struct inode *inode, loff_t from, loff_t len,set_page_dirty (page);unlock_extent_cached (io_tree, block_start, block_end, &cached_state); +if (only_release_metadata) +set_extent_bit (&BTRFS_I (inode)->io_tree, block_start, + block_end,EXTENT_NORESERVE ,NULL ,NULL , +GFP_NOFS ); + out_unlock:fs/btrfs/inode.c int btrfs_truncate_block(struct inode *inode, loff_t from, loff_t len, · line 5095
Quoted 10 lines
fs/btrfs/inode.c +7
-3-if (ret) -btrfs_delalloc_release_space (inode, data_reserved, block_start, - blocksize, true); +if (ret) { +if (!only_release_metadata) +btrfs_delalloc_release_space (inode, data_reserved, + block_start, blocksize, true); +else +btrfs_delalloc_release_metadata (BTRFS_I (inode), + blocksize, true);I usually find it more intuitive to have it the other way around:
if (
only_release_metadata)
...
else
...E.g., positive case first, negative in the else branch. But that's likely too much of a personal preference.
Thanks.
Quoted 7 lines
fs/btrfs/inode.c +1
-1+ }btrfs_delalloc_release_extents (BTRFS_I (inode), blocksize);unlock_page (page);put_page (page); --2.25.0
Anand Jain
Tested-byQuoted 68 lines · Qu Wenruo
Quoted 65 lines · Filipe Manana
Quoted 64 lines · Qu Wenruo
Quoted 52 lines · Filipe Manana
Quoted 43 lines · Qu Wenruo
[BUG]
When the data space is exhausted, even the inode has NOCOW attribute, btrfs will still refuse to truncate unaligned range due to ENOSPC.The following script can reproduce it pretty easily:
#!/bin/bashdev=/dev/test/test
mnt=/mnt/btrfsumount $dev &>
/dev/null
umount $mnt&>/dev/nullmkfs.btrfs -f $dev -b 1G
mount -onospace_cache$dev $mnt
touch $mnt/foobar
chattr +C $mnt/foobar
xfs_io-f -c "pwrite -b 4k 0 4k" $mnt/foobar >/dev/nullxfs_io-f -c "pwrite -b 4k 0 1G" $mnt/padding &>/dev/nullsync
xfs_io-c "fpunch 0 2k" $mnt/foobar
umount $mntCurrent btrfs will fail at the fpunch part.
[CAUSE]
Becausebtrfs_truncate_block()always reserve space without checking the NOCOW attribute.Since the writeback path follows NOCOW bit, we only need to bother the space reservation code in
btrfs_truncate_block().[FIX]
Makebtrfs_truncate_block()to followbtrfs_buffered_write()to try to reserve data space first, and falls back to NOCOW check only when we don't have enough space.Such always-try-reserve is an optimization introduced in
btrfs_buffered_write(), to avoid expensivebtrfs_check_can_nocow()call.Quoted 7 lines
Since now
check_can_nocow()is needed outside ofinode.c, also export it and rename it tobtrfs_check_can_nocow().Reported-by Martin Doucha <[email protected]>Signed-off-by Qu Wenruo <[email protected]>---
Test case will be submitted to fstests by the reporter.Quoted 5 lines
Well, this is a sudden change of mind, isn't it? :)
We had btrfs/172, which you removed very recently, that precisely tested this:
I didn't notice the nodatacow mount option. Super duper big facepalm.
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
All my bad, especially feel sorry for Anand.
With nodatacow mount option there, that test case in fact makes a lot of sense.
Sorry again for that.Anand, mind to resubmit it to generic group?
Lets restore it step by step. Patch sent to restore. You may like bring it to generic.
Thanks, Anand
Quoted 182 lines
Quoted 1 line
Why the generic group?
Since all other fses should have the same behavior.
Either it supports COW, and get disabled by that chattr, and go ahead. Or it doesn't support COW, the truncate should go overwrite directly with or without that chattr +C.Quoted 2 lines
The nodatacow mount option is btrfs specific, and most filesystems don't support chattr +C (ext4 for example).
We can just ignore the chattr call for unsupported fs, and go ahead without any problem.
Thanks,
QuQuoted 163 lines
Quoted 161 lines
Thanks,
QuQuoted 155 lines
Even though there are several reasons why this can still fail (at writeback time), like regular buffered writes through the family of
write()syscalls can, I think it's perfectly fine to have this behaviour.Reviewed-by Filipe Manana <[email protected]>So I think we can just resurrect btrfs/172 now...
Quoted 113 lines
--- fs/btrfs/ctree.h | 2 ++ fs/btrfs/file.c | 10 +++++----- fs/btrfs/inode.c | 41 ++++++++++++++++++++++++++++++++++------- 3 files changed, 41 insertions(+), 12 deletions(-)fs/btrfs/ctree.h +2
-0@@ -2954,6 +2954,8 @@ int btrfs_fdatawrite_range(struct inode *inode, loff_t start, loff_t end);loff_t btrfs_remap_file_range (struct file *file_in,loff_t pos_in,struct file *file_out,loff_t pos_out,loff_t len,unsigned int remap_flags); +int btrfs_check_can_nocow (struct btrfs_inode *inode,loff_t pos, +size_t *write_bytes);/* tree-defrag.c */ int btrfs_defrag_leaves(struct btrfs_trans_handle *trans,fs/btrfs/file.c +5
-5@@ -1544,8 +1544,8 @@ lock_and_cleanup_extent_if_need(struct btrfs_inode *inode, struct page **pages,return ret; } -static noinline int check_can_nocow(struct btrfs_inode *inode, loff_t pos, -size_t *write_bytes) +int btrfs_check_can_nocow (struct btrfs_inode *inode,loff_t pos, +size_t *write_bytes) {struct btrfs_fs_info *fs_info = inode->root->fs_info;struct btrfs_root *root = inode->root;@@ -1645,8 +1645,8 @@ static noinline ssize_t btrfs_buffered_write(struct kiocb *iocb,if (ret <0 ) {if ((BTRFS_I (inode)->flags & (BTRFS_INODE_NODATACOW |BTRFS_INODE_PREALLOC )) && -check_can_nocow (BTRFS_I (inode), pos, - &write_bytes) >0 ) { +btrfs_check_can_nocow (BTRFS_I (inode), pos, + &write_bytes) >0 ) {/* * For nodata cow case, no need to reserve * data space. @@ -1923,7 +1923,7 @@ static ssize_t btrfs_file_write_iter(struct kiocb *iocb,*/ if (!(BTRFS_I (inode)->flags & (BTRFS_INODE_NODATACOW |BTRFS_INODE_PREALLOC )) || -check_can_nocow (BTRFS_I (inode), pos, &count) <=0 ) { +btrfs_check_can_nocow (BTRFS_I (inode), pos, &count) <=0 ) {inode_unlock (inode);return -EAGAIN ; }fs/btrfs/inode.c +26
-4@@ -4974,11 +4974,13 @@ int btrfs_truncate_block(struct inode *inode, loff_t from, loff_t len,struct extent_state *cached_state =NULL ;struct extent_changeset *data_reserved =NULL ;char *kaddr; +bool only_release_metadata = false;u32 blocksize = fs_info->sectorsize;pgoff_t index = from >>PAGE_SHIFT ;unsigned offset = from & (blocksize -1 );struct page *page;gfp_t mask =btrfs_alloc_write_mask (mapping); +size_t write_bytes = blocksize;int ret =0 ;u64 block_start;u64 block_end;@@ -4990,11 +4992,26 @@ int btrfs_truncate_block(struct inode *inode, loff_t from, loff_t len, block_start =round_down (from, blocksize); block_end = block_start + blocksize -1 ; - ret =btrfs_delalloc_reserve_space (inode, &data_reserved, - block_start, blocksize); -if (ret) + ret =btrfs_check_data_free_space (inode, &data_reserved, block_start, + blocksize); +if (ret <0 ) { +if ((BTRFS_I (inode)->flags & (BTRFS_INODE_NODATACOW | +BTRFS_INODE_PREALLOC )) && +btrfs_check_can_nocow (BTRFS_I (inode), block_start, + &write_bytes) >0 ) { +/* For nocow case, no need to reserve data space. */ + only_release_metadata = true; + }else { + goto out; + } + } + ret =btrfs_delalloc_reserve_metadata (BTRFS_I (inode), blocksize); +if (ret <0 ) { +if (!only_release_metadata) +btrfs_free_reserved_data_space (inode, data_reserved, + block_start, blocksize); goto out; - + } again: page =find_or_create_page (mapping, index, mask);if (!page) {@@ -5063,10 +5080,20 @@ int btrfs_truncate_block(struct inode *inode, loff_t from, loff_t len,set_page_dirty (page);unlock_extent_cached (io_tree, block_start, block_end, &cached_state); +if (only_release_metadata) +set_extent_bit (&BTRFS_I (inode)->io_tree, block_start, + block_end,EXTENT_NORESERVE ,NULL ,NULL , +GFP_NOFS ); + out_unlock:fs/btrfs/inode.c int btrfs_truncate_block(struct inode *inode, loff_t from, loff_t len, · line 5095
Quoted 10 lines
fs/btrfs/inode.c +7
-3-if (ret) -btrfs_delalloc_release_space (inode, data_reserved, block_start, - blocksize, true); +if (ret) { +if (!only_release_metadata) +btrfs_delalloc_release_space (inode, data_reserved, + block_start, blocksize, true); +else +btrfs_delalloc_release_metadata (BTRFS_I (inode), + blocksize, true);I usually find it more intuitive to have it the other way around:
if (
only_release_metadata)
...
else
...E.g., positive case first, negative in the else branch. But that's likely too much of a personal preference.
Thanks.
Quoted 7 lines
fs/btrfs/inode.c +1
-1+ }btrfs_delalloc_release_extents (BTRFS_I (inode), blocksize);unlock_page (page);put_page (page); --2.25.0