btrfs: migrate tracking read blocks from fs_devices to
cover btrfs: migrate tracking read blocks from fs_devices to
David reported btrfs/161 failing during sprouted filesystem unmount. Bisected to commit 49136a74162e ("btrfs: add tracking of read blocks for read policy"). Now, tracking is moved from fs_devices to fs_info.
Tested to be working fine.
-----
FSTYP -- btrfs PLATFORM -- Linux/aarch64 local 6.13.0-rc6+ #45 SMP PREEMPT_DYNAMIC Thu Jan 9 04:04:07 +08 2025 MKFS_OPTIONS -- /dev/sdb
MOUNT_OPTIONS -- -o context=system_u:object_r:root_t:s0 /dev/sdb /mnt/scratch
btrfs/161 0s ... 0s
Ran: btrfs/161
Passed all 1 tests
------
Patches should be folded into their respective commits. Thx.
Anand Jain (2):
fixup: btrfs: add tracking of read blocks for read policy
fixup: btrfs: introduce RAID1 round-robin read balancing
fs/btrfs/bio.c | 2 +- fs/btrfs/disk-io.c | 5 +++++ fs/btrfs/fs.h | 3 +++ fs/btrfs/volumes.c | 17 ++++++----------- fs/btrfs/volumes.h | 3 --- 5 files changed, 15 insertions(+), 15 deletions(-)
Signature · 1 line
2.47.0
PATCH 1/2 fixup: btrfs: add tracking of read blocks for read policy
Move stats_read_blocks from btrfs_fs_devices to btrfs_fs_info and its init and destroy.
This is based on the for-next branch in the repo github.com/btrfs/linux.git.
--- fs/btrfs/bio.c | 2 +- fs/btrfs/disk-io.c | 5 +++++ fs/btrfs/fs.h | 3 +++ fs/btrfs/volumes.c | 6 ------ fs/btrfs/volumes.h | 3 --- 5 files changed, 9 insertions(+), 10 deletions(-)
fs/btrfs/bio.c +1 -1
@@ -458,7 +458,7 @@ static void btrfs_submit_dev_bio(struct btrfs_device *dev, struct bio *bio)* filesystem is fully initialized. */ if (dev->fs_devices->collect_fs_stats &&bio_op (bio) ==REQ_OP_READ && dev->fs_info) -percpu_counter_add (&dev->fs_devices->stats_read_blocks, +percpu_counter_add (&dev->fs_info->stats_read_blocks, bio->bi_iter.bi_size >> dev->fs_info->sectorsize_bits);if (bio->bi_opf &REQ_BTRFS_CGROUP_PUNT )
fs/btrfs/disk-io.c +5 -0
@@ -1258,6 +1258,7 @@ void btrfs_free_fs_info(struct btrfs_fs_info *fs_info) {struct percpu_counter *em_counter = &fs_info->evictable_extent_maps; +percpu_counter_destroy (&fs_info->stats_read_blocks);percpu_counter_destroy (&fs_info->dirty_metadata_bytes);percpu_counter_destroy (&fs_info->delalloc_bytes);percpu_counter_destroy (&fs_info->ordered_bytes);
@@ -2923,6 +2924,10 @@ static int init_mount_fs_info(struct btrfs_fs_info *fs_info, struct super_blockif (ret)return ret; + ret =percpu_counter_init (&fs_info->stats_read_blocks,0 ,GFP_KERNEL ); +if (ret) +return ret; + fs_info->dirty_metadata_batch =PAGE_SIZE * (1 +ilog2 (nr_cpu_ids));
fs/btrfs/fs.h +3 -0
@@ -627,6 +627,9 @@ struct btrfs_fs_info {struct kobject *qgroups_kobj;struct kobject *discard_kobj; +/* Track the number of blocks (sectors) read by the filesystem. */ +struct percpu_counter stats_read_blocks; +/* Used to keep from writing metadata until there is a nice batch */ struct percpu_counter dirty_metadata_bytes;struct percpu_counter delalloc_bytes;
fs/btrfs/volumes.c +0 -6
@@ -1255,7 +1255,6 @@ static void close_fs_devices(struct btrfs_fs_devices *fs_devices)list_for_each_entry_safe (device, tmp, &fs_devices->devices, dev_list)btrfs_close_one_device (device); -percpu_counter_destroy (&fs_devices->stats_read_blocks);WARN_ON (fs_devices->open_devices);WARN_ON (fs_devices->rw_devices); fs_devices->opened =0 ;
@@ -1303,11 +1302,6 @@ static int open_fs_devices(struct btrfs_fs_devices *fs_devices,s64 __maybe_unused value =0 ;int ret =0 ; -/* Initialize the in-memory record of filesystem read count. */ - ret =percpu_counter_init (&fs_devices->stats_read_blocks,0 ,GFP_KERNEL ); -if (ret) -return ret; -list_for_each_entry_safe (device, tmp_device, &fs_devices->devices, dev_list) {int ret2;
fs/btrfs/volumes.h +0 -3
@@ -438,9 +438,6 @@ struct btrfs_fs_devices {enum btrfs_chunk_allocation_policy chunk_alloc_policy; -/* Track the number of blocks (sectors) read by the filesystem. */ -struct percpu_counter stats_read_blocks; -/* Policy used to read the mirrored stripes. */ enum btrfs_read_policy read_policy;
Signature · 1 line
2.47.0
PATCH 2/2 fixup: btrfs: introduce RAID1 round-robin read balancing
In reply to Anand JainThe member stats_read_blocks has been moved to fs_info, so update its usage accordingly in btrfs_read_rr().
This is based on the for-next branch in the repo github.com/btrfs/linux.git.
--- fs/btrfs/volumes.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)
fs/btrfs/volumes.c +6 -5
@@ -6018,21 +6018,22 @@ static int btrfs_read_rr(const struct btrfs_chunk_map *map, int first, int num_s {struct stripe_mirror stripes[BTRFS_RAID1_MAX_MIRRORS ] = {0 };struct btrfs_device *device = map->stripes[first].dev; -struct btrfs_fs_devices *fs_devices = device->fs_devices; +struct btrfs_fs_info *fs_info = device->fs_devices->fs_info;unsigned int read_cycle;unsigned int total_reads;unsigned int min_reads_per_dev; - total_reads =percpu_counter_sum (&fs_devices->stats_read_blocks); - min_reads_per_dev =READ_ONCE (fs_devices->rr_min_contig_read) >> - fs_devices->fs_info->sectorsize_bits; + total_reads =percpu_counter_sum (&fs_info->stats_read_blocks); + min_reads_per_dev =READ_ONCE (fs_info->fs_devices->rr_min_contig_read) >> + fs_info->sectorsize_bits;for (int index =0 , i = first; i < first + num_stripes; i++) { stripes[index].devid = map->stripes[i].dev->devid; stripes[index].num = i; index++; } -sort (stripes, num_stripes,sizeof (struct stripe_mirror ), btrfs_cmp_devid,NULL ); +sort (stripes, num_stripes,sizeof (struct stripe_mirror ), + btrfs_cmp_devid,NULL ); read_cycle = total_reads / min_reads_per_dev;return stripes[read_cycle % num_stripes].num;
Signature · 1 line
2.47.0
Quoted 5 lines · Anand Jain
David reported btrfs/161 failing during sprouted filesystem unmount. Bisected to commit
49136a74162e("btrfs: add tracking of read blocks for read policy"). Now, tracking is moved fromfs_devicestofs_info.Tested to be working fine.
Thanks, updated in for-next.