iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

blkcg: drop BLKCG_STAT_{PRIV|POL|OFF} macros

Browse Source 
Now that all stat handling code lives in policy implementations,
there's no need to encode policy ID in cft->private.

* Export blkcg_prfill_[rw]stat() from blkcg, remove
  blkcg_print_[rw]stat(), and implement cfqg_print_[rw]stat() which
  use hard-code BLKIO_POLICY_PROP.

* Use cft->private for offset of the target field directly and drop
  BLKCG_STAT_{PRIV|POL|OFF}().

Signed-off-by: Tejun Heo <tj@kernel.org>
This commit is contained in:
Tejun Heo 2012-04-01 14:38:45 -07:00
parent d366e7ec41
commit 5bc4afb1ec
4 changed files with 72 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
block/blk-cgroup.c
View File

@ -430,43 +430,35 @@ u64 __blkg_prfill_rwstat(struct seq_file *sf, void *pdata,
return v; return v;
} }
static u64 blkg_prfill_stat(struct seq_file *sf, void *pdata, int off) /**
* blkg_prfill_stat - prfill callback for blkg_stat
* @sf: seq_file to print to
* @pdata: policy private data of interest
* @off: offset to the blkg_stat in @pdata
*
* prfill callback for printing a blkg_stat.
*/
u64 blkg_prfill_stat(struct seq_file *sf, void *pdata, int off)
{ {
return __blkg_prfill_u64(sf, pdata, blkg_stat_read(pdata + off)); return __blkg_prfill_u64(sf, pdata, blkg_stat_read(pdata + off));
} }
EXPORT_SYMBOL_GPL(blkg_prfill_stat);
static u64 blkg_prfill_rwstat(struct seq_file *sf, void *pdata, int off) /**
* blkg_prfill_rwstat - prfill callback for blkg_rwstat
* @sf: seq_file to print to
* @pdata: policy private data of interest
* @off: offset to the blkg_rwstat in @pdata
*
* prfill callback for printing a blkg_rwstat.
*/
u64 blkg_prfill_rwstat(struct seq_file *sf, void *pdata, int off)
{ {
struct blkg_rwstat rwstat = blkg_rwstat_read(pdata + off); struct blkg_rwstat rwstat = blkg_rwstat_read(pdata + off);
return __blkg_prfill_rwstat(sf, pdata, &rwstat); return __blkg_prfill_rwstat(sf, pdata, &rwstat);
} }
EXPORT_SYMBOL_GPL(blkg_prfill_rwstat);
/* print blkg_stat specified by BLKCG_STAT_PRIV() */
int blkcg_print_stat(struct cgroup *cgrp, struct cftype *cft,
struct seq_file *sf)
{
struct blkio_cgroup *blkcg = cgroup_to_blkio_cgroup(cgrp);
blkcg_print_blkgs(sf, blkcg, blkg_prfill_stat,
BLKCG_STAT_POL(cft->private),
BLKCG_STAT_OFF(cft->private), false);
return 0;
}
EXPORT_SYMBOL_GPL(blkcg_print_stat);
/* print blkg_rwstat specified by BLKCG_STAT_PRIV() */
int blkcg_print_rwstat(struct cgroup *cgrp, struct cftype *cft,
struct seq_file *sf)
{
struct blkio_cgroup *blkcg = cgroup_to_blkio_cgroup(cgrp);
blkcg_print_blkgs(sf, blkcg, blkg_prfill_rwstat,
BLKCG_STAT_POL(cft->private),
BLKCG_STAT_OFF(cft->private), true);
return 0;
}
EXPORT_SYMBOL_GPL(blkcg_print_rwstat);
/** /**
* blkg_conf_prep - parse and prepare for per-blkg config update * blkg_conf_prep - parse and prepare for per-blkg config update

11
block/blk-cgroup.h
View File

@ -34,11 +34,6 @@ enum blkio_policy_id {
#define CFQ_WEIGHT_MAX 1000 #define CFQ_WEIGHT_MAX 1000
#define CFQ_WEIGHT_DEFAULT 500 #define CFQ_WEIGHT_DEFAULT 500
/* cft->private [un]packing for stat printing */
#define BLKCG_STAT_PRIV(pol, off) (((unsigned)(pol) << 16) | (off))
#define BLKCG_STAT_POL(prv) ((unsigned)(prv) >> 16)
#define BLKCG_STAT_OFF(prv) ((unsigned)(prv) & 0xffff)
enum blkg_rwstat_type { enum blkg_rwstat_type {
BLKG_RWSTAT_READ, BLKG_RWSTAT_READ,
BLKG_RWSTAT_WRITE, BLKG_RWSTAT_WRITE,
@ -131,10 +126,8 @@ void blkcg_print_blkgs(struct seq_file *sf, struct blkio_cgroup *blkcg,
u64 __blkg_prfill_u64(struct seq_file *sf, void *pdata, u64 v); u64 __blkg_prfill_u64(struct seq_file *sf, void *pdata, u64 v);
u64 __blkg_prfill_rwstat(struct seq_file *sf, void *pdata, u64 __blkg_prfill_rwstat(struct seq_file *sf, void *pdata,
const struct blkg_rwstat *rwstat); const struct blkg_rwstat *rwstat);
int blkcg_print_stat(struct cgroup *cgrp, struct cftype *cft, u64 blkg_prfill_stat(struct seq_file *sf, void *pdata, int off);
struct seq_file *sf); u64 blkg_prfill_rwstat(struct seq_file *sf, void *pdata, int off);
int blkcg_print_rwstat(struct cgroup *cgrp, struct cftype *cft,
struct seq_file *sf);
struct blkg_conf_ctx { struct blkg_conf_ctx {
struct gendisk *disk; struct gendisk *disk;

12
block/blk-throttle.c
View File

@ -941,15 +941,13 @@ static u64 tg_prfill_cpu_rwstat(struct seq_file *sf, void *pdata, int off)
return __blkg_prfill_rwstat(sf, pdata, &rwstat); return __blkg_prfill_rwstat(sf, pdata, &rwstat);
} }
/* print per-cpu blkg_rwstat specified by BLKCG_STAT_PRIV() */
static int tg_print_cpu_rwstat(struct cgroup *cgrp, struct cftype *cft, static int tg_print_cpu_rwstat(struct cgroup *cgrp, struct cftype *cft,
struct seq_file *sf) struct seq_file *sf)
{ {
struct blkio_cgroup *blkcg = cgroup_to_blkio_cgroup(cgrp); struct blkio_cgroup *blkcg = cgroup_to_blkio_cgroup(cgrp);
blkcg_print_blkgs(sf, blkcg, tg_prfill_cpu_rwstat, blkcg_print_blkgs(sf, blkcg, tg_prfill_cpu_rwstat, BLKIO_POLICY_THROTL,
BLKCG_STAT_POL(cft->private), cft->private, true);
BLKCG_STAT_OFF(cft->private), true);
return 0; return 0;
} }
@ -1067,14 +1065,12 @@ static struct cftype throtl_files[] = {
}, },
{ {
.name = "throttle.io_service_bytes", .name = "throttle.io_service_bytes",
.private = BLKCG_STAT_PRIV(BLKIO_POLICY_THROTL, .private = offsetof(struct tg_stats_cpu, service_bytes),
offsetof(struct tg_stats_cpu, service_bytes)),
.read_seq_string = tg_print_cpu_rwstat, .read_seq_string = tg_print_cpu_rwstat,
}, },
{ {
.name = "throttle.io_serviced", .name = "throttle.io_serviced",
.private = BLKCG_STAT_PRIV(BLKIO_POLICY_THROTL, .private = offsetof(struct tg_stats_cpu, serviced),
offsetof(struct tg_stats_cpu, serviced)),
.read_seq_string = tg_print_cpu_rwstat, .read_seq_string = tg_print_cpu_rwstat,
}, },
{ } /* terminate */ { } /* terminate */

85
block/cfq-iosched.c
View File

@ -1441,6 +1441,26 @@ static int cfq_set_weight(struct cgroup *cgrp, struct cftype *cft, u64 val)
return 0; return 0;
} }
static int cfqg_print_stat(struct cgroup *cgrp, struct cftype *cft,
struct seq_file *sf)
{
struct blkio_cgroup *blkcg = cgroup_to_blkio_cgroup(cgrp);
blkcg_print_blkgs(sf, blkcg, blkg_prfill_stat, BLKIO_POLICY_PROP,
cft->private, false);
return 0;
}
static int cfqg_print_rwstat(struct cgroup *cgrp, struct cftype *cft,
struct seq_file *sf)
{
struct blkio_cgroup *blkcg = cgroup_to_blkio_cgroup(cgrp);
blkcg_print_blkgs(sf, blkcg, blkg_prfill_rwstat, BLKIO_POLICY_PROP,
cft->private, true);
return 0;
}
#ifdef CONFIG_DEBUG_BLK_CGROUP #ifdef CONFIG_DEBUG_BLK_CGROUP
static u64 cfqg_prfill_avg_queue_size(struct seq_file *sf, void *pdata, int off) static u64 cfqg_prfill_avg_queue_size(struct seq_file *sf, void *pdata, int off)
{ {
@ -1482,51 +1502,43 @@ static struct cftype cfq_blkcg_files[] = {
}, },
{ {
.name = "time", .name = "time",
.private = BLKCG_STAT_PRIV(BLKIO_POLICY_PROP, .private = offsetof(struct cfq_group, stats.time),
offsetof(struct cfq_group, stats.time)), .read_seq_string = cfqg_print_stat,
.read_seq_string = blkcg_print_stat,
}, },
{ {
.name = "sectors", .name = "sectors",
.private = BLKCG_STAT_PRIV(BLKIO_POLICY_PROP, .private = offsetof(struct cfq_group, stats.sectors),
offsetof(struct cfq_group, stats.sectors)), .read_seq_string = cfqg_print_stat,
.read_seq_string = blkcg_print_stat,
}, },
{ {
.name = "io_service_bytes", .name = "io_service_bytes",
.private = BLKCG_STAT_PRIV(BLKIO_POLICY_PROP, .private = offsetof(struct cfq_group, stats.service_bytes),
offsetof(struct cfq_group, stats.service_bytes)), .read_seq_string = cfqg_print_rwstat,
.read_seq_string = blkcg_print_rwstat,
}, },
{ {
.name = "io_serviced", .name = "io_serviced",
.private = BLKCG_STAT_PRIV(BLKIO_POLICY_PROP, .private = offsetof(struct cfq_group, stats.serviced),
offsetof(struct cfq_group, stats.serviced)), .read_seq_string = cfqg_print_rwstat,
.read_seq_string = blkcg_print_rwstat,
}, },
{ {
.name = "io_service_time", .name = "io_service_time",
.private = BLKCG_STAT_PRIV(BLKIO_POLICY_PROP, .private = offsetof(struct cfq_group, stats.service_time),
offsetof(struct cfq_group, stats.service_time)), .read_seq_string = cfqg_print_rwstat,
.read_seq_string = blkcg_print_rwstat,
}, },
{ {
.name = "io_wait_time", .name = "io_wait_time",
.private = BLKCG_STAT_PRIV(BLKIO_POLICY_PROP, .private = offsetof(struct cfq_group, stats.wait_time),
offsetof(struct cfq_group, stats.wait_time)), .read_seq_string = cfqg_print_rwstat,
.read_seq_string = blkcg_print_rwstat,
}, },
{ {
.name = "io_merged", .name = "io_merged",
.private = BLKCG_STAT_PRIV(BLKIO_POLICY_PROP, .private = offsetof(struct cfq_group, stats.merged),
offsetof(struct cfq_group, stats.merged)), .read_seq_string = cfqg_print_rwstat,
.read_seq_string = blkcg_print_rwstat,
}, },
{ {
.name = "io_queued", .name = "io_queued",
.private = BLKCG_STAT_PRIV(BLKIO_POLICY_PROP, .private = offsetof(struct cfq_group, stats.queued),
offsetof(struct cfq_group, stats.queued)), .read_seq_string = cfqg_print_rwstat,
.read_seq_string = blkcg_print_rwstat,
}, },
#ifdef CONFIG_DEBUG_BLK_CGROUP #ifdef CONFIG_DEBUG_BLK_CGROUP
{ {
@ -1535,33 +1547,28 @@ static struct cftype cfq_blkcg_files[] = {
}, },
{ {
.name = "group_wait_time", .name = "group_wait_time",
.private = BLKCG_STAT_PRIV(BLKIO_POLICY_PROP, .private = offsetof(struct cfq_group, stats.group_wait_time),
offsetof(struct cfq_group, stats.group_wait_time)), .read_seq_string = cfqg_print_stat,
.read_seq_string = blkcg_print_stat,
}, },
{ {
.name = "idle_time", .name = "idle_time",
.private = BLKCG_STAT_PRIV(BLKIO_POLICY_PROP, .private = offsetof(struct cfq_group, stats.idle_time),
offsetof(struct cfq_group, stats.idle_time)), .read_seq_string = cfqg_print_stat,
.read_seq_string = blkcg_print_stat,
}, },
{ {
.name = "empty_time", .name = "empty_time",
.private = BLKCG_STAT_PRIV(BLKIO_POLICY_PROP, .private = offsetof(struct cfq_group, stats.empty_time),
offsetof(struct cfq_group, stats.empty_time)), .read_seq_string = cfqg_print_stat,
.read_seq_string = blkcg_print_stat,
}, },
{ {
.name = "dequeue", .name = "dequeue",
.private = BLKCG_STAT_PRIV(BLKIO_POLICY_PROP, .private = offsetof(struct cfq_group, stats.dequeue),
offsetof(struct cfq_group, stats.dequeue)), .read_seq_string = cfqg_print_stat,
.read_seq_string = blkcg_print_stat,
}, },
{ {
.name = "unaccounted_time", .name = "unaccounted_time",
.private = BLKCG_STAT_PRIV(BLKIO_POLICY_PROP, .private = offsetof(struct cfq_group, stats.unaccounted_time),
offsetof(struct cfq_group, stats.unaccounted_time)), .read_seq_string = cfqg_print_stat,
.read_seq_string = blkcg_print_stat,
}, },
#endif /* CONFIG_DEBUG_BLK_CGROUP */ #endif /* CONFIG_DEBUG_BLK_CGROUP */
{ } /* terminate */ { } /* terminate */