Commit 15e3d2c5 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Jens Axboe
Browse files

block: move disk stat accounting to struct block_device 



Move the dkstats and stamp field to struct block_device in preparation
of killing struct hd_struct.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarJan Kara <jack@suse.cz>
Reviewed-by: default avatarHannes Reinecke <hare@suse.de>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent a782483c

block/blk-cgroup.c

+1 −1
Original line number Diff line number Diff line
@@ -830,7 +830,7 @@ static void blkcg_fill_root_iostats(void) 
		for_each_possible_cpu(cpu) {

			struct disk_stats *cpu_dkstats;



			cpu_dkstats = per_cpu_ptr(part->dkstats, cpu);

			cpu_dkstats = per_cpu_ptr(part->bdev->bd_stats, cpu);

			tmp.ios[BLKG_IOSTAT_READ] +=

				cpu_dkstats->ios[STAT_READ];

			tmp.ios[BLKG_IOSTAT_WRITE] +=

block/blk-core.c

+2 −2
Original line number Diff line number Diff line
@@ -1264,9 +1264,9 @@ static void update_io_ticks(struct hd_struct *part, unsigned long now, bool end) 
{

	unsigned long stamp;

again:

	stamp = READ_ONCE(part->stamp);

	stamp = READ_ONCE(part->bdev->bd_stamp);

	if (unlikely(stamp != now)) {

		if (likely(cmpxchg(&part->stamp, stamp, now) == stamp))

		if (likely(cmpxchg(&part->bdev->bd_stamp, stamp, now) == stamp))

			__part_stat_add(part, io_ticks, end ? now - stamp : 1);

	}

	if (part->partno) {

block/blk.h

+0 −1
Original line number Diff line number Diff line
@@ -381,7 +381,6 @@ static inline void hd_struct_put(struct hd_struct *part) 


static inline void hd_free_part(struct hd_struct *part)

{

	free_percpu(part->dkstats);

	kfree(part->info);

	bdput(part->bdev);

	percpu_ref_exit(&part->ref);

block/genhd.c

+4 −10
Original line number Diff line number Diff line
@@ -112,7 +112,7 @@ static void part_stat_read_all(struct hd_struct *part, struct disk_stats *stat) 


	memset(stat, 0, sizeof(struct disk_stats));

	for_each_possible_cpu(cpu) {

		struct disk_stats *ptr = per_cpu_ptr(part->dkstats, cpu);

		struct disk_stats *ptr = per_cpu_ptr(part->bdev->bd_stats, cpu);

		int group;



		for (group = 0; group < NR_STAT_GROUPS; group++) {
@@ -891,7 +891,7 @@ void del_gendisk(struct gendisk *disk) 
	kobject_put(disk->slave_dir);



	part_stat_set_all(&disk->part0, 0);

	disk->part0.stamp = 0;

	disk->part0.bdev->bd_stamp = 0;

	if (!sysfs_deprecated)

		sysfs_remove_link(block_depr, dev_name(disk_to_dev(disk)));

	pm_runtime_set_memalloc_noio(disk_to_dev(disk), false);
@@ -1628,19 +1628,15 @@ struct gendisk *__alloc_disk_node(int minors, int node_id) 
	if (!disk->part0.bdev)

		goto out_free_disk;



	disk->part0.dkstats = alloc_percpu(struct disk_stats);

	if (!disk->part0.dkstats)

		goto out_bdput;



	disk->node_id = node_id;

	if (disk_expand_part_tbl(disk, 0))

		goto out_free_bdstats;

		goto out_bdput;



	ptbl = rcu_dereference_protected(disk->part_tbl, 1);

	rcu_assign_pointer(ptbl->part[0], &disk->part0);



	if (hd_ref_init(&disk->part0))

		goto out_free_bdstats;

		goto out_bdput;



	disk->minors = minors;

	rand_initialize_disk(disk);
@@ -1649,8 +1645,6 @@ struct gendisk *__alloc_disk_node(int minors, int node_id) 
	device_initialize(disk_to_dev(disk));

	return disk;



out_free_bdstats:

	free_percpu(disk->part0.dkstats);

out_bdput:

	bdput(disk->part0.bdev);

out_free_disk:

block/partitions/core.c

+1 −8
Original line number Diff line number Diff line
@@ -409,14 +409,9 @@ static struct hd_struct *add_partition(struct gendisk *disk, int partno, 
	if (!p)

		return ERR_PTR(-EBUSY);



	err = -ENOMEM;

	p->dkstats = alloc_percpu(struct disk_stats);

	if (!p->dkstats)

		goto out_free;



	bdev = bdev_alloc(disk, partno);

	if (!bdev)

		goto out_free_stats;

		goto out_free;

	p->bdev = bdev;



	pdev = part_to_dev(p);
@@ -490,8 +485,6 @@ static struct hd_struct *add_partition(struct gendisk *disk, int partno, 
	kfree(p->info);

out_bdput:

	bdput(bdev);

out_free_stats:

	free_percpu(p->dkstats);

out_free:

	kfree(p);

	return ERR_PTR(err);