UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

rue/io: add support for recursive diskstats 

Blkcg add recursive diskstats.
Fix the issue print the last partition in original solution and
remove the list.

Note:
This function just for backward compatible of tkernel4. Since
commit f733164829 ("blk-cgroup: reimplement basic IO stats
using cgroup rstat") implement blkg_iostat_set for cgroup stat
in blkcg_gq.

Signed-off-by: Haisu Wang <haisuwang@tencent.com>
Signed-off-by: Lenny Chen <lennychen@tencent.com>
This commit is contained in:
Haisu Wang 2021-11-18 19:51:03 +08:00
parent f35df3f918
commit 495e0e311e
2 changed files with 123 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

117
block/blk-cgroup.c
View File

@ -905,6 +905,119 @@ static int blkcg_dkstats_show_partion(struct blkcg *blkcg, struct gendisk *gd,
return 0;
}
static void blkcg_dkstats_sum(struct blkcg *blkcg, struct disk_stats_sum *sum)
{
struct disk_stats *s = &sum->dkstats;
struct block_device *bdev = sum->part;
s->ios[READ] += blkcg_part_stat_read(blkcg, bdev, ios[READ]);
s->ios[WRITE] += blkcg_part_stat_read(blkcg, bdev, ios[WRITE]);
s->merges[READ] += blkcg_part_stat_read(blkcg, bdev, merges[READ]);
s->merges[WRITE] += blkcg_part_stat_read(blkcg, bdev, merges[WRITE]);
s->sectors[READ] += blkcg_part_stat_read(blkcg, bdev, sectors[READ]);
s->sectors[WRITE] += blkcg_part_stat_read(blkcg, bdev, sectors[WRITE]);
s->nsecs[READ] += blkcg_part_stat_read(blkcg, bdev, nsecs[READ]);
s->nsecs[WRITE] += blkcg_part_stat_read(blkcg, bdev, nsecs[WRITE]);
}
static void blkcg_dkstats_recursive_print(struct disk_stats_sum *sum, struct seq_file *seq)
{
struct block_device *bdev = sum->part;
struct disk_stats *s = &sum->dkstats;
unsigned long rd_nsecs = s->nsecs[READ];
unsigned long wr_nsecs = s->nsecs[WRITE];
/* hidded inactive disks for this cgroup */
if (!s->ios[READ] && !s->ios[WRITE]) {
seq_printf(seq, "%4d %7d %pg %lu %lu %lu "
"%u %lu %lu %lu %u %u %u %u %u %u %u %u\n",
MAJOR(bdev->bd_dev), MINOR(bdev->bd_dev),
bdev, 0UL, 0UL, 0UL, 0U, 0UL, 0UL, 0UL, 0U,
0U, 0U, 0U, 0U, 0U, 0U, 0U);
return;
}
seq_printf(seq, "%4d %7d %pg %lu %lu %lu "
"%u %lu %lu %lu %u %u %u %lu %u %u %u %u\n",
MAJOR(bdev->bd_dev), MINOR(bdev->bd_dev),
bdev,
s->ios[READ],
s->merges[READ],
s->sectors[READ],
(unsigned int)(rd_nsecs / 1000000),
s->ios[WRITE],
s->merges[WRITE],
s->sectors[WRITE],
(unsigned int)(wr_nsecs / 1000000), 0U,
jiffies_to_msecs(part_stat_read(bdev, io_ticks)),
part_stat_read_inqueue(bdev), 0U, 0U, 0U, 0U);
}
static void blkcg_part_stats_recursive_sum(
struct blkcg *blkcg, struct disk_stats_sum *sum)
{
struct cgroup_subsys_state *pos;
struct blkcg *pos_blkcg;
rcu_read_lock();
css_for_each_descendant_pre(pos, &blkcg->css) {
pos_blkcg = css_to_blkcg(pos);
/*!!!dkstats_sum_recursive should be inited!!!*/
blkcg_dkstats_sum(pos_blkcg, sum);
}
rcu_read_unlock();
}
static int blkcg_dkstats_recursive_show(struct seq_file *sf, void *v)
{
struct blkcg *blkcg = css_to_blkcg(seq_css(sf));
struct disk_stats_sum *sum;
int ret = 0;
struct class_dev_iter iter;
struct device *dev;
mutex_lock(&blkcg_pol_mutex);
if (!blkcg_do_io_stat(blkcg))
goto out;
sum = kzalloc(sizeof(struct disk_stats_sum), GFP_KERNEL);
if (!sum) {
ret = -ENOMEM;
goto out;
}
class_dev_iter_init(&iter, &block_class, NULL, &disk_type);
/*for each gendisk*/
while ((dev = class_dev_iter_next(&iter))) {
unsigned long idx;
struct block_device *bdev;
struct gendisk *disk = dev_to_disk(dev);
rcu_read_lock();
xa_for_each(&disk->part_tbl, idx, bdev) {
if (!kobject_get_unless_zero(&bdev->bd_device.kobj))
continue;
rcu_read_unlock();
sum->part = bdev;
blkcg_part_stats_recursive_sum(blkcg, sum);
blkcg_dkstats_recursive_print(sum, sf);
memset(sum, 0, sizeof(struct disk_stats_sum));
put_device(&bdev->bd_device);
rcu_read_lock();
}
rcu_read_unlock();
}
class_dev_iter_exit(&iter);
kfree(sum);
out:
mutex_unlock(&blkcg_pol_mutex);
return ret;
}
static int blkcg_dkstats_enable(struct cgroup_subsys_state *css,
struct cftype *cftype, u64 val)
{
@ -1620,6 +1733,10 @@ static struct cftype blkcg_legacy_files[] = {
.write_u64 = blkcg_dkstats_enable,
.seq_show = blkcg_dkstats_show,
},
{
.name = "diskstats_recursive",
.seq_show = blkcg_dkstats_recursive_show,
},
#endif /* CONFIG_BLK_CGROUP_DISKSTATS */
#ifdef CONFIG_RQM
{

6
block/blk-cgroup.h
View File

@ -19,6 +19,7 @@
#include <linux/kthread.h>
#include <linux/blk-mq.h>
#include <linux/llist.h>
#include <linux/part_stat.h>
struct blkcg_gq;
struct blkg_policy_data;
@ -162,6 +163,11 @@ struct blkcg_dkstats {
struct rcu_head rcu_head;
};
struct disk_stats_sum {
struct disk_stats dkstats;
struct block_device *part;
};
static inline int blkcg_do_io_stat(struct blkcg *blkcg)
{
return blkcg->dkstats_on;