btrfs-progs: Port kernel fs_devices::total_rw_bytes to btrfs-progs
PATCH 1/2 btrfs-progs: Port kernel fs_devices::total_rw_bytes to btrfs-progs
Unlike kernel, btrfs-progs doesn't (yet) support devices grow/shrink, the port only needs to handle open_ctree() time initialization (at read_one_dev()), and btrfs_add_device() used for mkfs.
This provide the basis for incoming unification of chunk allocator behavior.
--- volumes.c | 3 +++ volumes.h | 3 +++ 2 files changed, 6 insertions(+)
volumes.c +3 -0
@@ -744,6 +744,7 @@ int btrfs_add_device(struct btrfs_trans_handle *trans,write_extent_buffer (leaf, fs_info->fs_devices->metadata_uuid, ptr,BTRFS_UUID_SIZE );btrfs_mark_buffer_dirty (leaf); + fs_info->fs_devices->total_rw_bytes += device->total_bytes; ret =0 ; out:
@@ -2060,6 +2061,8 @@ static int read_one_dev(struct btrfs_fs_info *fs_info,fill_device_from_item (leaf, dev_item, device); device->dev_root = fs_info->dev_root; + fs_info->fs_devices->total_rw_bytes += +btrfs_device_total_bytes (leaf, dev_item);return ret; }
volumes.h +3 -0
@@ -77,6 +77,9 @@ struct btrfs_fs_devices {u64 latest_devid;u64 latest_trans;u64 lowest_devid; + +u64 total_rw_bytes; +int latest_bdev;int lowest_bdev;struct list_head devices;
Signature · 1 line
2.20.1
PATCH 2/2 btrfs-progs: Unify metadata chunk size with kernel
Mkfs tends to create pretty large metadata chunk compared to kernel:
Node size: 16384
Sector size: 4096
Filesystem size: 10.00GiB
Block group profiles:
Data: single 8.00MiB
Metadata: DUP 1.00GiB
System: DUP 8.00MiBWhile kernel only tends to create 256MiB metadata chunk:
/* for larger filesystems, use larger metadata chunks */ if (fs_devices->total_rw_bytes > 50ULL * SZ_1G) max_stripe_size = SZ_1G; else max_stripe_size = SZ_256M;
This won't cause problems in real world, but it's still better to make the behavior unified.
--- volumes.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
volumes.c +6 -2
@@ -989,8 +989,12 @@ int btrfs_alloc_chunk(struct btrfs_trans_handle *trans, min_stripe_size =SZ_64M ; max_stripes =BTRFS_MAX_DEVS (info); }else if (type &BTRFS_BLOCK_GROUP_METADATA ) { - calc_size =SZ_1G ; - max_chunk_size =4 * calc_size; +/* for larger filesystems, use larger metadata chunks */ +if (info->fs_devices->total_rw_bytes >50ULL *SZ_1G ) + max_chunk_size =SZ_1G ; +else + max_chunk_size =SZ_256M ; + calc_size = max_chunk_size; min_stripe_size =SZ_32M ; max_stripes =BTRFS_MAX_DEVS (info); }
Signature · 1 line
2.20.1
Quoted 8 lines · Qu Wenruo
Unlike kernel, btrfs-progs doesn't (yet) support devices grow/shrink, the port only needs to handle
open_ctree()time initialization (atread_one_dev()), andbtrfs_add_device()used for mkfs.This provide the basis for incoming unification of chunk allocator behavior.
Signed-off-by Qu Wenruo <[email protected]>
1 and 2 applied, thanks.