btrfs: fix qgroup reserve overflow break the qgroup limit
PATCH 1/1 btrfs: fix qgroup reserve overflow break the qgroup limit
We use extent_changeset->bytes_changed in qgroup_reserve_data() to record how many bytes we set for EXTENT_QGROUP_RESERVED state. Currently the bytes_changed is set as "unsigned int", and it will overflow if we try to fallocate a range larger than 4GiB. The result is we reserve less bytes and eventually break the qgroup limit.
The following example test script reproduces the problem:
$ cat qgroup-overflow.sh #!/bin/bash
DEV=/dev/sdj
MNT=/mnt/sdj
mkfs.btrfs -f $DEV
mount $DEV $MNT
# Set qgroup limit to 2GiB.
btrfs quota enable $MNT
btrfs qgroup limit 2G $MNT
# Try to fallocate a 3GiB file. This should fail. echo
echo "Try to fallocate a 3GiB file..." fallocate -l 3G $MNT/3G.file
# Try to fallocate a 5GiB file.
echo
echo "Try to fallocate a 5GiB file..."
fallocate -l 5G $MNT/5G.file
# See we break the qgroup limit.
echo
sync
btrfs qgroup show -r $MNT
umount $MNT
When running the test:
$ ./qgroup-overflow.sh (...)
Try to fallocate a 3GiB file...
fallocate: fallocate failed: Disk quota exceeded
Try to fallocate a 5GiB file...
qgroupid rfer excl max_rfer
-------- ---- ---- --------
0/5 5.00GiB 5.00GiB 2.00GiB
Since we have no control of how bytes_changed is used, it's better to set it to u64.
--- fs/btrfs/extent_io.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/btrfs/extent_io.h +1 -1
@@ -118,7 +118,7 @@ struct btrfs_bio_ctrl {*/ struct extent_changeset {/* How many bytes are set/cleared in this operation */ -unsigned int bytes_changed; +u64 bytes_changed;/* Changed ranges */ struct ulist range_changed;
Signature · 1 line
2.17.1
Quoted 65 lines · ethanlien
We use
extent_changeset->bytes_changedinqgroup_reserve_data()to record how many bytes we set forEXTENT_QGROUP_RESERVEDstate. Currently thebytes_changedis set as "unsigned int", and it will overflow if we try to fallocate a range larger than 4GiB. The result is we reserve less bytes and eventually break the qgroup limit.The following example test script reproduces the problem:
$ cat qgroup-overflow.sh #!/bin/bashDEV=/dev/sdj
MNT=/mnt/sdjmkfs.btrfs -f $DEV
mount $DEV $MNT# Set qgroup limit to 2GiB.
btrfs quota enable $MNT
btrfs qgroup limit 2G $MNT# Try to fallocate a 3GiB file. This should fail. echo
echo "Try to fallocate a 3GiB file..." fallocate -l 3G $MNT/3G.file# Try to fallocate a 5GiB file.
echo
echo "Try to fallocate a 5GiB file..."
fallocate -l 5G $MNT/5G.file# See we break the qgroup limit.
echo
sync
btrfs qgroup show -r $MNTumount $MNT
When running the test:
$ ./qgroup-overflow.sh (...)Try to fallocate a 3GiB file...
fallocate: fallocate failed: Disk quota exceededTry to fallocate a 5GiB file...
qgroupid rfer excl
max_rfer-------- ---- ---- -------- 0/5 5.00GiB 5.00GiB 2.00GiBSince we have no control of how
bytes_changedis used, it's better to set it to u64.Signed-off-by ethanlien <[email protected]>--- fs/btrfs/extent_io.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)fs/btrfs/extent_io.h +0
-0
fs/btrfs/extent_io.h struct btrfs_bio_ctrl { · line 121
Quoted 5 lines
fs/btrfs/extent_io.h +1
-1@@ -118,7 +118,7 @@ struct btrfs_bio_ctrl {*/ struct extent_changeset {/* How many bytes are set/cleared in this operation */ -unsigned int bytes_changed; +u64 bytes_changed;
Oh, falloc...
Unlike regular buffered/direct write, which we use one changeset for each ordered extent, which can never be larger than 256M.
For fallocate, we use one changeset for the whole range, thus it no longer respects the 256M per extent limit, and caused the problem.
Nice fix and reproducer.
Feel free to submit the reproducer as a test case in xfstests.
Thanks,
Qu
Quoted 3 lines
fs/btrfs/extent_io.h +0
-0/* Changed ranges */ struct ulist range_changed;
Quoted 48 lines · ethanlien
We use
extent_changeset->bytes_changedinqgroup_reserve_data()to record how many bytes we set forEXTENT_QGROUP_RESERVEDstate. Currently thebytes_changedis set as "unsigned int", and it will overflow if we try to fallocate a range larger than 4GiB. The result is we reserve less bytes and eventually break the qgroup limit.The following example test script reproduces the problem:
$ cat qgroup-overflow.sh #!/bin/bashDEV=/dev/sdj
MNT=/mnt/sdjmkfs.btrfs -f $DEV
mount $DEV $MNT# Set qgroup limit to 2GiB.
btrfs quota enable $MNT
btrfs qgroup limit 2G $MNT# Try to fallocate a 3GiB file. This should fail. echo
echo "Try to fallocate a 3GiB file..." fallocate -l 3G $MNT/3G.file# Try to fallocate a 5GiB file.
echo
echo "Try to fallocate a 5GiB file..."
fallocate -l 5G $MNT/5G.file# See we break the qgroup limit.
echo
sync
btrfs qgroup show -r $MNTumount $MNT
When running the test:
$ ./qgroup-overflow.sh (...)Try to fallocate a 3GiB file...
fallocate: fallocate failed: Disk quota exceededTry to fallocate a 5GiB file...
Quoted 8 lines
qgroupid rfer excl
max_rfer
-------- ---- ---- --------
0/5 5.00GiB 5.00GiB 2.00GiBSince we have no control of how
bytes_changedis used, it's better to set it to u64.Signed-off-by ethanlien <[email protected]>
Added to misc-next, thanks.