Skip to content

L
linux
Commit 2da8ca82 authored by Tejun Heo's avatar Tejun Heo
Browse files
Options

cgroup: replace cftype->read_seq_string() with cftype->seq_show() 

In preparation of conversion to kernfs, cgroup file handling is
updated so that it can be easily mapped to kernfs.  This patch
replaces cftype->read_seq_string() with cftype->seq_show() which is
not limited to single_open() operation and will map directcly to
kernfs seq_file interface.

The conversions are mechanical.  As ->seq_show() doesn't have @css and
@cft, the functions which make use of them are converted to use
seq_css() and seq_cft() respectively.  In several occassions, e.f. if
it has seq_string in its name, the function name is updated to fit the
new method better.

This patch does not introduce any behavior changes.
Signed-off-by: default avatarTejun Heo <tj@kernel.org>
Acked-by: default avatarAristeu Rozanski <arozansk@redhat.com>
Acked-by: default avatarVivek Goyal <vgoyal@redhat.com>
Acked-by: default avatarMichal Hocko <mhocko@suse.cz>
Acked-by: default avatarDaniel Wagner <daniel.wagner@bmw-carit.de>
Acked-by: default avatarLi Zefan <lizefan@huawei.com>
Cc: Jens Axboe <axboe@kernel.dk>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Cc: Balbir Singh <bsingharora@gmail.com>
Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Cc: Neil Horman <nhorman@tuxdriver.com>
parent 7da11279
Hide whitespace changes
Inline Side-by-side
Showing with 128 additions and 164 deletions
block/blk-throttle.c
View file @ 2da8ca82
...@@ -1303,13 +1303,10 @@ static u64 tg_prfill_cpu_rwstat(struct seq_file *sf, ...@@ -1303,13 +1303,10 @@ static u64 tg_prfill_cpu_rwstat(struct seq_file *sf,
return __blkg_prfill_rwstat(sf, pd, &rwstat); return __blkg_prfill_rwstat(sf, pd, &rwstat);
} }
static int tg_print_cpu_rwstat(struct cgroup_subsys_state *css, static int tg_print_cpu_rwstat(struct seq_file *sf, void *v)
struct cftype *cft, struct seq_file *sf)
{ {
struct blkcg *blkcg = css_to_blkcg(css); blkcg_print_blkgs(sf, css_to_blkcg(seq_css(sf)), tg_prfill_cpu_rwstat,
&blkcg_policy_throtl, seq_cft(sf)->private, true);
blkcg_print_blkgs(sf, blkcg, tg_prfill_cpu_rwstat, &blkcg_policy_throtl,
cft->private, true);
return 0; return 0;
} }
...@@ -1335,19 +1332,17 @@ static u64 tg_prfill_conf_uint(struct seq_file *sf, struct blkg_policy_data *pd, ...@@ -1335,19 +1332,17 @@ static u64 tg_prfill_conf_uint(struct seq_file *sf, struct blkg_policy_data *pd,
return __blkg_prfill_u64(sf, pd, v); return __blkg_prfill_u64(sf, pd, v);
} }
static int tg_print_conf_u64(struct cgroup_subsys_state *css, static int tg_print_conf_u64(struct seq_file *sf, void *v)
struct cftype *cft, struct seq_file *sf)
{ {
blkcg_print_blkgs(sf, css_to_blkcg(css), tg_prfill_conf_u64, blkcg_print_blkgs(sf, css_to_blkcg(seq_css(sf)), tg_prfill_conf_u64,
&blkcg_policy_throtl, cft->private, false); &blkcg_policy_throtl, seq_cft(sf)->private, false);
return 0; return 0;
} }
static int tg_print_conf_uint(struct cgroup_subsys_state *css, static int tg_print_conf_uint(struct seq_file *sf, void *v)
struct cftype *cft, struct seq_file *sf)
{ {
blkcg_print_blkgs(sf, css_to_blkcg(css), tg_prfill_conf_uint, blkcg_print_blkgs(sf, css_to_blkcg(seq_css(sf)), tg_prfill_conf_uint,
&blkcg_policy_throtl, cft->private, false); &blkcg_policy_throtl, seq_cft(sf)->private, false);
return 0; return 0;
} }
...@@ -1428,40 +1423,40 @@ static struct cftype throtl_files[] = { ...@@ -1428,40 +1423,40 @@ static struct cftype throtl_files[] = {
{ {
.name = "throttle.read_bps_device", .name = "throttle.read_bps_device",
.private = offsetof(struct throtl_grp, bps[READ]), .private = offsetof(struct throtl_grp, bps[READ]),
.read_seq_string = tg_print_conf_u64, .seq_show = tg_print_conf_u64,
.write_string = tg_set_conf_u64, .write_string = tg_set_conf_u64,
.max_write_len = 256, .max_write_len = 256,
}, },
{ {
.name = "throttle.write_bps_device", .name = "throttle.write_bps_device",
.private = offsetof(struct throtl_grp, bps[WRITE]), .private = offsetof(struct throtl_grp, bps[WRITE]),
.read_seq_string = tg_print_conf_u64, .seq_show = tg_print_conf_u64,
.write_string = tg_set_conf_u64, .write_string = tg_set_conf_u64,
.max_write_len = 256, .max_write_len = 256,
}, },
{ {
.name = "throttle.read_iops_device", .name = "throttle.read_iops_device",
.private = offsetof(struct throtl_grp, iops[READ]), .private = offsetof(struct throtl_grp, iops[READ]),
.read_seq_string = tg_print_conf_uint, .seq_show = tg_print_conf_uint,
.write_string = tg_set_conf_uint, .write_string = tg_set_conf_uint,
.max_write_len = 256, .max_write_len = 256,
}, },
{ {
.name = "throttle.write_iops_device", .name = "throttle.write_iops_device",
.private = offsetof(struct throtl_grp, iops[WRITE]), .private = offsetof(struct throtl_grp, iops[WRITE]),
.read_seq_string = tg_print_conf_uint, .seq_show = tg_print_conf_uint,
.write_string = tg_set_conf_uint, .write_string = tg_set_conf_uint,
.max_write_len = 256, .max_write_len = 256,
}, },
{ {
.name = "throttle.io_service_bytes", .name = "throttle.io_service_bytes",
.private = offsetof(struct tg_stats_cpu, service_bytes), .private = offsetof(struct tg_stats_cpu, service_bytes),
.read_seq_string = tg_print_cpu_rwstat, .seq_show = tg_print_cpu_rwstat,
}, },
{ {
.name = "throttle.io_serviced", .name = "throttle.io_serviced",
.private = offsetof(struct tg_stats_cpu, serviced), .private = offsetof(struct tg_stats_cpu, serviced),
.read_seq_string = tg_print_cpu_rwstat, .seq_show = tg_print_cpu_rwstat,
}, },
{ } /* terminate */ { } /* terminate */
}; };
......
block/cfq-iosched.c
View file @ 2da8ca82
...@@ -1632,11 +1632,11 @@ static u64 cfqg_prfill_weight_device(struct seq_file *sf, ...@@ -1632,11 +1632,11 @@ static u64 cfqg_prfill_weight_device(struct seq_file *sf,
return __blkg_prfill_u64(sf, pd, cfqg->dev_weight); return __blkg_prfill_u64(sf, pd, cfqg->dev_weight);
} }
static int cfqg_print_weight_device(struct cgroup_subsys_state *css, static int cfqg_print_weight_device(struct seq_file *sf, void *v)
struct cftype *cft, struct seq_file *sf)
{ {
blkcg_print_blkgs(sf, css_to_blkcg(css), cfqg_prfill_weight_device, blkcg_print_blkgs(sf, css_to_blkcg(seq_css(sf)),
&blkcg_policy_cfq, 0, false); cfqg_prfill_weight_device, &blkcg_policy_cfq,
0, false);
return 0; return 0;
} }
...@@ -1650,26 +1650,23 @@ static u64 cfqg_prfill_leaf_weight_device(struct seq_file *sf, ...@@ -1650,26 +1650,23 @@ static u64 cfqg_prfill_leaf_weight_device(struct seq_file *sf,
return __blkg_prfill_u64(sf, pd, cfqg->dev_leaf_weight); return __blkg_prfill_u64(sf, pd, cfqg->dev_leaf_weight);
} }
static int cfqg_print_leaf_weight_device(struct cgroup_subsys_state *css, static int cfqg_print_leaf_weight_device(struct seq_file *sf, void *v)
struct cftype *cft,
struct seq_file *sf)
{ {
blkcg_print_blkgs(sf, css_to_blkcg(css), cfqg_prfill_leaf_weight_device, blkcg_print_blkgs(sf, css_to_blkcg(seq_css(sf)),
&blkcg_policy_cfq, 0, false); cfqg_prfill_leaf_weight_device, &blkcg_policy_cfq,
0, false);
return 0; return 0;
} }
static int cfq_print_weight(struct cgroup_subsys_state *css, struct cftype *cft, static int cfq_print_weight(struct seq_file *sf, void *v)
struct seq_file *sf)
{ {
seq_printf(sf, "%u\n", css_to_blkcg(css)->cfq_weight); seq_printf(sf, "%u\n", css_to_blkcg(seq_css(sf))->cfq_weight);
return 0; return 0;
} }
static int cfq_print_leaf_weight(struct cgroup_subsys_state *css, static int cfq_print_leaf_weight(struct seq_file *sf, void *v)
struct cftype *cft, struct seq_file *sf)
{ {
seq_printf(sf, "%u\n", css_to_blkcg(css)->cfq_leaf_weight); seq_printf(sf, "%u\n", css_to_blkcg(seq_css(sf))->cfq_leaf_weight);
return 0; return 0;
} }
...@@ -1762,23 +1759,17 @@ static int cfq_set_leaf_weight(struct cgroup_subsys_state *css, ...@@ -1762,23 +1759,17 @@ static int cfq_set_leaf_weight(struct cgroup_subsys_state *css,
return __cfq_set_weight(css, cft, val, true); return __cfq_set_weight(css, cft, val, true);
} }
static int cfqg_print_stat(struct cgroup_subsys_state *css, struct cftype *cft, static int cfqg_print_stat(struct seq_file *sf, void *v)
struct seq_file *sf)
{ {
struct blkcg *blkcg = css_to_blkcg(css); blkcg_print_blkgs(sf, css_to_blkcg(seq_css(sf)), blkg_prfill_stat,
&blkcg_policy_cfq, seq_cft(sf)->private, false);
blkcg_print_blkgs(sf, blkcg, blkg_prfill_stat, &blkcg_policy_cfq,
cft->private, false);
return 0; return 0;
} }
static int cfqg_print_rwstat(struct cgroup_subsys_state *css, static int cfqg_print_rwstat(struct seq_file *sf, void *v)
struct cftype *cft, struct seq_file *sf)
{ {
struct blkcg *blkcg = css_to_blkcg(css); blkcg_print_blkgs(sf, css_to_blkcg(seq_css(sf)), blkg_prfill_rwstat,
&blkcg_policy_cfq, seq_cft(sf)->private, true);
blkcg_print_blkgs(sf, blkcg, blkg_prfill_rwstat, &blkcg_policy_cfq,
cft->private, true);
return 0; return 0;
} }
...@@ -1798,23 +1789,19 @@ static u64 cfqg_prfill_rwstat_recursive(struct seq_file *sf, ...@@ -1798,23 +1789,19 @@ static u64 cfqg_prfill_rwstat_recursive(struct seq_file *sf,
return __blkg_prfill_rwstat(sf, pd, &sum); return __blkg_prfill_rwstat(sf, pd, &sum);
} }
static int cfqg_print_stat_recursive(struct cgroup_subsys_state *css, static int cfqg_print_stat_recursive(struct seq_file *sf, void *v)
struct cftype *cft, struct seq_file *sf)
{ {
struct blkcg *blkcg = css_to_blkcg(css); blkcg_print_blkgs(sf, css_to_blkcg(seq_css(sf)),
cfqg_prfill_stat_recursive, &blkcg_policy_cfq,
blkcg_print_blkgs(sf, blkcg, cfqg_prfill_stat_recursive, seq_cft(sf)->private, false);
&blkcg_policy_cfq, cft->private, false);
return 0; return 0;
} }
static int cfqg_print_rwstat_recursive(struct cgroup_subsys_state *css, static int cfqg_print_rwstat_recursive(struct seq_file *sf, void *v)
struct cftype *cft, struct seq_file *sf)
{ {
struct blkcg *blkcg = css_to_blkcg(css); blkcg_print_blkgs(sf, css_to_blkcg(seq_css(sf)),
cfqg_prfill_rwstat_recursive, &blkcg_policy_cfq,
blkcg_print_blkgs(sf, blkcg, cfqg_prfill_rwstat_recursive, seq_cft(sf)->private, true);
&blkcg_policy_cfq, cft->private, true);
return 0; return 0;
} }
...@@ -1835,13 +1822,11 @@ static u64 cfqg_prfill_avg_queue_size(struct seq_file *sf, ...@@ -1835,13 +1822,11 @@ static u64 cfqg_prfill_avg_queue_size(struct seq_file *sf,
} }
/* print avg_queue_size */ /* print avg_queue_size */
static int cfqg_print_avg_queue_size(struct cgroup_subsys_state *css, static int cfqg_print_avg_queue_size(struct seq_file *sf, void *v)
struct cftype *cft, struct seq_file *sf)
{ {
struct blkcg *blkcg = css_to_blkcg(css); blkcg_print_blkgs(sf, css_to_blkcg(seq_css(sf)),
cfqg_prfill_avg_queue_size, &blkcg_policy_cfq,
blkcg_print_blkgs(sf, blkcg, cfqg_prfill_avg_queue_size, 0, false);
&blkcg_policy_cfq, 0, false);
return 0; return 0;
} }
#endif /* CONFIG_DEBUG_BLK_CGROUP */ #endif /* CONFIG_DEBUG_BLK_CGROUP */
...@@ -1851,14 +1836,14 @@ static struct cftype cfq_blkcg_files[] = { ...@@ -1851,14 +1836,14 @@ static struct cftype cfq_blkcg_files[] = {
{ {
.name = "weight_device", .name = "weight_device",
.flags = CFTYPE_ONLY_ON_ROOT, .flags = CFTYPE_ONLY_ON_ROOT,
.read_seq_string = cfqg_print_leaf_weight_device, .seq_show = cfqg_print_leaf_weight_device,
.write_string = cfqg_set_leaf_weight_device, .write_string = cfqg_set_leaf_weight_device,
.max_write_len = 256, .max_write_len = 256,
}, },
{ {
.name = "weight", .name = "weight",
.flags = CFTYPE_ONLY_ON_ROOT, .flags = CFTYPE_ONLY_ON_ROOT,
.read_seq_string = cfq_print_leaf_weight, .seq_show = cfq_print_leaf_weight,
.write_u64 = cfq_set_leaf_weight, .write_u64 = cfq_set_leaf_weight,
}, },
...@@ -1866,26 +1851,26 @@ static struct cftype cfq_blkcg_files[] = { ...@@ -1866,26 +1851,26 @@ static struct cftype cfq_blkcg_files[] = {
{ {
.name = "weight_device", .name = "weight_device",
.flags = CFTYPE_NOT_ON_ROOT, .flags = CFTYPE_NOT_ON_ROOT,
.read_seq_string = cfqg_print_weight_device, .seq_show = cfqg_print_weight_device,
.write_string = cfqg_set_weight_device, .write_string = cfqg_set_weight_device,
.max_write_len = 256, .max_write_len = 256,
}, },
{ {
.name = "weight", .name = "weight",
.flags = CFTYPE_NOT_ON_ROOT, .flags = CFTYPE_NOT_ON_ROOT,
.read_seq_string = cfq_print_weight, .seq_show = cfq_print_weight,
.write_u64 = cfq_set_weight, .write_u64 = cfq_set_weight,
}, },
{ {
.name = "leaf_weight_device", .name = "leaf_weight_device",
.read_seq_string = cfqg_print_leaf_weight_device, .seq_show = cfqg_print_leaf_weight_device,
.write_string = cfqg_set_leaf_weight_device, .write_string = cfqg_set_leaf_weight_device,
.max_write_len = 256, .max_write_len = 256,
}, },
{ {
.name = "leaf_weight", .name = "leaf_weight",
.read_seq_string = cfq_print_leaf_weight, .seq_show = cfq_print_leaf_weight,
.write_u64 = cfq_set_leaf_weight, .write_u64 = cfq_set_leaf_weight,
}, },
...@@ -1893,114 +1878,114 @@ static struct cftype cfq_blkcg_files[] = { ...@@ -1893,114 +1878,114 @@ static struct cftype cfq_blkcg_files[] = {
{ {
.name = "time", .name = "time",
.private = offsetof(struct cfq_group, stats.time), .private = offsetof(struct cfq_group, stats.time),
.read_seq_string = cfqg_print_stat, .seq_show = cfqg_print_stat,
}, },
{ {
.name = "sectors", .name = "sectors",
.private = offsetof(struct cfq_group, stats.sectors), .private = offsetof(struct cfq_group, stats.sectors),
.read_seq_string = cfqg_print_stat, .seq_show = cfqg_print_stat,
}, },
{ {
.name = "io_service_bytes", .name = "io_service_bytes",
.private = offsetof(struct cfq_group, stats.service_bytes), .private = offsetof(struct cfq_group, stats.service_bytes),
.read_seq_string = cfqg_print_rwstat, .seq_show = cfqg_print_rwstat,
}, },
{ {
.name = "io_serviced", .name = "io_serviced",
.private = offsetof(struct cfq_group, stats.serviced), .private = offsetof(struct cfq_group, stats.serviced),
.read_seq_string = cfqg_print_rwstat, .seq_show = cfqg_print_rwstat,
}, },
{ {
.name = "io_service_time", .name = "io_service_time",
.private = offsetof(struct cfq_group, stats.service_time), .private = offsetof(struct cfq_group, stats.service_time),
.read_seq_string = cfqg_print_rwstat, .seq_show = cfqg_print_rwstat,
}, },
{ {
.name = "io_wait_time", .name = "io_wait_time",
.private = offsetof(struct cfq_group, stats.wait_time), .private = offsetof(struct cfq_group, stats.wait_time),
.read_seq_string = cfqg_print_rwstat, .seq_show = cfqg_print_rwstat,
}, },
{ {
.name = "io_merged", .name = "io_merged",
.private = offsetof(struct cfq_group, stats.merged), .private = offsetof(struct cfq_group, stats.merged),
.read_seq_string = cfqg_print_rwstat, .seq_show = cfqg_print_rwstat,
}, },
{ {
.name = "io_queued", .name = "io_queued",
.private = offsetof(struct cfq_group, stats.queued), .private = offsetof(struct cfq_group, stats.queued),
.read_seq_string = cfqg_print_rwstat, .seq_show = cfqg_print_rwstat,
}, },
/* the same statictics which cover the cfqg and its descendants */ /* the same statictics which cover the cfqg and its descendants */
{ {
.name = "time_recursive", .name = "time_recursive",
.private = offsetof(struct cfq_group, stats.time), .private = offsetof(struct cfq_group, stats.time),
.read_seq_string = cfqg_print_stat_recursive, .seq_show = cfqg_print_stat_recursive,
}, },
{ {
.name = "sectors_recursive", .name = "sectors_recursive",
.private = offsetof(struct cfq_group, stats.sectors), .private = offsetof(struct cfq_group, stats.sectors),
.read_seq_string = cfqg_print_stat_recursive, .seq_show = cfqg_print_stat_recursive,
}, },
{ {
.name = "io_service_bytes_recursive", .name = "io_service_bytes_recursive",
.private = offsetof(struct cfq_group, stats.service_bytes), .private = offsetof(struct cfq_group, stats.service_bytes),
.read_seq_string = cfqg_print_rwstat_recursive, .seq_show = cfqg_print_rwstat_recursive,
}, },
{ {
.name = "io_serviced_recursive", .name = "io_serviced_recursive",
.private = offsetof(struct cfq_group, stats.serviced), .private = offsetof(struct cfq_group, stats.serviced),
.read_seq_string = cfqg_print_rwstat_recursive, .seq_show = cfqg_print_rwstat_recursive,
}, },
{ {
.name = "io_service_time_recursive", .name = "io_service_time_recursive",
.private = offsetof(struct cfq_group, stats.service_time), .private = offsetof(struct cfq_group, stats.service_time),
.read_seq_string = cfqg_print_rwstat_recursive, .seq_show = cfqg_print_rwstat_recursive,
}, },
{ {
.name = "io_wait_time_recursive", .name = "io_wait_time_recursive",
.private = offsetof(struct cfq_group, stats.wait_time), .private = offsetof(struct cfq_group, stats.wait_time),
.read_seq_string = cfqg_print_rwstat_recursive, .seq_show = cfqg_print_rwstat_recursive,
}, },
{ {
.name = "io_merged_recursive", .name = "io_merged_recursive",
.private = offsetof(struct cfq_group, stats.merged), .private = offsetof(struct cfq_group, stats.merged),
.read_seq_string = cfqg_print_rwstat_recursive, .seq_show = cfqg_print_rwstat_recursive,
}, },
{ {
.name = "io_queued_recursive", .name = "io_queued_recursive",
.private = offsetof(struct cfq_group, stats.queued), .private = offsetof(struct cfq_group, stats.queued),
.read_seq_string = cfqg_print_rwstat_recursive, .seq_show = cfqg_print_rwstat_recursive,
}, },
#ifdef CONFIG_DEBUG_BLK_CGROUP #ifdef CONFIG_DEBUG_BLK_CGROUP
{ {
.name = "avg_queue_size", .name = "avg_queue_size",
.read_seq_string = cfqg_print_avg_queue_size, .seq_show = cfqg_print_avg_queue_size,
}, },
{ {
.name = "group_wait_time", .name = "group_wait_time",
.private = offsetof(struct cfq_group, stats.group_wait_time), .private = offsetof(struct cfq_group, stats.group_wait_time),
.read_seq_string = cfqg_print_stat, .seq_show = cfqg_print_stat,
}, },
{ {
.name = "idle_time", .name = "idle_time",
.private = offsetof(struct cfq_group, stats.idle_time), .private = offsetof(struct cfq_group, stats.idle_time),
.read_seq_string = cfqg_print_stat, .seq_show = cfqg_print_stat,
}, },
{ {
.name = "empty_time", .name = "empty_time",
.private = offsetof(struct cfq_group, stats.empty_time), .private = offsetof(struct cfq_group, stats.empty_time),
.read_seq_string = cfqg_print_stat, .seq_show = cfqg_print_stat,
}, },
{ {
.name = "dequeue", .name = "dequeue",
.private = offsetof(struct cfq_group, stats.dequeue), .private = offsetof(struct cfq_group, stats.dequeue),
.read_seq_string = cfqg_print_stat, .seq_show = cfqg_print_stat,
}, },
{ {
.name = "unaccounted_time", .name = "unaccounted_time",
.private = offsetof(struct cfq_group, stats.unaccounted_time), .private = offsetof(struct cfq_group, stats.unaccounted_time),
.read_seq_string = cfqg_print_stat, .seq_show = cfqg_print_stat,
}, },
#endif /* CONFIG_DEBUG_BLK_CGROUP */ #endif /* CONFIG_DEBUG_BLK_CGROUP */
{ } /* terminate */ { } /* terminate */
......
include/linux/cgroup.h
View file @ 2da8ca82
...@@ -444,12 +444,9 @@ struct cftype { ...@@ -444,12 +444,9 @@ struct cftype {
* read_s64() is a signed version of read_u64() * read_s64() is a signed version of read_u64()
*/ */
s64 (*read_s64)(struct cgroup_subsys_state *css, struct cftype *cft); s64 (*read_s64)(struct cgroup_subsys_state *css, struct cftype *cft);
/*
* read_seq_string() is used for outputting a simple sequence /* generic seq_file read interface */
* using seqfile. int (*seq_show)(struct seq_file *sf, void *v);
*/
int (*read_seq_string)(struct cgroup_subsys_state *css,
struct cftype *cft, struct seq_file *m);
/* /*
* write_u64() is a shortcut for the common case of accepting * write_u64() is a shortcut for the common case of accepting
......
kernel/cgroup.c
View file @ 2da8ca82
...@@ -2212,10 +2212,9 @@ static int cgroup_release_agent_write(struct cgroup_subsys_state *css, ...@@ -2212,10 +2212,9 @@ static int cgroup_release_agent_write(struct cgroup_subsys_state *css,
return 0; return 0;
} }
static int cgroup_release_agent_show(struct cgroup_subsys_state *css, static int cgroup_release_agent_show(struct seq_file *seq, void *v)
struct cftype *cft, struct seq_file *seq)
{ {
struct cgroup *cgrp = css->cgroup; struct cgroup *cgrp = seq_css(seq)->cgroup;
if (!cgroup_lock_live_group(cgrp)) if (!cgroup_lock_live_group(cgrp))
return -ENODEV; return -ENODEV;
...@@ -2225,10 +2224,11 @@ static int cgroup_release_agent_show(struct cgroup_subsys_state *css, ...@@ -2225,10 +2224,11 @@ static int cgroup_release_agent_show(struct cgroup_subsys_state *css,
return 0; return 0;
} }
static int cgroup_sane_behavior_show(struct cgroup_subsys_state *css, static int cgroup_sane_behavior_show(struct seq_file *seq, void *v)
struct cftype *cft, struct seq_file *seq)
{ {
seq_printf(seq, "%d\n", cgroup_sane_behavior(css->cgroup)); struct cgroup *cgrp = seq_css(seq)->cgroup;
seq_printf(seq, "%d\n", cgroup_sane_behavior(cgrp));
return 0; return 0;
} }
...@@ -2291,8 +2291,8 @@ static int cgroup_seqfile_show(struct seq_file *m, void *arg) ...@@ -2291,8 +2291,8 @@ static int cgroup_seqfile_show(struct seq_file *m, void *arg)
struct cftype *cft = seq_cft(m); struct cftype *cft = seq_cft(m);
struct cgroup_subsys_state *css = seq_css(m); struct cgroup_subsys_state *css = seq_css(m);
if (cft->read_seq_string) if (cft->seq_show)
return cft->read_seq_string(css, cft, m); return cft->seq_show(m, arg);
if (cft->read_u64) if (cft->read_u64)
seq_printf(m, "%llu\n", cft->read_u64(css, cft)); seq_printf(m, "%llu\n", cft->read_u64(css, cft));
...@@ -2559,7 +2559,7 @@ static umode_t cgroup_file_mode(const struct cftype *cft) ...@@ -2559,7 +2559,7 @@ static umode_t cgroup_file_mode(const struct cftype *cft)
if (cft->mode) if (cft->mode)
return cft->mode; return cft->mode;
if (cft->read_u64 || cft->read_s64 || cft->read_seq_string) if (cft->read_u64 || cft->read_s64 || cft->seq_show)
mode |= S_IRUGO; mode |= S_IRUGO;
if (cft->write_u64 || cft->write_s64 || cft->write_string || if (cft->write_u64 || cft->write_s64 || cft->write_string ||
...@@ -3874,7 +3874,7 @@ static struct cftype cgroup_base_files[] = { ...@@ -3874,7 +3874,7 @@ static struct cftype cgroup_base_files[] = {
{ {
.name = "cgroup.sane_behavior", .name = "cgroup.sane_behavior",
.flags = CFTYPE_ONLY_ON_ROOT, .flags = CFTYPE_ONLY_ON_ROOT,
.read_seq_string = cgroup_sane_behavior_show, .seq_show = cgroup_sane_behavior_show,
}, },
/* /*
...@@ -3899,7 +3899,7 @@ static struct cftype cgroup_base_files[] = { ...@@ -3899,7 +3899,7 @@ static struct cftype cgroup_base_files[] = {
{ {
.name = "release_agent", .name = "release_agent",
.flags = CFTYPE_INSANE | CFTYPE_ONLY_ON_ROOT, .flags = CFTYPE_INSANE | CFTYPE_ONLY_ON_ROOT,
.read_seq_string = cgroup_release_agent_show, .seq_show = cgroup_release_agent_show,
.write_string = cgroup_release_agent_write, .write_string = cgroup_release_agent_write,
.max_write_len = PATH_MAX, .max_write_len = PATH_MAX,
}, },
...@@ -5274,9 +5274,7 @@ static u64 current_css_set_refcount_read(struct cgroup_subsys_state *css, ...@@ -5274,9 +5274,7 @@ static u64 current_css_set_refcount_read(struct cgroup_subsys_state *css,
return count; return count;
} }
static int current_css_set_cg_links_read(struct cgroup_subsys_state *css, static int current_css_set_cg_links_read(struct seq_file *seq, void *v)
struct cftype *cft,
struct seq_file *seq)
{ {
struct cgrp_cset_link *link; struct cgrp_cset_link *link;
struct css_set *cset; struct css_set *cset;
...@@ -5301,9 +5299,9 @@ static int current_css_set_cg_links_read(struct cgroup_subsys_state *css, ...@@ -5301,9 +5299,9 @@ static int current_css_set_cg_links_read(struct cgroup_subsys_state *css,
} }
#define MAX_TASKS_SHOWN_PER_CSS 25 #define MAX_TASKS_SHOWN_PER_CSS 25
static int cgroup_css_links_read(struct cgroup_subsys_state *css, static int cgroup_css_links_read(struct seq_file *seq, void *v)
struct cftype *cft, struct seq_file *seq)
{ {
struct cgroup_subsys_state *css = seq_css(seq);
struct cgrp_cset_link *link; struct cgrp_cset_link *link;
read_lock(&css_set_lock); read_lock(&css_set_lock);
...@@ -5349,12 +5347,12 @@ static struct cftype debug_files[] = { ...@@ -5349,12 +5347,12 @@ static struct cftype debug_files[] = {
{ {
.name = "current_css_set_cg_links", .name = "current_css_set_cg_links",
.read_seq_string = current_css_set_cg_links_read, .seq_show = current_css_set_cg_links_read,
}, },
{ {
.name = "cgroup_css_links", .name = "cgroup_css_links",
.read_seq_string = cgroup_css_links_read, .seq_show = cgroup_css_links_read,
}, },
{ {
......
kernel/cgroup_freezer.c
View file @ 2da8ca82
...@@ -301,10 +301,9 @@ static void update_if_frozen(struct cgroup_subsys_state *css) ...@@ -301,10 +301,9 @@ static void update_if_frozen(struct cgroup_subsys_state *css)
spin_unlock_irq(&freezer->lock); spin_unlock_irq(&freezer->lock);
} }
static int freezer_read(struct cgroup_subsys_state *css, struct cftype *cft, static int freezer_read(struct seq_file *m, void *v)
struct seq_file *m)
{ {
struct cgroup_subsys_state *pos; struct cgroup_subsys_state *css = seq_css(m), *pos;
rcu_read_lock(); rcu_read_lock();
...@@ -458,7 +457,7 @@ static struct cftype files[] = { ...@@ -458,7 +457,7 @@ static struct cftype files[] = {
{ {
.name = "state", .name = "state",
.flags = CFTYPE_NOT_ON_ROOT, .flags = CFTYPE_NOT_ON_ROOT,
.read_seq_string = freezer_read, .seq_show = freezer_read,
.write_string = freezer_write, .write_string = freezer_write,
}, },
{ {
......
kernel/cpuset.c
View file @ 2da8ca82
...@@ -1732,12 +1732,10 @@ static int cpuset_write_resmask(struct cgroup_subsys_state *css, ...@@ -1732,12 +1732,10 @@ static int cpuset_write_resmask(struct cgroup_subsys_state *css,
* and since these maps can change value dynamically, one could read * and since these maps can change value dynamically, one could read
* gibberish by doing partial reads while a list was changing. * gibberish by doing partial reads while a list was changing.
*/ */
static int cpuset_common_read_seq_string(struct cgroup_subsys_state *css, static int cpuset_common_seq_show(struct seq_file *sf, void *v)
struct cftype *cft,
struct seq_file *sf)
{ {
struct cpuset *cs = css_cs(css); struct cpuset *cs = css_cs(seq_css(sf));
cpuset_filetype_t type = cft->private; cpuset_filetype_t type = seq_cft(sf)->private;
ssize_t count; ssize_t count;
char *buf, *s; char *buf, *s;
int ret = 0; int ret = 0;
...@@ -1824,7 +1822,7 @@ static s64 cpuset_read_s64(struct cgroup_subsys_state *css, struct cftype *cft) ...@@ -1824,7 +1822,7 @@ static s64 cpuset_read_s64(struct cgroup_subsys_state *css, struct cftype *cft)
static struct cftype files[] = { static struct cftype files[] = {
{ {
.name = "cpus", .name = "cpus",
.read_seq_string = cpuset_common_read_seq_string, .seq_show = cpuset_common_seq_show,
.write_string = cpuset_write_resmask, .write_string = cpuset_write_resmask,
.max_write_len = (100U + 6 * NR_CPUS), .max_write_len = (100U + 6 * NR_CPUS),
.private = FILE_CPULIST, .private = FILE_CPULIST,
...@@ -1832,7 +1830,7 @@ static struct cftype files[] = { ...@@ -1832,7 +1830,7 @@ static struct cftype files[] = {
{ {
.name = "mems", .name = "mems",
.read_seq_string = cpuset_common_read_seq_string, .seq_show = cpuset_common_seq_show,
.write_string = cpuset_write_resmask, .write_string = cpuset_write_resmask,
.max_write_len = (100U + 6 * MAX_NUMNODES), .max_write_len = (100U + 6 * MAX_NUMNODES),
.private = FILE_MEMLIST, .private = FILE_MEMLIST,
......
kernel/sched/core.c
View file @ 2da8ca82
...@@ -7256,10 +7256,9 @@ static int __cfs_schedulable(struct task_group *tg, u64 period, u64 quota) ...@@ -7256,10 +7256,9 @@ static int __cfs_schedulable(struct task_group *tg, u64 period, u64 quota)
return ret; return ret;
} }
static int cpu_stats_show(struct cgroup_subsys_state *css, struct cftype *cft, static int cpu_stats_show(struct seq_file *sf, void *v)
struct seq_file *sf)
{ {
struct task_group *tg = css_tg(css); struct task_group *tg = css_tg(seq_css(sf));
struct cfs_bandwidth *cfs_b = &tg->cfs_bandwidth; struct cfs_bandwidth *cfs_b = &tg->cfs_bandwidth;
seq_printf(sf, "nr_periods %d\n", cfs_b->nr_periods); seq_printf(sf, "nr_periods %d\n", cfs_b->nr_periods);
...@@ -7318,7 +7317,7 @@ static struct cftype cpu_files[] = { ...@@ -7318,7 +7317,7 @@ static struct cftype cpu_files[] = {
}, },
{ {
.name = "stat", .name = "stat",
.read_seq_string = cpu_stats_show, .seq_show = cpu_stats_show,
}, },
#endif #endif
#ifdef CONFIG_RT_GROUP_SCHED #ifdef CONFIG_RT_GROUP_SCHED
......
kernel/sched/cpuacct.c
View file @ 2da8ca82
...@@ -163,10 +163,9 @@ static int cpuusage_write(struct cgroup_subsys_state *css, struct cftype *cft, ...@@ -163,10 +163,9 @@ static int cpuusage_write(struct cgroup_subsys_state *css, struct cftype *cft,
return err; return err;
} }
static int cpuacct_percpu_seq_read(struct cgroup_subsys_state *css, static int cpuacct_percpu_seq_show(struct seq_file *m, void *V)
struct cftype *cft, struct seq_file *m)
{ {
struct cpuacct *ca = css_ca(css); struct cpuacct *ca = css_ca(seq_css(m));
u64 percpu; u64 percpu;
int i; int i;
...@@ -183,10 +182,9 @@ static const char * const cpuacct_stat_desc[] = { ...@@ -183,10 +182,9 @@ static const char * const cpuacct_stat_desc[] = {
[CPUACCT_STAT_SYSTEM] = "system", [CPUACCT_STAT_SYSTEM] = "system",
}; };
static int cpuacct_stats_show(struct cgroup_subsys_state *css, static int cpuacct_stats_show(struct seq_file *sf, void *v)
struct cftype *cft, struct seq_file *sf)
{ {
struct cpuacct *ca = css_ca(css); struct cpuacct *ca = css_ca(seq_css(sf));
int cpu; int cpu;
s64 val = 0; s64 val = 0;
...@@ -220,11 +218,11 @@ static struct cftype files[] = { ...@@ -220,11 +218,11 @@ static struct cftype files[] = {
}, },
{ {
.name = "usage_percpu", .name = "usage_percpu",
.read_seq_string = cpuacct_percpu_seq_read, .seq_show = cpuacct_percpu_seq_show,
}, },
{ {
.name = "stat", .name = "stat",
.read_seq_string = cpuacct_stats_show, .seq_show = cpuacct_stats_show,
}, },
{ } /* terminate */ { } /* terminate */
}; };
......
mm/memcontrol.c
View file @ 2da8ca82
...@@ -3014,10 +3014,9 @@ static struct kmem_cache *memcg_params_to_cache(struct memcg_cache_params *p) ...@@ -3014,10 +3014,9 @@ static struct kmem_cache *memcg_params_to_cache(struct memcg_cache_params *p)
} }
#ifdef CONFIG_SLABINFO #ifdef CONFIG_SLABINFO
static int mem_cgroup_slabinfo_read(struct cgroup_subsys_state *css, static int mem_cgroup_slabinfo_read(struct seq_file *m, void *v)
struct cftype *cft, struct seq_file *m)
{ {
struct mem_cgroup *memcg = mem_cgroup_from_css(css); struct mem_cgroup *memcg = mem_cgroup_from_css(seq_css(m));
struct memcg_cache_params *params; struct memcg_cache_params *params;
if (!memcg_can_account_kmem(memcg)) if (!memcg_can_account_kmem(memcg))
...@@ -5418,8 +5417,7 @@ static int mem_cgroup_move_charge_write(struct cgroup_subsys_state *css, ...@@ -5418,8 +5417,7 @@ static int mem_cgroup_move_charge_write(struct cgroup_subsys_state *css,
#endif #endif
#ifdef CONFIG_NUMA #ifdef CONFIG_NUMA
static int memcg_numa_stat_show(struct cgroup_subsys_state *css, static int memcg_numa_stat_show(struct seq_file *m, void *v)
struct cftype *cft, struct seq_file *m)
{ {
struct numa_stat { struct numa_stat {
const char *name; const char *name;
...@@ -5435,7 +5433,7 @@ static int memcg_numa_stat_show(struct cgroup_subsys_state *css, ...@@ -5435,7 +5433,7 @@ static int memcg_numa_stat_show(struct cgroup_subsys_state *css,
const struct numa_stat *stat; const struct numa_stat *stat;
int nid; int nid;
unsigned long nr; unsigned long nr;
struct mem_cgroup *memcg = mem_cgroup_from_css(css); struct mem_cgroup *memcg = mem_cgroup_from_css(seq_css(m));
for (stat = stats; stat < stats + ARRAY_SIZE(stats); stat++) { for (stat = stats; stat < stats + ARRAY_SIZE(stats); stat++) {
nr = mem_cgroup_nr_lru_pages(memcg, stat->lru_mask); nr = mem_cgroup_nr_lru_pages(memcg, stat->lru_mask);
...@@ -5474,10 +5472,9 @@ static inline void mem_cgroup_lru_names_not_uptodate(void) ...@@ -5474,10 +5472,9 @@ static inline void mem_cgroup_lru_names_not_uptodate(void)
BUILD_BUG_ON(ARRAY_SIZE(mem_cgroup_lru_names) != NR_LRU_LISTS); BUILD_BUG_ON(ARRAY_SIZE(mem_cgroup_lru_names) != NR_LRU_LISTS);
} }
static int memcg_stat_show(struct cgroup_subsys_state *css, struct cftype *cft, static int memcg_stat_show(struct seq_file *m, void *v)
struct seq_file *m)
{ {
struct mem_cgroup *memcg = mem_cgroup_from_css(css); struct mem_cgroup *memcg = mem_cgroup_from_css(seq_css(m));
struct mem_cgroup *mi; struct mem_cgroup *mi;
unsigned int i; unsigned int i;
...@@ -5907,10 +5904,9 @@ static void mem_cgroup_oom_unregister_event(struct mem_cgroup *memcg, ...@@ -5907,10 +5904,9 @@ static void mem_cgroup_oom_unregister_event(struct mem_cgroup *memcg,
spin_unlock(&memcg_oom_lock); spin_unlock(&memcg_oom_lock);
} }
static int mem_cgroup_oom_control_read(struct cgroup_subsys_state *css, static int mem_cgroup_oom_control_read(struct seq_file *sf, void *v)
struct cftype *cft, struct seq_file *sf)
{ {
struct mem_cgroup *memcg = mem_cgroup_from_css(css); struct mem_cgroup *memcg = mem_cgroup_from_css(seq_css(sf));
seq_printf(sf, "oom_kill_disable %d\n", memcg->oom_kill_disable); seq_printf(sf, "oom_kill_disable %d\n", memcg->oom_kill_disable);
seq_printf(sf, "under_oom %d\n", (bool)atomic_read(&memcg->under_oom)); seq_printf(sf, "under_oom %d\n", (bool)atomic_read(&memcg->under_oom));
...@@ -6260,7 +6256,7 @@ static struct cftype mem_cgroup_files[] = { ...@@ -6260,7 +6256,7 @@ static struct cftype mem_cgroup_files[] = {
}, },
{ {
.name = "stat", .name = "stat",
.read_seq_string = memcg_stat_show, .seq_show = memcg_stat_show,
}, },
{ {
.name = "force_empty", .name = "force_empty",
...@@ -6290,7 +6286,7 @@ static struct cftype mem_cgroup_files[] = { ...@@ -6290,7 +6286,7 @@ static struct cftype mem_cgroup_files[] = {
}, },
{ {
.name = "oom_control", .name = "oom_control",
.read_seq_string = mem_cgroup_oom_control_read, .seq_show = mem_cgroup_oom_control_read,
.write_u64 = mem_cgroup_oom_control_write, .write_u64 = mem_cgroup_oom_control_write,
.private = MEMFILE_PRIVATE(_OOM_TYPE, OOM_CONTROL), .private = MEMFILE_PRIVATE(_OOM_TYPE, OOM_CONTROL),
}, },
...@@ -6300,7 +6296,7 @@ static struct cftype mem_cgroup_files[] = { ...@@ -6300,7 +6296,7 @@ static struct cftype mem_cgroup_files[] = {
#ifdef CONFIG_NUMA #ifdef CONFIG_NUMA
{ {
.name = "numa_stat", .name = "numa_stat",
.read_seq_string = memcg_numa_stat_show, .seq_show = memcg_numa_stat_show,
}, },
#endif #endif
#ifdef CONFIG_MEMCG_KMEM #ifdef CONFIG_MEMCG_KMEM
...@@ -6330,7 +6326,7 @@ static struct cftype mem_cgroup_files[] = { ...@@ -6330,7 +6326,7 @@ static struct cftype mem_cgroup_files[] = {
#ifdef CONFIG_SLABINFO #ifdef CONFIG_SLABINFO
{ {
.name = "kmem.slabinfo", .name = "kmem.slabinfo",
.read_seq_string = mem_cgroup_slabinfo_read, .seq_show = mem_cgroup_slabinfo_read,
}, },
#endif #endif
#endif #endif
......
net/core/netprio_cgroup.c
View file @ 2da8ca82
...@@ -173,14 +173,14 @@ static u64 read_prioidx(struct cgroup_subsys_state *css, struct cftype *cft) ...@@ -173,14 +173,14 @@ static u64 read_prioidx(struct cgroup_subsys_state *css, struct cftype *cft)
return css->cgroup->id; return css->cgroup->id;
} }
static int read_priomap(struct cgroup_subsys_state *css, struct cftype *cft, static int read_priomap(struct seq_file *sf, void *v)
struct seq_file *sf)
{ {
struct net_device *dev; struct net_device *dev;
rcu_read_lock(); rcu_read_lock();
for_each_netdev_rcu(&init_net, dev) for_each_netdev_rcu(&init_net, dev)
seq_printf(sf, "%s %u\n", dev->name, netprio_prio(css, dev)); seq_printf(sf, "%s %u\n", dev->name,
netprio_prio(seq_css(sf), dev));
rcu_read_unlock(); rcu_read_unlock();
return 0; return 0;
} }
...@@ -238,7 +238,7 @@ static struct cftype ss_files[] = { ...@@ -238,7 +238,7 @@ static struct cftype ss_files[] = {
}, },
{ {
.name = "ifpriomap", .name = "ifpriomap",
.read_seq_string = read_priomap, .seq_show = read_priomap,
.write_string = write_priomap, .write_string = write_priomap,
}, },
{ } /* terminate */ { } /* terminate */
......
security/device_cgroup.c
View file @ 2da8ca82
...@@ -274,10 +274,9 @@ static void set_majmin(char *str, unsigned m) ...@@ -274,10 +274,9 @@ static void set_majmin(char *str, unsigned m)
sprintf(str, "%u", m); sprintf(str, "%u", m);
} }
static int devcgroup_seq_read(struct cgroup_subsys_state *css, static int devcgroup_seq_show(struct seq_file *m, void *v)
struct cftype *cft, struct seq_file *m)
{ {
struct dev_cgroup *devcgroup = css_to_devcgroup(css); struct dev_cgroup *devcgroup = css_to_devcgroup(seq_css(m));
struct dev_exception_item *ex; struct dev_exception_item *ex;
char maj[MAJMINLEN], min[MAJMINLEN], acc[ACCLEN]; char maj[MAJMINLEN], min[MAJMINLEN], acc[ACCLEN];
...@@ -679,7 +678,7 @@ static struct cftype dev_cgroup_files[] = { ...@@ -679,7 +678,7 @@ static struct cftype dev_cgroup_files[] = {
}, },
{ {
.name = "list", .name = "list",
.read_seq_string = devcgroup_seq_read, .seq_show = devcgroup_seq_show,
.private = DEVCG_LIST, .private = DEVCG_LIST,
}, },
{ } /* terminate */ { } /* terminate */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7