Skip to content

L
linux
Commit 182446d0 authored by Tejun Heo's avatar Tejun Heo
Browse files
Options

cgroup: pass around cgroup_subsys_state instead of cgroup in file methods 

cgroup is currently in the process of transitioning to using struct
cgroup_subsys_state * as the primary handle instead of struct cgroup.
Please see the previous commit which converts the subsystem methods
for rationale.

This patch converts all cftype file operations to take @css instead of
@cgroup.  cftypes for the cgroup core files don't have their subsytem
pointer set.  These will automatically use the dummy_css added by the
previous patch and can be converted the same way.

Most subsystem conversions are straight forwards but there are some
interesting ones.

* freezer: update_if_frozen() is also converted to take @css instead
  of @cgroup for consistency.  This will make the code look simpler
  too once iterators are converted to use css.

* memory/vmpressure: mem_cgroup_from_css() needs to be exported to
  vmpressure while mem_cgroup_from_cont() can be made static.
  Updated accordingly.

* cpu: cgroup_tg() doesn't have any user left.  Removed.

* cpuacct: cgroup_ca() doesn't have any user left.  Removed.

* hugetlb: hugetlb_cgroup_form_cgroup() doesn't have any user left.
  Removed.

* net_cls: cgrp_cls_state() doesn't have any user left.  Removed.
Signed-off-by: default avatarTejun Heo <tj@kernel.org>
Acked-by: default avatarLi Zefan <lizefan@huawei.com>
Acked-by: default avatarMichal Hocko <mhocko@suse.cz>
Acked-by: default avatarVivek Goyal <vgoyal@redhat.com>
Acked-by: default avatarAristeu Rozanski <aris@redhat.com>
Acked-by: default avatarDaniel Wagner <daniel.wagner@bmw-carit.de>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Cc: Balbir Singh <bsingharora@gmail.com>
Cc: Matt Helsley <matthltc@us.ibm.com>
Cc: Jens Axboe <axboe@kernel.dk>
Cc: Steven Rostedt <rostedt@goodmis.org>
parent 67f4c36f
Hide whitespace changes
Inline Side-by-side
Showing with 322 additions and 328 deletions
block/blk-cgroup.c
View file @ 182446d0
...@@ -437,10 +437,10 @@ struct request_list *__blk_queue_next_rl(struct request_list *rl, ...@@ -437,10 +437,10 @@ struct request_list *__blk_queue_next_rl(struct request_list *rl,
return &blkg->rl; return &blkg->rl;
} }
static int blkcg_reset_stats(struct cgroup *cgroup, struct cftype *cftype, static int blkcg_reset_stats(struct cgroup_subsys_state *css,
u64 val) struct cftype *cftype, u64 val)
{ {
struct blkcg *blkcg = cgroup_to_blkcg(cgroup); struct blkcg *blkcg = css_to_blkcg(css);
struct blkcg_gq *blkg; struct blkcg_gq *blkg;
int i; int i;
......
block/blk-throttle.c
View file @ 182446d0
...@@ -1293,10 +1293,10 @@ static u64 tg_prfill_cpu_rwstat(struct seq_file *sf, ...@@ -1293,10 +1293,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 *cgrp, struct cftype *cft, static int tg_print_cpu_rwstat(struct cgroup_subsys_state *css,
struct seq_file *sf) struct cftype *cft, struct seq_file *sf)
{ {
struct blkcg *blkcg = cgroup_to_blkcg(cgrp); struct blkcg *blkcg = css_to_blkcg(css);
blkcg_print_blkgs(sf, blkcg, tg_prfill_cpu_rwstat, &blkcg_policy_throtl, blkcg_print_blkgs(sf, blkcg, tg_prfill_cpu_rwstat, &blkcg_policy_throtl,
cft->private, true); cft->private, true);
...@@ -1325,26 +1325,26 @@ static u64 tg_prfill_conf_uint(struct seq_file *sf, struct blkg_policy_data *pd, ...@@ -1325,26 +1325,26 @@ 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 *cgrp, struct cftype *cft, static int tg_print_conf_u64(struct cgroup_subsys_state *css,
struct seq_file *sf) struct cftype *cft, struct seq_file *sf)
{ {
blkcg_print_blkgs(sf, cgroup_to_blkcg(cgrp), tg_prfill_conf_u64, blkcg_print_blkgs(sf, css_to_blkcg(css), tg_prfill_conf_u64,
&blkcg_policy_throtl, cft->private, false); &blkcg_policy_throtl, cft->private, false);
return 0; return 0;
} }
static int tg_print_conf_uint(struct cgroup *cgrp, struct cftype *cft, static int tg_print_conf_uint(struct cgroup_subsys_state *css,
struct seq_file *sf) struct cftype *cft, struct seq_file *sf)
{ {
blkcg_print_blkgs(sf, cgroup_to_blkcg(cgrp), tg_prfill_conf_uint, blkcg_print_blkgs(sf, css_to_blkcg(css), tg_prfill_conf_uint,
&blkcg_policy_throtl, cft->private, false); &blkcg_policy_throtl, cft->private, false);
return 0; return 0;
} }
static int tg_set_conf(struct cgroup *cgrp, struct cftype *cft, const char *buf, static int tg_set_conf(struct cgroup_subsys_state *css, struct cftype *cft,
bool is_u64) const char *buf, bool is_u64)
{ {
struct blkcg *blkcg = cgroup_to_blkcg(cgrp); struct blkcg *blkcg = css_to_blkcg(css);
struct blkg_conf_ctx ctx; struct blkg_conf_ctx ctx;
struct throtl_grp *tg; struct throtl_grp *tg;
struct throtl_service_queue *sq; struct throtl_service_queue *sq;
...@@ -1403,16 +1403,16 @@ static int tg_set_conf(struct cgroup *cgrp, struct cftype *cft, const char *buf, ...@@ -1403,16 +1403,16 @@ static int tg_set_conf(struct cgroup *cgrp, struct cftype *cft, const char *buf,
return 0; return 0;
} }
static int tg_set_conf_u64(struct cgroup *cgrp, struct cftype *cft, static int tg_set_conf_u64(struct cgroup_subsys_state *css, struct cftype *cft,
const char *buf) const char *buf)
{ {
return tg_set_conf(cgrp, cft, buf, true); return tg_set_conf(css, cft, buf, true);
} }
static int tg_set_conf_uint(struct cgroup *cgrp, struct cftype *cft, static int tg_set_conf_uint(struct cgroup_subsys_state *css, struct cftype *cft,
const char *buf) const char *buf)
{ {
return tg_set_conf(cgrp, cft, buf, false); return tg_set_conf(css, cft, buf, false);
} }
static struct cftype throtl_files[] = { static struct cftype throtl_files[] = {
......
block/cfq-iosched.c
View file @ 182446d0
...@@ -1607,12 +1607,11 @@ static u64 cfqg_prfill_weight_device(struct seq_file *sf, ...@@ -1607,12 +1607,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 *cgrp, struct cftype *cft, static int cfqg_print_weight_device(struct cgroup_subsys_state *css,
struct seq_file *sf) struct cftype *cft, struct seq_file *sf)
{ {
blkcg_print_blkgs(sf, cgroup_to_blkcg(cgrp), blkcg_print_blkgs(sf, css_to_blkcg(css), cfqg_prfill_weight_device,
cfqg_prfill_weight_device, &blkcg_policy_cfq, 0, &blkcg_policy_cfq, 0, false);
false);
return 0; return 0;
} }
...@@ -1626,35 +1625,34 @@ static u64 cfqg_prfill_leaf_weight_device(struct seq_file *sf, ...@@ -1626,35 +1625,34 @@ 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 *cgrp, static int cfqg_print_leaf_weight_device(struct cgroup_subsys_state *css,
struct cftype *cft, struct cftype *cft,
struct seq_file *sf) struct seq_file *sf)
{ {
blkcg_print_blkgs(sf, cgroup_to_blkcg(cgrp), blkcg_print_blkgs(sf, css_to_blkcg(css), cfqg_prfill_leaf_weight_device,
cfqg_prfill_leaf_weight_device, &blkcg_policy_cfq, 0, &blkcg_policy_cfq, 0, false);
false);
return 0; return 0;
} }
static int cfq_print_weight(struct cgroup *cgrp, struct cftype *cft, static int cfq_print_weight(struct cgroup_subsys_state *css, struct cftype *cft,
struct seq_file *sf) struct seq_file *sf)
{ {
seq_printf(sf, "%u\n", cgroup_to_blkcg(cgrp)->cfq_weight); seq_printf(sf, "%u\n", css_to_blkcg(css)->cfq_weight);
return 0; return 0;
} }
static int cfq_print_leaf_weight(struct cgroup *cgrp, struct cftype *cft, static int cfq_print_leaf_weight(struct cgroup_subsys_state *css,
struct seq_file *sf) struct cftype *cft, struct seq_file *sf)
{ {
seq_printf(sf, "%u\n", seq_printf(sf, "%u\n", css_to_blkcg(css)->cfq_leaf_weight);
cgroup_to_blkcg(cgrp)->cfq_leaf_weight);
return 0; return 0;
} }
static int __cfqg_set_weight_device(struct cgroup *cgrp, struct cftype *cft, static int __cfqg_set_weight_device(struct cgroup_subsys_state *css,
const char *buf, bool is_leaf_weight) struct cftype *cft, const char *buf,
bool is_leaf_weight)
{ {
struct blkcg *blkcg = cgroup_to_blkcg(cgrp); struct blkcg *blkcg = css_to_blkcg(css);
struct blkg_conf_ctx ctx; struct blkg_conf_ctx ctx;
struct cfq_group *cfqg; struct cfq_group *cfqg;
int ret; int ret;
...@@ -1680,22 +1678,22 @@ static int __cfqg_set_weight_device(struct cgroup *cgrp, struct cftype *cft, ...@@ -1680,22 +1678,22 @@ static int __cfqg_set_weight_device(struct cgroup *cgrp, struct cftype *cft,
return ret; return ret;
} }
static int cfqg_set_weight_device(struct cgroup *cgrp, struct cftype *cft, static int cfqg_set_weight_device(struct cgroup_subsys_state *css,
const char *buf) struct cftype *cft, const char *buf)
{ {
return __cfqg_set_weight_device(cgrp, cft, buf, false); return __cfqg_set_weight_device(css, cft, buf, false);
} }
static int cfqg_set_leaf_weight_device(struct cgroup *cgrp, struct cftype *cft, static int cfqg_set_leaf_weight_device(struct cgroup_subsys_state *css,
const char *buf) struct cftype *cft, const char *buf)
{ {
return __cfqg_set_weight_device(cgrp, cft, buf, true); return __cfqg_set_weight_device(css, cft, buf, true);
} }
static int __cfq_set_weight(struct cgroup *cgrp, struct cftype *cft, u64 val, static int __cfq_set_weight(struct cgroup_subsys_state *css, struct cftype *cft,
bool is_leaf_weight) u64 val, bool is_leaf_weight)
{ {
struct blkcg *blkcg = cgroup_to_blkcg(cgrp); struct blkcg *blkcg = css_to_blkcg(css);
struct blkcg_gq *blkg; struct blkcg_gq *blkg;
if (val < CFQ_WEIGHT_MIN || val > CFQ_WEIGHT_MAX) if (val < CFQ_WEIGHT_MIN || val > CFQ_WEIGHT_MAX)
...@@ -1727,30 +1725,32 @@ static int __cfq_set_weight(struct cgroup *cgrp, struct cftype *cft, u64 val, ...@@ -1727,30 +1725,32 @@ static int __cfq_set_weight(struct cgroup *cgrp, struct cftype *cft, u64 val,
return 0; return 0;
} }
static int cfq_set_weight(struct cgroup *cgrp, struct cftype *cft, u64 val) static int cfq_set_weight(struct cgroup_subsys_state *css, struct cftype *cft,
u64 val)
{ {
return __cfq_set_weight(cgrp, cft, val, false); return __cfq_set_weight(css, cft, val, false);
} }
static int cfq_set_leaf_weight(struct cgroup *cgrp, struct cftype *cft, u64 val) static int cfq_set_leaf_weight(struct cgroup_subsys_state *css,
struct cftype *cft, u64 val)
{ {
return __cfq_set_weight(cgrp, cft, val, true); return __cfq_set_weight(css, cft, val, true);
} }
static int cfqg_print_stat(struct cgroup *cgrp, struct cftype *cft, static int cfqg_print_stat(struct cgroup_subsys_state *css, struct cftype *cft,
struct seq_file *sf) struct seq_file *sf)
{ {
struct blkcg *blkcg = cgroup_to_blkcg(cgrp); struct blkcg *blkcg = css_to_blkcg(css);
blkcg_print_blkgs(sf, blkcg, blkg_prfill_stat, &blkcg_policy_cfq, blkcg_print_blkgs(sf, blkcg, blkg_prfill_stat, &blkcg_policy_cfq,
cft->private, false); cft->private, false);
return 0; return 0;
} }
static int cfqg_print_rwstat(struct cgroup *cgrp, struct cftype *cft, static int cfqg_print_rwstat(struct cgroup_subsys_state *css,
struct seq_file *sf) struct cftype *cft, struct seq_file *sf)
{ {
struct blkcg *blkcg = cgroup_to_blkcg(cgrp); struct blkcg *blkcg = css_to_blkcg(css);
blkcg_print_blkgs(sf, blkcg, blkg_prfill_rwstat, &blkcg_policy_cfq, blkcg_print_blkgs(sf, blkcg, blkg_prfill_rwstat, &blkcg_policy_cfq,
cft->private, true); cft->private, true);
...@@ -1773,20 +1773,20 @@ static u64 cfqg_prfill_rwstat_recursive(struct seq_file *sf, ...@@ -1773,20 +1773,20 @@ 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 *cgrp, struct cftype *cft, static int cfqg_print_stat_recursive(struct cgroup_subsys_state *css,
struct seq_file *sf) struct cftype *cft, struct seq_file *sf)
{ {
struct blkcg *blkcg = cgroup_to_blkcg(cgrp); struct blkcg *blkcg = css_to_blkcg(css);
blkcg_print_blkgs(sf, blkcg, cfqg_prfill_stat_recursive, blkcg_print_blkgs(sf, blkcg, cfqg_prfill_stat_recursive,
&blkcg_policy_cfq, cft->private, false); &blkcg_policy_cfq, cft->private, false);
return 0; return 0;
} }
static int cfqg_print_rwstat_recursive(struct cgroup *cgrp, struct cftype *cft, static int cfqg_print_rwstat_recursive(struct cgroup_subsys_state *css,
struct seq_file *sf) struct cftype *cft, struct seq_file *sf)
{ {
struct blkcg *blkcg = cgroup_to_blkcg(cgrp); struct blkcg *blkcg = css_to_blkcg(css);
blkcg_print_blkgs(sf, blkcg, cfqg_prfill_rwstat_recursive, blkcg_print_blkgs(sf, blkcg, cfqg_prfill_rwstat_recursive,
&blkcg_policy_cfq, cft->private, true); &blkcg_policy_cfq, cft->private, true);
...@@ -1810,10 +1810,10 @@ static u64 cfqg_prfill_avg_queue_size(struct seq_file *sf, ...@@ -1810,10 +1810,10 @@ 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 *cgrp, struct cftype *cft, static int cfqg_print_avg_queue_size(struct cgroup_subsys_state *css,
struct seq_file *sf) struct cftype *cft, struct seq_file *sf)
{ {
struct blkcg *blkcg = cgroup_to_blkcg(cgrp); struct blkcg *blkcg = css_to_blkcg(css);
blkcg_print_blkgs(sf, blkcg, cfqg_prfill_avg_queue_size, blkcg_print_blkgs(sf, blkcg, cfqg_prfill_avg_queue_size,
&blkcg_policy_cfq, 0, false); &blkcg_policy_cfq, 0, false);
......
include/linux/cgroup.h
View file @ 182446d0
...@@ -439,34 +439,34 @@ struct cftype { ...@@ -439,34 +439,34 @@ struct cftype {
struct cgroup_subsys *ss; struct cgroup_subsys *ss;
int (*open)(struct inode *inode, struct file *file); int (*open)(struct inode *inode, struct file *file);
ssize_t (*read)(struct cgroup *cgrp, struct cftype *cft, ssize_t (*read)(struct cgroup_subsys_state *css, struct cftype *cft,
struct file *file, struct file *file,
char __user *buf, size_t nbytes, loff_t *ppos); char __user *buf, size_t nbytes, loff_t *ppos);
/* /*
* read_u64() is a shortcut for the common case of returning a * read_u64() is a shortcut for the common case of returning a
* single integer. Use it in place of read() * single integer. Use it in place of read()
*/ */
u64 (*read_u64)(struct cgroup *cgrp, struct cftype *cft); u64 (*read_u64)(struct cgroup_subsys_state *css, struct cftype *cft);
/* /*
* read_s64() is a signed version of read_u64() * read_s64() is a signed version of read_u64()
*/ */
s64 (*read_s64)(struct cgroup *cgrp, struct cftype *cft); s64 (*read_s64)(struct cgroup_subsys_state *css, struct cftype *cft);
/* /*
* read_map() is used for defining a map of key/value * read_map() is used for defining a map of key/value
* pairs. It should call cb->fill(cb, key, value) for each * pairs. It should call cb->fill(cb, key, value) for each
* entry. The key/value pairs (and their ordering) should not * entry. The key/value pairs (and their ordering) should not
* change between reboots. * change between reboots.
*/ */
int (*read_map)(struct cgroup *cgrp, struct cftype *cft, int (*read_map)(struct cgroup_subsys_state *css, struct cftype *cft,
struct cgroup_map_cb *cb); struct cgroup_map_cb *cb);
/* /*
* read_seq_string() is used for outputting a simple sequence * read_seq_string() is used for outputting a simple sequence
* using seqfile. * using seqfile.
*/ */
int (*read_seq_string)(struct cgroup *cgrp, struct cftype *cft, int (*read_seq_string)(struct cgroup_subsys_state *css,
struct seq_file *m); struct cftype *cft, struct seq_file *m);
ssize_t (*write)(struct cgroup *cgrp, struct cftype *cft, ssize_t (*write)(struct cgroup_subsys_state *css, struct cftype *cft,
struct file *file, struct file *file,
const char __user *buf, size_t nbytes, loff_t *ppos); const char __user *buf, size_t nbytes, loff_t *ppos);
...@@ -475,18 +475,20 @@ struct cftype { ...@@ -475,18 +475,20 @@ struct cftype {
* a single integer (as parsed by simple_strtoull) from * a single integer (as parsed by simple_strtoull) from
* userspace. Use in place of write(); return 0 or error. * userspace. Use in place of write(); return 0 or error.
*/ */
int (*write_u64)(struct cgroup *cgrp, struct cftype *cft, u64 val); int (*write_u64)(struct cgroup_subsys_state *css, struct cftype *cft,
u64 val);
/* /*
* write_s64() is a signed version of write_u64() * write_s64() is a signed version of write_u64()
*/ */
int (*write_s64)(struct cgroup *cgrp, struct cftype *cft, s64 val); int (*write_s64)(struct cgroup_subsys_state *css, struct cftype *cft,
s64 val);
/* /*
* write_string() is passed a nul-terminated kernelspace * write_string() is passed a nul-terminated kernelspace
* buffer of maximum length determined by max_write_len. * buffer of maximum length determined by max_write_len.
* Returns 0 or -ve error code. * Returns 0 or -ve error code.
*/ */
int (*write_string)(struct cgroup *cgrp, struct cftype *cft, int (*write_string)(struct cgroup_subsys_state *css, struct cftype *cft,
const char *buffer); const char *buffer);
/* /*
* trigger() callback can be used to get some kick from the * trigger() callback can be used to get some kick from the
...@@ -494,7 +496,7 @@ struct cftype { ...@@ -494,7 +496,7 @@ struct cftype {
* at all. The private field can be used to determine the * at all. The private field can be used to determine the
* kick type for multiplexing. * kick type for multiplexing.
*/ */
int (*trigger)(struct cgroup *cgrp, unsigned int event); int (*trigger)(struct cgroup_subsys_state *css, unsigned int event);
int (*release)(struct inode *inode, struct file *file); int (*release)(struct inode *inode, struct file *file);
......
include/linux/memcontrol.h
View file @ 182446d0
...@@ -85,7 +85,7 @@ extern struct mem_cgroup *mem_cgroup_from_task(struct task_struct *p); ...@@ -85,7 +85,7 @@ extern struct mem_cgroup *mem_cgroup_from_task(struct task_struct *p);
extern struct mem_cgroup *try_get_mem_cgroup_from_mm(struct mm_struct *mm); extern struct mem_cgroup *try_get_mem_cgroup_from_mm(struct mm_struct *mm);
extern struct mem_cgroup *parent_mem_cgroup(struct mem_cgroup *memcg); extern struct mem_cgroup *parent_mem_cgroup(struct mem_cgroup *memcg);
extern struct mem_cgroup *mem_cgroup_from_cont(struct cgroup *cont); extern struct mem_cgroup *mem_cgroup_from_css(struct cgroup_subsys_state *css);
static inline static inline
bool mm_match_cgroup(const struct mm_struct *mm, const struct mem_cgroup *memcg) bool mm_match_cgroup(const struct mm_struct *mm, const struct mem_cgroup *memcg)
......
kernel/cgroup.c
View file @ 182446d0
...@@ -2235,34 +2235,38 @@ int cgroup_attach_task_all(struct task_struct *from, struct task_struct *tsk) ...@@ -2235,34 +2235,38 @@ int cgroup_attach_task_all(struct task_struct *from, struct task_struct *tsk)
} }
EXPORT_SYMBOL_GPL(cgroup_attach_task_all); EXPORT_SYMBOL_GPL(cgroup_attach_task_all);
static int cgroup_tasks_write(struct cgroup *cgrp, struct cftype *cft, u64 pid) static int cgroup_tasks_write(struct cgroup_subsys_state *css,
struct cftype *cft, u64 pid)
{ {
return attach_task_by_pid(cgrp, pid, false); return attach_task_by_pid(css->cgroup, pid, false);
} }
static int cgroup_procs_write(struct cgroup *cgrp, struct cftype *cft, u64 tgid) static int cgroup_procs_write(struct cgroup_subsys_state *css,
struct cftype *cft, u64 tgid)
{ {
return attach_task_by_pid(cgrp, tgid, true); return attach_task_by_pid(css->cgroup, tgid, true);
} }
static int cgroup_release_agent_write(struct cgroup *cgrp, struct cftype *cft, static int cgroup_release_agent_write(struct cgroup_subsys_state *css,
const char *buffer) struct cftype *cft, const char *buffer)
{ {
BUILD_BUG_ON(sizeof(cgrp->root->release_agent_path) < PATH_MAX); BUILD_BUG_ON(sizeof(css->cgroup->root->release_agent_path) < PATH_MAX);
if (strlen(buffer) >= PATH_MAX) if (strlen(buffer) >= PATH_MAX)
return -EINVAL; return -EINVAL;
if (!cgroup_lock_live_group(cgrp)) if (!cgroup_lock_live_group(css->cgroup))
return -ENODEV; return -ENODEV;
mutex_lock(&cgroup_root_mutex); mutex_lock(&cgroup_root_mutex);
strcpy(cgrp->root->release_agent_path, buffer); strcpy(css->cgroup->root->release_agent_path, buffer);
mutex_unlock(&cgroup_root_mutex); mutex_unlock(&cgroup_root_mutex);
mutex_unlock(&cgroup_mutex); mutex_unlock(&cgroup_mutex);
return 0; return 0;
} }
static int cgroup_release_agent_show(struct cgroup *cgrp, struct cftype *cft, static int cgroup_release_agent_show(struct cgroup_subsys_state *css,
struct seq_file *seq) struct cftype *cft, struct seq_file *seq)
{ {
struct cgroup *cgrp = css->cgroup;
if (!cgroup_lock_live_group(cgrp)) if (!cgroup_lock_live_group(cgrp))
return -ENODEV; return -ENODEV;
seq_puts(seq, cgrp->root->release_agent_path); seq_puts(seq, cgrp->root->release_agent_path);
...@@ -2271,10 +2275,10 @@ static int cgroup_release_agent_show(struct cgroup *cgrp, struct cftype *cft, ...@@ -2271,10 +2275,10 @@ static int cgroup_release_agent_show(struct cgroup *cgrp, struct cftype *cft,
return 0; return 0;
} }
static int cgroup_sane_behavior_show(struct cgroup *cgrp, struct cftype *cft, static int cgroup_sane_behavior_show(struct cgroup_subsys_state *css,
struct seq_file *seq) struct cftype *cft, struct seq_file *seq)
{ {
seq_printf(seq, "%d\n", cgroup_sane_behavior(cgrp)); seq_printf(seq, "%d\n", cgroup_sane_behavior(css->cgroup));
return 0; return 0;
} }
...@@ -2292,10 +2296,10 @@ static struct cgroup_subsys_state *cgroup_file_css(struct cfent *cfe) ...@@ -2292,10 +2296,10 @@ static struct cgroup_subsys_state *cgroup_file_css(struct cfent *cfe)
/* A buffer size big enough for numbers or short strings */ /* A buffer size big enough for numbers or short strings */
#define CGROUP_LOCAL_BUFFER_SIZE 64 #define CGROUP_LOCAL_BUFFER_SIZE 64
static ssize_t cgroup_write_X64(struct cgroup *cgrp, struct cftype *cft, static ssize_t cgroup_write_X64(struct cgroup_subsys_state *css,
struct file *file, struct cftype *cft, struct file *file,
const char __user *userbuf, const char __user *userbuf, size_t nbytes,
size_t nbytes, loff_t *unused_ppos) loff_t *unused_ppos)
{ {
char buffer[CGROUP_LOCAL_BUFFER_SIZE]; char buffer[CGROUP_LOCAL_BUFFER_SIZE];
int retval = 0; int retval = 0;
...@@ -2313,22 +2317,22 @@ static ssize_t cgroup_write_X64(struct cgroup *cgrp, struct cftype *cft, ...@@ -2313,22 +2317,22 @@ static ssize_t cgroup_write_X64(struct cgroup *cgrp, struct cftype *cft,
u64 val = simple_strtoull(strstrip(buffer), &end, 0); u64 val = simple_strtoull(strstrip(buffer), &end, 0);
if (*end) if (*end)
return -EINVAL; return -EINVAL;
retval = cft->write_u64(cgrp, cft, val); retval = cft->write_u64(css, cft, val);
} else { } else {
s64 val = simple_strtoll(strstrip(buffer), &end, 0); s64 val = simple_strtoll(strstrip(buffer), &end, 0);
if (*end) if (*end)
return -EINVAL; return -EINVAL;
retval = cft->write_s64(cgrp, cft, val); retval = cft->write_s64(css, cft, val);
} }
if (!retval) if (!retval)
retval = nbytes; retval = nbytes;
return retval; return retval;
} }
static ssize_t cgroup_write_string(struct cgroup *cgrp, struct cftype *cft, static ssize_t cgroup_write_string(struct cgroup_subsys_state *css,
struct file *file, struct cftype *cft, struct file *file,
const char __user *userbuf, const char __user *userbuf, size_t nbytes,
size_t nbytes, loff_t *unused_ppos) loff_t *unused_ppos)
{ {
char local_buffer[CGROUP_LOCAL_BUFFER_SIZE]; char local_buffer[CGROUP_LOCAL_BUFFER_SIZE];
int retval = 0; int retval = 0;
...@@ -2351,7 +2355,7 @@ static ssize_t cgroup_write_string(struct cgroup *cgrp, struct cftype *cft, ...@@ -2351,7 +2355,7 @@ static ssize_t cgroup_write_string(struct cgroup *cgrp, struct cftype *cft,
} }
buffer[nbytes] = 0; /* nul-terminate */ buffer[nbytes] = 0; /* nul-terminate */
retval = cft->write_string(cgrp, cft, strstrip(buffer)); retval = cft->write_string(css, cft, strstrip(buffer));
if (!retval) if (!retval)
retval = nbytes; retval = nbytes;
out: out:
...@@ -2361,60 +2365,60 @@ static ssize_t cgroup_write_string(struct cgroup *cgrp, struct cftype *cft, ...@@ -2361,60 +2365,60 @@ static ssize_t cgroup_write_string(struct cgroup *cgrp, struct cftype *cft,
} }
static ssize_t cgroup_file_write(struct file *file, const char __user *buf, static ssize_t cgroup_file_write(struct file *file, const char __user *buf,
size_t nbytes, loff_t *ppos) size_t nbytes, loff_t *ppos)
{ {
struct cfent *cfe = __d_cfe(file->f_dentry);
struct cftype *cft = __d_cft(file->f_dentry); struct cftype *cft = __d_cft(file->f_dentry);
struct cgroup *cgrp = __d_cgrp(file->f_dentry->d_parent); struct cgroup_subsys_state *css = cgroup_file_css(cfe);
if (cft->write) if (cft->write)
return cft->write(cgrp, cft, file, buf, nbytes, ppos); return cft->write(css, cft, file, buf, nbytes, ppos);
if (cft->write_u64 || cft->write_s64) if (cft->write_u64 || cft->write_s64)
return cgroup_write_X64(cgrp, cft, file, buf, nbytes, ppos); return cgroup_write_X64(css, cft, file, buf, nbytes, ppos);
if (cft->write_string) if (cft->write_string)
return cgroup_write_string(cgrp, cft, file, buf, nbytes, ppos); return cgroup_write_string(css, cft, file, buf, nbytes, ppos);
if (cft->trigger) { if (cft->trigger) {
int ret = cft->trigger(cgrp, (unsigned int)cft->private); int ret = cft->trigger(css, (unsigned int)cft->private);
return ret ? ret : nbytes; return ret ? ret : nbytes;
} }
return -EINVAL; return -EINVAL;
} }
static ssize_t cgroup_read_u64(struct cgroup *cgrp, struct cftype *cft, static ssize_t cgroup_read_u64(struct cgroup_subsys_state *css,
struct file *file, struct cftype *cft, struct file *file,
char __user *buf, size_t nbytes, char __user *buf, size_t nbytes, loff_t *ppos)
loff_t *ppos)
{ {
char tmp[CGROUP_LOCAL_BUFFER_SIZE]; char tmp[CGROUP_LOCAL_BUFFER_SIZE];
u64 val = cft->read_u64(cgrp, cft); u64 val = cft->read_u64(css, cft);
int len = sprintf(tmp, "%llu\n", (unsigned long long) val); int len = sprintf(tmp, "%llu\n", (unsigned long long) val);
return simple_read_from_buffer(buf, nbytes, ppos, tmp, len); return simple_read_from_buffer(buf, nbytes, ppos, tmp, len);
} }
static ssize_t cgroup_read_s64(struct cgroup *cgrp, struct cftype *cft, static ssize_t cgroup_read_s64(struct cgroup_subsys_state *css,
struct file *file, struct cftype *cft, struct file *file,
char __user *buf, size_t nbytes, char __user *buf, size_t nbytes, loff_t *ppos)
loff_t *ppos)
{ {
char tmp[CGROUP_LOCAL_BUFFER_SIZE]; char tmp[CGROUP_LOCAL_BUFFER_SIZE];
s64 val = cft->read_s64(cgrp, cft); s64 val = cft->read_s64(css, cft);
int len = sprintf(tmp, "%lld\n", (long long) val); int len = sprintf(tmp, "%lld\n", (long long) val);
return simple_read_from_buffer(buf, nbytes, ppos, tmp, len); return simple_read_from_buffer(buf, nbytes, ppos, tmp, len);
} }
static ssize_t cgroup_file_read(struct file *file, char __user *buf, static ssize_t cgroup_file_read(struct file *file, char __user *buf,
size_t nbytes, loff_t *ppos) size_t nbytes, loff_t *ppos)
{ {
struct cfent *cfe = __d_cfe(file->f_dentry);
struct cftype *cft = __d_cft(file->f_dentry); struct cftype *cft = __d_cft(file->f_dentry);
struct cgroup *cgrp = __d_cgrp(file->f_dentry->d_parent); struct cgroup_subsys_state *css = cgroup_file_css(cfe);
if (cft->read) if (cft->read)
return cft->read(cgrp, cft, file, buf, nbytes, ppos); return cft->read(css, cft, file, buf, nbytes, ppos);
if (cft->read_u64) if (cft->read_u64)
return cgroup_read_u64(cgrp, cft, file, buf, nbytes, ppos); return cgroup_read_u64(css, cft, file, buf, nbytes, ppos);
if (cft->read_s64) if (cft->read_s64)
return cgroup_read_s64(cgrp, cft, file, buf, nbytes, ppos); return cgroup_read_s64(css, cft, file, buf, nbytes, ppos);
return -EINVAL; return -EINVAL;
} }
...@@ -2433,16 +2437,16 @@ static int cgroup_seqfile_show(struct seq_file *m, void *arg) ...@@ -2433,16 +2437,16 @@ static int cgroup_seqfile_show(struct seq_file *m, void *arg)
{ {
struct cfent *cfe = m->private; struct cfent *cfe = m->private;
struct cftype *cft = cfe->type; struct cftype *cft = cfe->type;
struct cgroup *cgrp = __d_cgrp(cfe->dentry->d_parent); struct cgroup_subsys_state *css = cgroup_file_css(cfe);
if (cft->read_map) { if (cft->read_map) {
struct cgroup_map_cb cb = { struct cgroup_map_cb cb = {
.fill = cgroup_map_add, .fill = cgroup_map_add,
.state = m, .state = m,
}; };
return cft->read_map(cgrp, cft, &cb); return cft->read_map(css, cft, &cb);
} }
return cft->read_seq_string(cgrp, cft, m); return cft->read_seq_string(css, cft, m);
} }
static const struct file_operations cgroup_seqfile_operations = { static const struct file_operations cgroup_seqfile_operations = {
...@@ -3860,21 +3864,20 @@ static int cgroup_procs_open(struct inode *unused, struct file *file) ...@@ -3860,21 +3864,20 @@ static int cgroup_procs_open(struct inode *unused, struct file *file)
return cgroup_pidlist_open(file, CGROUP_FILE_PROCS); return cgroup_pidlist_open(file, CGROUP_FILE_PROCS);
} }
static u64 cgroup_read_notify_on_release(struct cgroup *cgrp, static u64 cgroup_read_notify_on_release(struct cgroup_subsys_state *css,
struct cftype *cft) struct cftype *cft)
{ {
return notify_on_release(cgrp); return notify_on_release(css->cgroup);
} }
static int cgroup_write_notify_on_release(struct cgroup *cgrp, static int cgroup_write_notify_on_release(struct cgroup_subsys_state *css,
struct cftype *cft, struct cftype *cft, u64 val)
u64 val)
{ {
clear_bit(CGRP_RELEASABLE, &cgrp->flags); clear_bit(CGRP_RELEASABLE, &css->cgroup->flags);
if (val) if (val)
set_bit(CGRP_NOTIFY_ON_RELEASE, &cgrp->flags); set_bit(CGRP_NOTIFY_ON_RELEASE, &css->cgroup->flags);
else else
clear_bit(CGRP_NOTIFY_ON_RELEASE, &cgrp->flags); clear_bit(CGRP_NOTIFY_ON_RELEASE, &css->cgroup->flags);
return 0; return 0;
} }
...@@ -3972,9 +3975,10 @@ static void cgroup_event_ptable_queue_proc(struct file *file, ...@@ -3972,9 +3975,10 @@ static void cgroup_event_ptable_queue_proc(struct file *file,
* Input must be in format '<event_fd> <control_fd> <args>'. * Input must be in format '<event_fd> <control_fd> <args>'.
* Interpretation of args is defined by control file implementation. * Interpretation of args is defined by control file implementation.
*/ */
static int cgroup_write_event_control(struct cgroup *cgrp, struct cftype *cft, static int cgroup_write_event_control(struct cgroup_subsys_state *css,
const char *buffer) struct cftype *cft, const char *buffer)
{ {
struct cgroup *cgrp = css->cgroup;
struct cgroup_event *event; struct cgroup_event *event;
struct cgroup *cgrp_cfile; struct cgroup *cgrp_cfile;
unsigned int efd, cfd; unsigned int efd, cfd;
...@@ -4082,20 +4086,19 @@ static int cgroup_write_event_control(struct cgroup *cgrp, struct cftype *cft, ...@@ -4082,20 +4086,19 @@ static int cgroup_write_event_control(struct cgroup *cgrp, struct cftype *cft,
return ret; return ret;
} }
static u64 cgroup_clone_children_read(struct cgroup *cgrp, static u64 cgroup_clone_children_read(struct cgroup_subsys_state *css,
struct cftype *cft) struct cftype *cft)
{ {
return test_bit(CGRP_CPUSET_CLONE_CHILDREN, &cgrp->flags); return test_bit(CGRP_CPUSET_CLONE_CHILDREN, &css->cgroup->flags);
} }
static int cgroup_clone_children_write(struct cgroup *cgrp, static int cgroup_clone_children_write(struct cgroup_subsys_state *css,
struct cftype *cft, struct cftype *cft, u64 val)
u64 val)
{ {
if (val) if (val)
set_bit(CGRP_CPUSET_CLONE_CHILDREN, &cgrp->flags); set_bit(CGRP_CPUSET_CLONE_CHILDREN, &css->cgroup->flags);
else else
clear_bit(CGRP_CPUSET_CLONE_CHILDREN, &cgrp->flags); clear_bit(CGRP_CPUSET_CLONE_CHILDREN, &css->cgroup->flags);
return 0; return 0;
} }
...@@ -5585,17 +5588,19 @@ static void debug_css_free(struct cgroup_subsys_state *css) ...@@ -5585,17 +5588,19 @@ static void debug_css_free(struct cgroup_subsys_state *css)
kfree(css); kfree(css);
} }
static u64 debug_taskcount_read(struct cgroup *cgrp, struct cftype *cft) static u64 debug_taskcount_read(struct cgroup_subsys_state *css,
struct cftype *cft)
{ {
return cgroup_task_count(cgrp); return cgroup_task_count(css->cgroup);
} }
static u64 current_css_set_read(struct cgroup *cgrp, struct cftype *cft) static u64 current_css_set_read(struct cgroup_subsys_state *css,
struct cftype *cft)
{ {
return (u64)(unsigned long)current->cgroups; return (u64)(unsigned long)current->cgroups;
} }
static u64 current_css_set_refcount_read(struct cgroup *cgrp, static u64 current_css_set_refcount_read(struct cgroup_subsys_state *css,
struct cftype *cft) struct cftype *cft)
{ {
u64 count; u64 count;
...@@ -5606,7 +5611,7 @@ static u64 current_css_set_refcount_read(struct cgroup *cgrp, ...@@ -5606,7 +5611,7 @@ static u64 current_css_set_refcount_read(struct cgroup *cgrp,
return count; return count;
} }
static int current_css_set_cg_links_read(struct cgroup *cgrp, static int current_css_set_cg_links_read(struct cgroup_subsys_state *css,
struct cftype *cft, struct cftype *cft,
struct seq_file *seq) struct seq_file *seq)
{ {
...@@ -5633,14 +5638,13 @@ static int current_css_set_cg_links_read(struct cgroup *cgrp, ...@@ -5633,14 +5638,13 @@ static int current_css_set_cg_links_read(struct cgroup *cgrp,
} }
#define MAX_TASKS_SHOWN_PER_CSS 25 #define MAX_TASKS_SHOWN_PER_CSS 25
static int cgroup_css_links_read(struct cgroup *cgrp, static int cgroup_css_links_read(struct cgroup_subsys_state *css,
struct cftype *cft, struct cftype *cft, struct seq_file *seq)
struct seq_file *seq)
{ {
struct cgrp_cset_link *link; struct cgrp_cset_link *link;
read_lock(&css_set_lock); read_lock(&css_set_lock);
list_for_each_entry(link, &cgrp->cset_links, cset_link) { list_for_each_entry(link, &css->cgroup->cset_links, cset_link) {
struct css_set *cset = link->cset; struct css_set *cset = link->cset;
struct task_struct *task; struct task_struct *task;
int count = 0; int count = 0;
...@@ -5659,9 +5663,9 @@ static int cgroup_css_links_read(struct cgroup *cgrp, ...@@ -5659,9 +5663,9 @@ static int cgroup_css_links_read(struct cgroup *cgrp,
return 0; return 0;
} }
static u64 releasable_read(struct cgroup *cgrp, struct cftype *cft) static u64 releasable_read(struct cgroup_subsys_state *css, struct cftype *cft)
{ {
return test_bit(CGRP_RELEASABLE, &cgrp->flags); return test_bit(CGRP_RELEASABLE, &css->cgroup->flags);
} }
static struct cftype debug_files[] = { static struct cftype debug_files[] = {
......
kernel/cgroup_freezer.c
View file @ 182446d0
...@@ -245,7 +245,7 @@ static void freezer_fork(struct task_struct *task) ...@@ -245,7 +245,7 @@ static void freezer_fork(struct task_struct *task)
/** /**
* update_if_frozen - update whether a cgroup finished freezing * update_if_frozen - update whether a cgroup finished freezing
* @cgroup: cgroup of interest * @css: css of interest
* *
* Once FREEZING is initiated, transition to FROZEN is lazily updated by * Once FREEZING is initiated, transition to FROZEN is lazily updated by
* calling this function. If the current state is FREEZING but not FROZEN, * calling this function. If the current state is FREEZING but not FROZEN,
...@@ -256,12 +256,12 @@ static void freezer_fork(struct task_struct *task) ...@@ -256,12 +256,12 @@ static void freezer_fork(struct task_struct *task)
* update_if_frozen() on all descendants prior to invoking this function. * update_if_frozen() on all descendants prior to invoking this function.
* *
* Task states and freezer state might disagree while tasks are being * Task states and freezer state might disagree while tasks are being
* migrated into or out of @cgroup, so we can't verify task states against * migrated into or out of @css, so we can't verify task states against
* @freezer state here. See freezer_attach() for details. * @freezer state here. See freezer_attach() for details.
*/ */
static void update_if_frozen(struct cgroup *cgroup) static void update_if_frozen(struct cgroup_subsys_state *css)
{ {
struct freezer *freezer = cgroup_freezer(cgroup); struct freezer *freezer = css_freezer(css);
struct cgroup *pos; struct cgroup *pos;
struct cgroup_iter it; struct cgroup_iter it;
struct task_struct *task; struct task_struct *task;
...@@ -275,7 +275,7 @@ static void update_if_frozen(struct cgroup *cgroup) ...@@ -275,7 +275,7 @@ static void update_if_frozen(struct cgroup *cgroup)
goto out_unlock; goto out_unlock;
/* are all (live) children frozen? */ /* are all (live) children frozen? */
cgroup_for_each_child(pos, cgroup) { cgroup_for_each_child(pos, css->cgroup) {
struct freezer *child = cgroup_freezer(pos); struct freezer *child = cgroup_freezer(pos);
if ((child->state & CGROUP_FREEZER_ONLINE) && if ((child->state & CGROUP_FREEZER_ONLINE) &&
...@@ -284,9 +284,9 @@ static void update_if_frozen(struct cgroup *cgroup) ...@@ -284,9 +284,9 @@ static void update_if_frozen(struct cgroup *cgroup)
} }
/* are all tasks frozen? */ /* are all tasks frozen? */
cgroup_iter_start(cgroup, &it); cgroup_iter_start(css->cgroup, &it);
while ((task = cgroup_iter_next(cgroup, &it))) { while ((task = cgroup_iter_next(css->cgroup, &it))) {
if (freezing(task)) { if (freezing(task)) {
/* /*
* freezer_should_skip() indicates that the task * freezer_should_skip() indicates that the task
...@@ -301,12 +301,12 @@ static void update_if_frozen(struct cgroup *cgroup) ...@@ -301,12 +301,12 @@ static void update_if_frozen(struct cgroup *cgroup)
freezer->state |= CGROUP_FROZEN; freezer->state |= CGROUP_FROZEN;
out_iter_end: out_iter_end:
cgroup_iter_end(cgroup, &it); cgroup_iter_end(css->cgroup, &it);
out_unlock: out_unlock:
spin_unlock_irq(&freezer->lock); spin_unlock_irq(&freezer->lock);
} }
static int freezer_read(struct cgroup *cgroup, struct cftype *cft, static int freezer_read(struct cgroup_subsys_state *css, struct cftype *cft,
struct seq_file *m) struct seq_file *m)
{ {
struct cgroup *pos; struct cgroup *pos;
...@@ -314,13 +314,13 @@ static int freezer_read(struct cgroup *cgroup, struct cftype *cft, ...@@ -314,13 +314,13 @@ static int freezer_read(struct cgroup *cgroup, struct cftype *cft,
rcu_read_lock(); rcu_read_lock();
/* update states bottom-up */ /* update states bottom-up */
cgroup_for_each_descendant_post(pos, cgroup) cgroup_for_each_descendant_post(pos, css->cgroup)
update_if_frozen(pos); update_if_frozen(cgroup_css(pos, freezer_subsys_id));
update_if_frozen(cgroup); update_if_frozen(css);
rcu_read_unlock(); rcu_read_unlock();
seq_puts(m, freezer_state_strs(cgroup_freezer(cgroup)->state)); seq_puts(m, freezer_state_strs(css_freezer(css)->state));
seq_putc(m, '\n'); seq_putc(m, '\n');
return 0; return 0;
} }
...@@ -426,7 +426,7 @@ static void freezer_change_state(struct freezer *freezer, bool freeze) ...@@ -426,7 +426,7 @@ static void freezer_change_state(struct freezer *freezer, bool freeze)
rcu_read_unlock(); rcu_read_unlock();
} }
static int freezer_write(struct cgroup *cgroup, struct cftype *cft, static int freezer_write(struct cgroup_subsys_state *css, struct cftype *cft,
const char *buffer) const char *buffer)
{ {
bool freeze; bool freeze;
...@@ -438,20 +438,22 @@ static int freezer_write(struct cgroup *cgroup, struct cftype *cft, ...@@ -438,20 +438,22 @@ static int freezer_write(struct cgroup *cgroup, struct cftype *cft,
else else
return -EINVAL; return -EINVAL;
freezer_change_state(cgroup_freezer(cgroup), freeze); freezer_change_state(css_freezer(css), freeze);
return 0; return 0;
} }
static u64 freezer_self_freezing_read(struct cgroup *cgroup, struct cftype *cft) static u64 freezer_self_freezing_read(struct cgroup_subsys_state *css,
struct cftype *cft)
{ {
struct freezer *freezer = cgroup_freezer(cgroup); struct freezer *freezer = css_freezer(css);
return (bool)(freezer->state & CGROUP_FREEZING_SELF); return (bool)(freezer->state & CGROUP_FREEZING_SELF);
} }
static u64 freezer_parent_freezing_read(struct cgroup *cgroup, struct cftype *cft) static u64 freezer_parent_freezing_read(struct cgroup_subsys_state *css,
struct cftype *cft)
{ {
struct freezer *freezer = cgroup_freezer(cgroup); struct freezer *freezer = css_freezer(css);
return (bool)(freezer->state & CGROUP_FREEZING_PARENT); return (bool)(freezer->state & CGROUP_FREEZING_PARENT);
} }
......
kernel/cpuset.c
View file @ 182446d0
...@@ -1603,9 +1603,10 @@ typedef enum { ...@@ -1603,9 +1603,10 @@ typedef enum {
FILE_SPREAD_SLAB, FILE_SPREAD_SLAB,
} cpuset_filetype_t; } cpuset_filetype_t;
static int cpuset_write_u64(struct cgroup *cgrp, struct cftype *cft, u64 val) static int cpuset_write_u64(struct cgroup_subsys_state *css, struct cftype *cft,
u64 val)
{ {
struct cpuset *cs = cgroup_cs(cgrp); struct cpuset *cs = css_cs(css);
cpuset_filetype_t type = cft->private; cpuset_filetype_t type = cft->private;
int retval = -ENODEV; int retval = -ENODEV;
...@@ -1650,9 +1651,10 @@ static int cpuset_write_u64(struct cgroup *cgrp, struct cftype *cft, u64 val) ...@@ -1650,9 +1651,10 @@ static int cpuset_write_u64(struct cgroup *cgrp, struct cftype *cft, u64 val)
return retval; return retval;
} }
static int cpuset_write_s64(struct cgroup *cgrp, struct cftype *cft, s64 val) static int cpuset_write_s64(struct cgroup_subsys_state *css, struct cftype *cft,
s64 val)
{ {
struct cpuset *cs = cgroup_cs(cgrp); struct cpuset *cs = css_cs(css);
cpuset_filetype_t type = cft->private; cpuset_filetype_t type = cft->private;
int retval = -ENODEV; int retval = -ENODEV;
...@@ -1676,10 +1678,10 @@ static int cpuset_write_s64(struct cgroup *cgrp, struct cftype *cft, s64 val) ...@@ -1676,10 +1678,10 @@ static int cpuset_write_s64(struct cgroup *cgrp, struct cftype *cft, s64 val)
/* /*
* Common handling for a write to a "cpus" or "mems" file. * Common handling for a write to a "cpus" or "mems" file.
*/ */
static int cpuset_write_resmask(struct cgroup *cgrp, struct cftype *cft, static int cpuset_write_resmask(struct cgroup_subsys_state *css,
const char *buf) struct cftype *cft, const char *buf)
{ {
struct cpuset *cs = cgroup_cs(cgrp); struct cpuset *cs = css_cs(css);
struct cpuset *trialcs; struct cpuset *trialcs;
int retval = -ENODEV; int retval = -ENODEV;
...@@ -1758,13 +1760,12 @@ static size_t cpuset_sprintf_memlist(char *page, struct cpuset *cs) ...@@ -1758,13 +1760,12 @@ static size_t cpuset_sprintf_memlist(char *page, struct cpuset *cs)
return count; return count;
} }
static ssize_t cpuset_common_file_read(struct cgroup *cgrp, static ssize_t cpuset_common_file_read(struct cgroup_subsys_state *css,
struct cftype *cft, struct cftype *cft, struct file *file,
struct file *file, char __user *buf, size_t nbytes,
char __user *buf, loff_t *ppos)
size_t nbytes, loff_t *ppos)
{ {
struct cpuset *cs = cgroup_cs(cgrp); struct cpuset *cs = css_cs(css);
cpuset_filetype_t type = cft->private; cpuset_filetype_t type = cft->private;
char *page; char *page;
ssize_t retval = 0; ssize_t retval = 0;
...@@ -1794,9 +1795,9 @@ static ssize_t cpuset_common_file_read(struct cgroup *cgrp, ...@@ -1794,9 +1795,9 @@ static ssize_t cpuset_common_file_read(struct cgroup *cgrp,
return retval; return retval;
} }
static u64 cpuset_read_u64(struct cgroup *cgrp, struct cftype *cft) static u64 cpuset_read_u64(struct cgroup_subsys_state *css, struct cftype *cft)
{ {
struct cpuset *cs = cgroup_cs(cgrp); struct cpuset *cs = css_cs(css);
cpuset_filetype_t type = cft->private; cpuset_filetype_t type = cft->private;
switch (type) { switch (type) {
case FILE_CPU_EXCLUSIVE: case FILE_CPU_EXCLUSIVE:
...@@ -1825,9 +1826,9 @@ static u64 cpuset_read_u64(struct cgroup *cgrp, struct cftype *cft) ...@@ -1825,9 +1826,9 @@ static u64 cpuset_read_u64(struct cgroup *cgrp, struct cftype *cft)
return 0; return 0;
} }
static s64 cpuset_read_s64(struct cgroup *cgrp, struct cftype *cft) static s64 cpuset_read_s64(struct cgroup_subsys_state *css, struct cftype *cft)
{ {
struct cpuset *cs = cgroup_cs(cgrp); struct cpuset *cs = css_cs(css);
cpuset_filetype_t type = cft->private; cpuset_filetype_t type = cft->private;
switch (type) { switch (type) {
case FILE_SCHED_RELAX_DOMAIN_LEVEL: case FILE_SCHED_RELAX_DOMAIN_LEVEL:
......
kernel/sched/core.c
View file @ 182446d0
...@@ -7088,12 +7088,6 @@ static inline struct task_group *css_tg(struct cgroup_subsys_state *css) ...@@ -7088,12 +7088,6 @@ static inline struct task_group *css_tg(struct cgroup_subsys_state *css)
return css ? container_of(css, struct task_group, css) : NULL; return css ? container_of(css, struct task_group, css) : NULL;
} }
/* return corresponding task_group object of a cgroup */
static inline struct task_group *cgroup_tg(struct cgroup *cgrp)
{
return css_tg(cgroup_css(cgrp, cpu_cgroup_subsys_id));
}
static struct cgroup_subsys_state * static struct cgroup_subsys_state *
cpu_cgroup_css_alloc(struct cgroup_subsys_state *parent_css) cpu_cgroup_css_alloc(struct cgroup_subsys_state *parent_css)
{ {
...@@ -7179,15 +7173,16 @@ static void cpu_cgroup_exit(struct cgroup_subsys_state *css, ...@@ -7179,15 +7173,16 @@ static void cpu_cgroup_exit(struct cgroup_subsys_state *css,
} }
#ifdef CONFIG_FAIR_GROUP_SCHED #ifdef CONFIG_FAIR_GROUP_SCHED
static int cpu_shares_write_u64(struct cgroup *cgrp, struct cftype *cftype, static int cpu_shares_write_u64(struct cgroup_subsys_state *css,
u64 shareval) struct cftype *cftype, u64 shareval)
{ {
return sched_group_set_shares(cgroup_tg(cgrp), scale_load(shareval)); return sched_group_set_shares(css_tg(css), scale_load(shareval));
} }
static u64 cpu_shares_read_u64(struct cgroup *cgrp, struct cftype *cft) static u64 cpu_shares_read_u64(struct cgroup_subsys_state *css,
struct cftype *cft)
{ {
struct task_group *tg = cgroup_tg(cgrp); struct task_group *tg = css_tg(css);
return (u64) scale_load_down(tg->shares); return (u64) scale_load_down(tg->shares);
} }
...@@ -7309,26 +7304,28 @@ long tg_get_cfs_period(struct task_group *tg) ...@@ -7309,26 +7304,28 @@ long tg_get_cfs_period(struct task_group *tg)
return cfs_period_us; return cfs_period_us;
} }
static s64 cpu_cfs_quota_read_s64(struct cgroup *cgrp, struct cftype *cft) static s64 cpu_cfs_quota_read_s64(struct cgroup_subsys_state *css,
struct cftype *cft)
{ {
return tg_get_cfs_quota(cgroup_tg(cgrp)); return tg_get_cfs_quota(css_tg(css));
} }
static int cpu_cfs_quota_write_s64(struct cgroup *cgrp, struct cftype *cftype, static int cpu_cfs_quota_write_s64(struct cgroup_subsys_state *css,
s64 cfs_quota_us) struct cftype *cftype, s64 cfs_quota_us)
{ {
return tg_set_cfs_quota(cgroup_tg(cgrp), cfs_quota_us); return tg_set_cfs_quota(css_tg(css), cfs_quota_us);
} }
static u64 cpu_cfs_period_read_u64(struct cgroup *cgrp, struct cftype *cft) static u64 cpu_cfs_period_read_u64(struct cgroup_subsys_state *css,
struct cftype *cft)
{ {
return tg_get_cfs_period(cgroup_tg(cgrp)); return tg_get_cfs_period(css_tg(css));
} }
static int cpu_cfs_period_write_u64(struct cgroup *cgrp, struct cftype *cftype, static int cpu_cfs_period_write_u64(struct cgroup_subsys_state *css,
u64 cfs_period_us) struct cftype *cftype, u64 cfs_period_us)
{ {
return tg_set_cfs_period(cgroup_tg(cgrp), cfs_period_us); return tg_set_cfs_period(css_tg(css), cfs_period_us);
} }
struct cfs_schedulable_data { struct cfs_schedulable_data {
...@@ -7409,10 +7406,10 @@ static int __cfs_schedulable(struct task_group *tg, u64 period, u64 quota) ...@@ -7409,10 +7406,10 @@ static int __cfs_schedulable(struct task_group *tg, u64 period, u64 quota)
return ret; return ret;
} }
static int cpu_stats_show(struct cgroup *cgrp, struct cftype *cft, static int cpu_stats_show(struct cgroup_subsys_state *css, struct cftype *cft,
struct cgroup_map_cb *cb) struct cgroup_map_cb *cb)
{ {
struct task_group *tg = cgroup_tg(cgrp); struct task_group *tg = css_tg(css);
struct cfs_bandwidth *cfs_b = &tg->cfs_bandwidth; struct cfs_bandwidth *cfs_b = &tg->cfs_bandwidth;
cb->fill(cb, "nr_periods", cfs_b->nr_periods); cb->fill(cb, "nr_periods", cfs_b->nr_periods);
...@@ -7425,26 +7422,28 @@ static int cpu_stats_show(struct cgroup *cgrp, struct cftype *cft, ...@@ -7425,26 +7422,28 @@ static int cpu_stats_show(struct cgroup *cgrp, struct cftype *cft,
#endif /* CONFIG_FAIR_GROUP_SCHED */ #endif /* CONFIG_FAIR_GROUP_SCHED */
#ifdef CONFIG_RT_GROUP_SCHED #ifdef CONFIG_RT_GROUP_SCHED
static int cpu_rt_runtime_write(struct cgroup *cgrp, struct cftype *cft, static int cpu_rt_runtime_write(struct cgroup_subsys_state *css,
s64 val) struct cftype *cft, s64 val)
{ {
return sched_group_set_rt_runtime(cgroup_tg(cgrp), val); return sched_group_set_rt_runtime(css_tg(css), val);
} }
static s64 cpu_rt_runtime_read(struct cgroup *cgrp, struct cftype *cft) static s64 cpu_rt_runtime_read(struct cgroup_subsys_state *css,
struct cftype *cft)
{ {
return sched_group_rt_runtime(cgroup_tg(cgrp)); return sched_group_rt_runtime(css_tg(css));
} }
static int cpu_rt_period_write_uint(struct cgroup *cgrp, struct cftype *cftype, static int cpu_rt_period_write_uint(struct cgroup_subsys_state *css,
u64 rt_period_us) struct cftype *cftype, u64 rt_period_us)
{ {
return sched_group_set_rt_period(cgroup_tg(cgrp), rt_period_us); return sched_group_set_rt_period(css_tg(css), rt_period_us);
} }
static u64 cpu_rt_period_read_uint(struct cgroup *cgrp, struct cftype *cft) static u64 cpu_rt_period_read_uint(struct cgroup_subsys_state *css,
struct cftype *cft)
{ {
return sched_group_rt_period(cgroup_tg(cgrp)); return sched_group_rt_period(css_tg(css));
} }
#endif /* CONFIG_RT_GROUP_SCHED */ #endif /* CONFIG_RT_GROUP_SCHED */
......
kernel/sched/cpuacct.c
View file @ 182446d0
...@@ -38,12 +38,6 @@ static inline struct cpuacct *css_ca(struct cgroup_subsys_state *css) ...@@ -38,12 +38,6 @@ static inline struct cpuacct *css_ca(struct cgroup_subsys_state *css)
return css ? container_of(css, struct cpuacct, css) : NULL; return css ? container_of(css, struct cpuacct, css) : NULL;
} }
/* return cpu accounting group corresponding to this container */
static inline struct cpuacct *cgroup_ca(struct cgroup *cgrp)
{
return css_ca(cgroup_css(cgrp, cpuacct_subsys_id));
}
/* return cpu accounting group to which this task belongs */ /* return cpu accounting group to which this task belongs */
static inline struct cpuacct *task_ca(struct task_struct *tsk) static inline struct cpuacct *task_ca(struct task_struct *tsk)
{ {
...@@ -138,9 +132,9 @@ static void cpuacct_cpuusage_write(struct cpuacct *ca, int cpu, u64 val) ...@@ -138,9 +132,9 @@ static void cpuacct_cpuusage_write(struct cpuacct *ca, int cpu, u64 val)
} }
/* return total cpu usage (in nanoseconds) of a group */ /* return total cpu usage (in nanoseconds) of a group */
static u64 cpuusage_read(struct cgroup *cgrp, struct cftype *cft) static u64 cpuusage_read(struct cgroup_subsys_state *css, struct cftype *cft)
{ {
struct cpuacct *ca = cgroup_ca(cgrp); struct cpuacct *ca = css_ca(css);
u64 totalcpuusage = 0; u64 totalcpuusage = 0;
int i; int i;
...@@ -150,10 +144,10 @@ static u64 cpuusage_read(struct cgroup *cgrp, struct cftype *cft) ...@@ -150,10 +144,10 @@ static u64 cpuusage_read(struct cgroup *cgrp, struct cftype *cft)
return totalcpuusage; return totalcpuusage;
} }
static int cpuusage_write(struct cgroup *cgrp, struct cftype *cftype, static int cpuusage_write(struct cgroup_subsys_state *css, struct cftype *cft,
u64 reset) u64 reset)
{ {
struct cpuacct *ca = cgroup_ca(cgrp); struct cpuacct *ca = css_ca(css);
int err = 0; int err = 0;
int i; int i;
...@@ -169,10 +163,10 @@ static int cpuusage_write(struct cgroup *cgrp, struct cftype *cftype, ...@@ -169,10 +163,10 @@ static int cpuusage_write(struct cgroup *cgrp, struct cftype *cftype,
return err; return err;
} }
static int cpuacct_percpu_seq_read(struct cgroup *cgroup, struct cftype *cft, static int cpuacct_percpu_seq_read(struct cgroup_subsys_state *css,
struct seq_file *m) struct cftype *cft, struct seq_file *m)
{ {
struct cpuacct *ca = cgroup_ca(cgroup); struct cpuacct *ca = css_ca(css);
u64 percpu; u64 percpu;
int i; int i;
...@@ -189,10 +183,10 @@ static const char * const cpuacct_stat_desc[] = { ...@@ -189,10 +183,10 @@ static const char * const cpuacct_stat_desc[] = {
[CPUACCT_STAT_SYSTEM] = "system", [CPUACCT_STAT_SYSTEM] = "system",
}; };
static int cpuacct_stats_show(struct cgroup *cgrp, struct cftype *cft, static int cpuacct_stats_show(struct cgroup_subsys_state *css,
struct cgroup_map_cb *cb) struct cftype *cft, struct cgroup_map_cb *cb)
{ {
struct cpuacct *ca = cgroup_ca(cgrp); struct cpuacct *ca = css_ca(css);
int cpu; int cpu;
s64 val = 0; s64 val = 0;
......
mm/hugetlb_cgroup.c
View file @ 182446d0
...@@ -39,12 +39,6 @@ struct hugetlb_cgroup *hugetlb_cgroup_from_css(struct cgroup_subsys_state *s) ...@@ -39,12 +39,6 @@ struct hugetlb_cgroup *hugetlb_cgroup_from_css(struct cgroup_subsys_state *s)
return s ? container_of(s, struct hugetlb_cgroup, css) : NULL; return s ? container_of(s, struct hugetlb_cgroup, css) : NULL;
} }
static inline
struct hugetlb_cgroup *hugetlb_cgroup_from_cgroup(struct cgroup *cgroup)
{
return hugetlb_cgroup_from_css(cgroup_css(cgroup, hugetlb_subsys_id));
}
static inline static inline
struct hugetlb_cgroup *hugetlb_cgroup_from_task(struct task_struct *task) struct hugetlb_cgroup *hugetlb_cgroup_from_task(struct task_struct *task)
{ {
...@@ -248,14 +242,15 @@ void hugetlb_cgroup_uncharge_cgroup(int idx, unsigned long nr_pages, ...@@ -248,14 +242,15 @@ void hugetlb_cgroup_uncharge_cgroup(int idx, unsigned long nr_pages,
return; return;
} }
static ssize_t hugetlb_cgroup_read(struct cgroup *cgroup, struct cftype *cft, static ssize_t hugetlb_cgroup_read(struct cgroup_subsys_state *css,
struct file *file, char __user *buf, struct cftype *cft, struct file *file,
size_t nbytes, loff_t *ppos) char __user *buf, size_t nbytes,
loff_t *ppos)
{ {
u64 val; u64 val;
char str[64]; char str[64];
int idx, name, len; int idx, name, len;
struct hugetlb_cgroup *h_cg = hugetlb_cgroup_from_cgroup(cgroup); struct hugetlb_cgroup *h_cg = hugetlb_cgroup_from_css(css);
idx = MEMFILE_IDX(cft->private); idx = MEMFILE_IDX(cft->private);
name = MEMFILE_ATTR(cft->private); name = MEMFILE_ATTR(cft->private);
...@@ -265,12 +260,12 @@ static ssize_t hugetlb_cgroup_read(struct cgroup *cgroup, struct cftype *cft, ...@@ -265,12 +260,12 @@ static ssize_t hugetlb_cgroup_read(struct cgroup *cgroup, struct cftype *cft,
return simple_read_from_buffer(buf, nbytes, ppos, str, len); return simple_read_from_buffer(buf, nbytes, ppos, str, len);
} }
static int hugetlb_cgroup_write(struct cgroup *cgroup, struct cftype *cft, static int hugetlb_cgroup_write(struct cgroup_subsys_state *css,
const char *buffer) struct cftype *cft, const char *buffer)
{ {
int idx, name, ret; int idx, name, ret;
unsigned long long val; unsigned long long val;
struct hugetlb_cgroup *h_cg = hugetlb_cgroup_from_cgroup(cgroup); struct hugetlb_cgroup *h_cg = hugetlb_cgroup_from_css(css);
idx = MEMFILE_IDX(cft->private); idx = MEMFILE_IDX(cft->private);
name = MEMFILE_ATTR(cft->private); name = MEMFILE_ATTR(cft->private);
...@@ -295,10 +290,11 @@ static int hugetlb_cgroup_write(struct cgroup *cgroup, struct cftype *cft, ...@@ -295,10 +290,11 @@ static int hugetlb_cgroup_write(struct cgroup *cgroup, struct cftype *cft,
return ret; return ret;
} }
static int hugetlb_cgroup_reset(struct cgroup *cgroup, unsigned int event) static int hugetlb_cgroup_reset(struct cgroup_subsys_state *css,
unsigned int event)
{ {
int idx, name, ret = 0; int idx, name, ret = 0;
struct hugetlb_cgroup *h_cg = hugetlb_cgroup_from_cgroup(cgroup); struct hugetlb_cgroup *h_cg = hugetlb_cgroup_from_css(css);
idx = MEMFILE_IDX(event); idx = MEMFILE_IDX(event);
name = MEMFILE_ATTR(event); name = MEMFILE_ATTR(event);
......
mm/memcontrol.c
View file @ 182446d0
...@@ -483,7 +483,6 @@ enum res_type { ...@@ -483,7 +483,6 @@ enum res_type {
*/ */
static DEFINE_MUTEX(memcg_create_mutex); static DEFINE_MUTEX(memcg_create_mutex);
static inline
struct mem_cgroup *mem_cgroup_from_css(struct cgroup_subsys_state *s) struct mem_cgroup *mem_cgroup_from_css(struct cgroup_subsys_state *s)
{ {
return s ? container_of(s, struct mem_cgroup, css) : NULL; return s ? container_of(s, struct mem_cgroup, css) : NULL;
...@@ -1035,7 +1034,7 @@ static void memcg_check_events(struct mem_cgroup *memcg, struct page *page) ...@@ -1035,7 +1034,7 @@ static void memcg_check_events(struct mem_cgroup *memcg, struct page *page)
preempt_enable(); preempt_enable();
} }
struct mem_cgroup *mem_cgroup_from_cont(struct cgroup *cont) static inline struct mem_cgroup *mem_cgroup_from_cont(struct cgroup *cont)
{ {
return mem_cgroup_from_css(cgroup_css(cont, mem_cgroup_subsys_id)); return mem_cgroup_from_css(cgroup_css(cont, mem_cgroup_subsys_id));
} }
...@@ -2951,10 +2950,10 @@ static struct kmem_cache *memcg_params_to_cache(struct memcg_cache_params *p) ...@@ -2951,10 +2950,10 @@ 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 *cont, struct cftype *cft, static int mem_cgroup_slabinfo_read(struct cgroup_subsys_state *css,
struct seq_file *m) struct cftype *cft, struct seq_file *m)
{ {
struct mem_cgroup *memcg = mem_cgroup_from_cont(cont); struct mem_cgroup *memcg = mem_cgroup_from_css(css);
struct memcg_cache_params *params; struct memcg_cache_params *params;
if (!memcg_can_account_kmem(memcg)) if (!memcg_can_account_kmem(memcg))
...@@ -4999,9 +4998,10 @@ static int mem_cgroup_force_empty(struct mem_cgroup *memcg) ...@@ -4999,9 +4998,10 @@ static int mem_cgroup_force_empty(struct mem_cgroup *memcg)
return 0; return 0;
} }
static int mem_cgroup_force_empty_write(struct cgroup *cont, unsigned int event) static int mem_cgroup_force_empty_write(struct cgroup_subsys_state *css,
unsigned int event)
{ {
struct mem_cgroup *memcg = mem_cgroup_from_cont(cont); struct mem_cgroup *memcg = mem_cgroup_from_css(css);
int ret; int ret;
if (mem_cgroup_is_root(memcg)) if (mem_cgroup_is_root(memcg))
...@@ -5014,16 +5014,17 @@ static int mem_cgroup_force_empty_write(struct cgroup *cont, unsigned int event) ...@@ -5014,16 +5014,17 @@ static int mem_cgroup_force_empty_write(struct cgroup *cont, unsigned int event)
} }
static u64 mem_cgroup_hierarchy_read(struct cgroup *cont, struct cftype *cft) static u64 mem_cgroup_hierarchy_read(struct cgroup_subsys_state *css,
struct cftype *cft)
{ {
return mem_cgroup_from_cont(cont)->use_hierarchy; return mem_cgroup_from_css(css)->use_hierarchy;
} }
static int mem_cgroup_hierarchy_write(struct cgroup *cont, struct cftype *cft, static int mem_cgroup_hierarchy_write(struct cgroup_subsys_state *css,
u64 val) struct cftype *cft, u64 val)
{ {
int retval = 0; int retval = 0;
struct mem_cgroup *memcg = mem_cgroup_from_cont(cont); struct mem_cgroup *memcg = mem_cgroup_from_css(css);
struct mem_cgroup *parent_memcg = mem_cgroup_from_css(css_parent(&memcg->css)); struct mem_cgroup *parent_memcg = mem_cgroup_from_css(css_parent(&memcg->css));
mutex_lock(&memcg_create_mutex); mutex_lock(&memcg_create_mutex);
...@@ -5094,11 +5095,11 @@ static inline u64 mem_cgroup_usage(struct mem_cgroup *memcg, bool swap) ...@@ -5094,11 +5095,11 @@ static inline u64 mem_cgroup_usage(struct mem_cgroup *memcg, bool swap)
return val << PAGE_SHIFT; return val << PAGE_SHIFT;
} }
static ssize_t mem_cgroup_read(struct cgroup *cont, struct cftype *cft, static ssize_t mem_cgroup_read(struct cgroup_subsys_state *css,
struct file *file, char __user *buf, struct cftype *cft, struct file *file,
size_t nbytes, loff_t *ppos) char __user *buf, size_t nbytes, loff_t *ppos)
{ {
struct mem_cgroup *memcg = mem_cgroup_from_cont(cont); struct mem_cgroup *memcg = mem_cgroup_from_css(css);
char str[64]; char str[64];
u64 val; u64 val;
int name, len; int name, len;
...@@ -5131,11 +5132,11 @@ static ssize_t mem_cgroup_read(struct cgroup *cont, struct cftype *cft, ...@@ -5131,11 +5132,11 @@ static ssize_t mem_cgroup_read(struct cgroup *cont, struct cftype *cft,
return simple_read_from_buffer(buf, nbytes, ppos, str, len); return simple_read_from_buffer(buf, nbytes, ppos, str, len);
} }
static int memcg_update_kmem_limit(struct cgroup *cont, u64 val) static int memcg_update_kmem_limit(struct cgroup_subsys_state *css, u64 val)
{ {
int ret = -EINVAL; int ret = -EINVAL;
#ifdef CONFIG_MEMCG_KMEM #ifdef CONFIG_MEMCG_KMEM
struct mem_cgroup *memcg = mem_cgroup_from_cont(cont); struct mem_cgroup *memcg = mem_cgroup_from_css(css);
/* /*
* For simplicity, we won't allow this to be disabled. It also can't * For simplicity, we won't allow this to be disabled. It also can't
* be changed if the cgroup has children already, or if tasks had * be changed if the cgroup has children already, or if tasks had
...@@ -5151,7 +5152,7 @@ static int memcg_update_kmem_limit(struct cgroup *cont, u64 val) ...@@ -5151,7 +5152,7 @@ static int memcg_update_kmem_limit(struct cgroup *cont, u64 val)
mutex_lock(&memcg_create_mutex); mutex_lock(&memcg_create_mutex);
mutex_lock(&set_limit_mutex); mutex_lock(&set_limit_mutex);
if (!memcg->kmem_account_flags && val != RESOURCE_MAX) { if (!memcg->kmem_account_flags && val != RESOURCE_MAX) {
if (cgroup_task_count(cont) || memcg_has_children(memcg)) { if (cgroup_task_count(css->cgroup) || memcg_has_children(memcg)) {
ret = -EBUSY; ret = -EBUSY;
goto out; goto out;
} }
...@@ -5221,10 +5222,10 @@ static int memcg_propagate_kmem(struct mem_cgroup *memcg) ...@@ -5221,10 +5222,10 @@ static int memcg_propagate_kmem(struct mem_cgroup *memcg)
* The user of this function is... * The user of this function is...
* RES_LIMIT. * RES_LIMIT.
*/ */
static int mem_cgroup_write(struct cgroup *cont, struct cftype *cft, static int mem_cgroup_write(struct cgroup_subsys_state *css, struct cftype *cft,
const char *buffer) const char *buffer)
{ {
struct mem_cgroup *memcg = mem_cgroup_from_cont(cont); struct mem_cgroup *memcg = mem_cgroup_from_css(css);
enum res_type type; enum res_type type;
int name; int name;
unsigned long long val; unsigned long long val;
...@@ -5248,7 +5249,7 @@ static int mem_cgroup_write(struct cgroup *cont, struct cftype *cft, ...@@ -5248,7 +5249,7 @@ static int mem_cgroup_write(struct cgroup *cont, struct cftype *cft,
else if (type == _MEMSWAP) else if (type == _MEMSWAP)
ret = mem_cgroup_resize_memsw_limit(memcg, val); ret = mem_cgroup_resize_memsw_limit(memcg, val);
else if (type == _KMEM) else if (type == _KMEM)
ret = memcg_update_kmem_limit(cont, val); ret = memcg_update_kmem_limit(css, val);
else else
return -EINVAL; return -EINVAL;
break; break;
...@@ -5297,9 +5298,9 @@ static void memcg_get_hierarchical_limit(struct mem_cgroup *memcg, ...@@ -5297,9 +5298,9 @@ static void memcg_get_hierarchical_limit(struct mem_cgroup *memcg,
*memsw_limit = min_memsw_limit; *memsw_limit = min_memsw_limit;
} }
static int mem_cgroup_reset(struct cgroup *cont, unsigned int event) static int mem_cgroup_reset(struct cgroup_subsys_state *css, unsigned int event)
{ {
struct mem_cgroup *memcg = mem_cgroup_from_cont(cont); struct mem_cgroup *memcg = mem_cgroup_from_css(css);
int name; int name;
enum res_type type; enum res_type type;
...@@ -5332,17 +5333,17 @@ static int mem_cgroup_reset(struct cgroup *cont, unsigned int event) ...@@ -5332,17 +5333,17 @@ static int mem_cgroup_reset(struct cgroup *cont, unsigned int event)
return 0; return 0;
} }
static u64 mem_cgroup_move_charge_read(struct cgroup *cgrp, static u64 mem_cgroup_move_charge_read(struct cgroup_subsys_state *css,
struct cftype *cft) struct cftype *cft)
{ {
return mem_cgroup_from_cont(cgrp)->move_charge_at_immigrate; return mem_cgroup_from_css(css)->move_charge_at_immigrate;
} }
#ifdef CONFIG_MMU #ifdef CONFIG_MMU
static int mem_cgroup_move_charge_write(struct cgroup *cgrp, static int mem_cgroup_move_charge_write(struct cgroup_subsys_state *css,
struct cftype *cft, u64 val) struct cftype *cft, u64 val)
{ {
struct mem_cgroup *memcg = mem_cgroup_from_cont(cgrp); struct mem_cgroup *memcg = mem_cgroup_from_css(css);
if (val >= (1 << NR_MOVE_TYPE)) if (val >= (1 << NR_MOVE_TYPE))
return -EINVAL; return -EINVAL;
...@@ -5357,7 +5358,7 @@ static int mem_cgroup_move_charge_write(struct cgroup *cgrp, ...@@ -5357,7 +5358,7 @@ static int mem_cgroup_move_charge_write(struct cgroup *cgrp,
return 0; return 0;
} }
#else #else
static int mem_cgroup_move_charge_write(struct cgroup *cgrp, static int mem_cgroup_move_charge_write(struct cgroup_subsys_state *css,
struct cftype *cft, u64 val) struct cftype *cft, u64 val)
{ {
return -ENOSYS; return -ENOSYS;
...@@ -5365,13 +5366,13 @@ static int mem_cgroup_move_charge_write(struct cgroup *cgrp, ...@@ -5365,13 +5366,13 @@ static int mem_cgroup_move_charge_write(struct cgroup *cgrp,
#endif #endif
#ifdef CONFIG_NUMA #ifdef CONFIG_NUMA
static int memcg_numa_stat_show(struct cgroup *cont, struct cftype *cft, static int memcg_numa_stat_show(struct cgroup_subsys_state *css,
struct seq_file *m) struct cftype *cft, struct seq_file *m)
{ {
int nid; int nid;
unsigned long total_nr, file_nr, anon_nr, unevictable_nr; unsigned long total_nr, file_nr, anon_nr, unevictable_nr;
unsigned long node_nr; unsigned long node_nr;
struct mem_cgroup *memcg = mem_cgroup_from_cont(cont); struct mem_cgroup *memcg = mem_cgroup_from_css(css);
total_nr = mem_cgroup_nr_lru_pages(memcg, LRU_ALL); total_nr = mem_cgroup_nr_lru_pages(memcg, LRU_ALL);
seq_printf(m, "total=%lu", total_nr); seq_printf(m, "total=%lu", total_nr);
...@@ -5416,10 +5417,10 @@ static inline void mem_cgroup_lru_names_not_uptodate(void) ...@@ -5416,10 +5417,10 @@ 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 *cont, struct cftype *cft, static int memcg_stat_show(struct cgroup_subsys_state *css, struct cftype *cft,
struct seq_file *m) struct seq_file *m)
{ {
struct mem_cgroup *memcg = mem_cgroup_from_cont(cont); struct mem_cgroup *memcg = mem_cgroup_from_css(css);
struct mem_cgroup *mi; struct mem_cgroup *mi;
unsigned int i; unsigned int i;
...@@ -5503,17 +5504,18 @@ static int memcg_stat_show(struct cgroup *cont, struct cftype *cft, ...@@ -5503,17 +5504,18 @@ static int memcg_stat_show(struct cgroup *cont, struct cftype *cft,
return 0; return 0;
} }
static u64 mem_cgroup_swappiness_read(struct cgroup *cgrp, struct cftype *cft) static u64 mem_cgroup_swappiness_read(struct cgroup_subsys_state *css,
struct cftype *cft)
{ {
struct mem_cgroup *memcg = mem_cgroup_from_cont(cgrp); struct mem_cgroup *memcg = mem_cgroup_from_css(css);
return mem_cgroup_swappiness(memcg); return mem_cgroup_swappiness(memcg);
} }
static int mem_cgroup_swappiness_write(struct cgroup *cgrp, struct cftype *cft, static int mem_cgroup_swappiness_write(struct cgroup_subsys_state *css,
u64 val) struct cftype *cft, u64 val)
{ {
struct mem_cgroup *memcg = mem_cgroup_from_cont(cgrp); struct mem_cgroup *memcg = mem_cgroup_from_css(css);
struct mem_cgroup *parent = mem_cgroup_from_css(css_parent(&memcg->css)); struct mem_cgroup *parent = mem_cgroup_from_css(css_parent(&memcg->css));
if (val > 100 || !parent) if (val > 100 || !parent)
...@@ -5829,10 +5831,10 @@ static void mem_cgroup_oom_unregister_event(struct cgroup *cgrp, ...@@ -5829,10 +5831,10 @@ static void mem_cgroup_oom_unregister_event(struct cgroup *cgrp,
spin_unlock(&memcg_oom_lock); spin_unlock(&memcg_oom_lock);
} }
static int mem_cgroup_oom_control_read(struct cgroup *cgrp, static int mem_cgroup_oom_control_read(struct cgroup_subsys_state *css,
struct cftype *cft, struct cgroup_map_cb *cb) struct cftype *cft, struct cgroup_map_cb *cb)
{ {
struct mem_cgroup *memcg = mem_cgroup_from_cont(cgrp); struct mem_cgroup *memcg = mem_cgroup_from_css(css);
cb->fill(cb, "oom_kill_disable", memcg->oom_kill_disable); cb->fill(cb, "oom_kill_disable", memcg->oom_kill_disable);
...@@ -5843,10 +5845,10 @@ static int mem_cgroup_oom_control_read(struct cgroup *cgrp, ...@@ -5843,10 +5845,10 @@ static int mem_cgroup_oom_control_read(struct cgroup *cgrp,
return 0; return 0;
} }
static int mem_cgroup_oom_control_write(struct cgroup *cgrp, static int mem_cgroup_oom_control_write(struct cgroup_subsys_state *css,
struct cftype *cft, u64 val) struct cftype *cft, u64 val)
{ {
struct mem_cgroup *memcg = mem_cgroup_from_cont(cgrp); struct mem_cgroup *memcg = mem_cgroup_from_css(css);
struct mem_cgroup *parent = mem_cgroup_from_css(css_parent(&memcg->css)); struct mem_cgroup *parent = mem_cgroup_from_css(css_parent(&memcg->css));
/* cannot set to root cgroup and only 0 and 1 are allowed */ /* cannot set to root cgroup and only 0 and 1 are allowed */
......
mm/vmpressure.c
View file @ 182446d0
...@@ -81,8 +81,8 @@ static struct vmpressure *cg_to_vmpressure(struct cgroup *cg) ...@@ -81,8 +81,8 @@ static struct vmpressure *cg_to_vmpressure(struct cgroup *cg)
static struct vmpressure *vmpressure_parent(struct vmpressure *vmpr) static struct vmpressure *vmpressure_parent(struct vmpressure *vmpr)
{ {
struct cgroup *cg = vmpressure_to_css(vmpr)->cgroup; struct cgroup_subsys_state *css = vmpressure_to_css(vmpr);
struct mem_cgroup *memcg = mem_cgroup_from_cont(cg); struct mem_cgroup *memcg = mem_cgroup_from_css(css);
memcg = parent_mem_cgroup(memcg); memcg = parent_mem_cgroup(memcg);
if (!memcg) if (!memcg)
......
net/core/netprio_cgroup.c
View file @ 182446d0
...@@ -168,15 +168,14 @@ static void cgrp_css_free(struct cgroup_subsys_state *css) ...@@ -168,15 +168,14 @@ static void cgrp_css_free(struct cgroup_subsys_state *css)
kfree(css); kfree(css);
} }
static u64 read_prioidx(struct cgroup *cgrp, struct cftype *cft) static u64 read_prioidx(struct cgroup_subsys_state *css, struct cftype *cft)
{ {
return cgrp->id; return css->cgroup->id;
} }
static int read_priomap(struct cgroup *cont, struct cftype *cft, static int read_priomap(struct cgroup_subsys_state *css, struct cftype *cft,
struct cgroup_map_cb *cb) struct cgroup_map_cb *cb)
{ {
struct cgroup_subsys_state *css = cgroup_css(cont, net_prio_subsys_id);
struct net_device *dev; struct net_device *dev;
rcu_read_lock(); rcu_read_lock();
...@@ -186,10 +185,9 @@ static int read_priomap(struct cgroup *cont, struct cftype *cft, ...@@ -186,10 +185,9 @@ static int read_priomap(struct cgroup *cont, struct cftype *cft,
return 0; return 0;
} }
static int write_priomap(struct cgroup *cgrp, struct cftype *cft, static int write_priomap(struct cgroup_subsys_state *css, struct cftype *cft,
const char *buffer) const char *buffer)
{ {
struct cgroup_subsys_state *css = cgroup_css(cgrp, net_prio_subsys_id);
char devname[IFNAMSIZ + 1]; char devname[IFNAMSIZ + 1];
struct net_device *dev; struct net_device *dev;
u32 prio; u32 prio;
......
net/ipv4/tcp_memcontrol.c
View file @ 182446d0
...@@ -132,10 +132,10 @@ static int tcp_update_limit(struct mem_cgroup *memcg, u64 val) ...@@ -132,10 +132,10 @@ static int tcp_update_limit(struct mem_cgroup *memcg, u64 val)
return 0; return 0;
} }
static int tcp_cgroup_write(struct cgroup *cont, struct cftype *cft, static int tcp_cgroup_write(struct cgroup_subsys_state *css, struct cftype *cft,
const char *buffer) const char *buffer)
{ {
struct mem_cgroup *memcg = mem_cgroup_from_cont(cont); struct mem_cgroup *memcg = mem_cgroup_from_css(css);
unsigned long long val; unsigned long long val;
int ret = 0; int ret = 0;
...@@ -180,9 +180,9 @@ static u64 tcp_read_usage(struct mem_cgroup *memcg) ...@@ -180,9 +180,9 @@ static u64 tcp_read_usage(struct mem_cgroup *memcg)
return res_counter_read_u64(&tcp->tcp_memory_allocated, RES_USAGE); return res_counter_read_u64(&tcp->tcp_memory_allocated, RES_USAGE);
} }
static u64 tcp_cgroup_read(struct cgroup *cont, struct cftype *cft) static u64 tcp_cgroup_read(struct cgroup_subsys_state *css, struct cftype *cft)
{ {
struct mem_cgroup *memcg = mem_cgroup_from_cont(cont); struct mem_cgroup *memcg = mem_cgroup_from_css(css);
u64 val; u64 val;
switch (cft->private) { switch (cft->private) {
...@@ -202,13 +202,13 @@ static u64 tcp_cgroup_read(struct cgroup *cont, struct cftype *cft) ...@@ -202,13 +202,13 @@ static u64 tcp_cgroup_read(struct cgroup *cont, struct cftype *cft)
return val; return val;
} }
static int tcp_cgroup_reset(struct cgroup *cont, unsigned int event) static int tcp_cgroup_reset(struct cgroup_subsys_state *css, unsigned int event)
{ {
struct mem_cgroup *memcg; struct mem_cgroup *memcg;
struct tcp_memcontrol *tcp; struct tcp_memcontrol *tcp;
struct cg_proto *cg_proto; struct cg_proto *cg_proto;
memcg = mem_cgroup_from_cont(cont); memcg = mem_cgroup_from_css(css);
cg_proto = tcp_prot.proto_cgroup(memcg); cg_proto = tcp_prot.proto_cgroup(memcg);
if (!cg_proto) if (!cg_proto)
return 0; return 0;
......
net/sched/cls_cgroup.c
View file @ 182446d0
...@@ -28,11 +28,6 @@ static inline struct cgroup_cls_state *css_cls_state(struct cgroup_subsys_state ...@@ -28,11 +28,6 @@ static inline struct cgroup_cls_state *css_cls_state(struct cgroup_subsys_state
return css ? container_of(css, struct cgroup_cls_state, css) : NULL; return css ? container_of(css, struct cgroup_cls_state, css) : NULL;
} }
static inline struct cgroup_cls_state *cgrp_cls_state(struct cgroup *cgrp)
{
return css_cls_state(cgroup_css(cgrp, net_cls_subsys_id));
}
static inline struct cgroup_cls_state *task_cls_state(struct task_struct *p) static inline struct cgroup_cls_state *task_cls_state(struct task_struct *p)
{ {
return css_cls_state(task_css(p, net_cls_subsys_id)); return css_cls_state(task_css(p, net_cls_subsys_id));
...@@ -87,14 +82,15 @@ static void cgrp_attach(struct cgroup_subsys_state *css, ...@@ -87,14 +82,15 @@ static void cgrp_attach(struct cgroup_subsys_state *css,
} }
} }
static u64 read_classid(struct cgroup *cgrp, struct cftype *cft) static u64 read_classid(struct cgroup_subsys_state *css, struct cftype *cft)
{ {
return cgrp_cls_state(cgrp)->classid; return css_cls_state(css)->classid;
} }
static int write_classid(struct cgroup *cgrp, struct cftype *cft, u64 value) static int write_classid(struct cgroup_subsys_state *css, struct cftype *cft,
u64 value)
{ {
cgrp_cls_state(cgrp)->classid = (u32) value; css_cls_state(css)->classid = (u32) value;
return 0; return 0;
} }
......
security/device_cgroup.c
View file @ 182446d0
...@@ -289,10 +289,10 @@ static void set_majmin(char *str, unsigned m) ...@@ -289,10 +289,10 @@ static void set_majmin(char *str, unsigned m)
sprintf(str, "%u", m); sprintf(str, "%u", m);
} }
static int devcgroup_seq_read(struct cgroup *cgroup, struct cftype *cft, static int devcgroup_seq_read(struct cgroup_subsys_state *css,
struct seq_file *m) struct cftype *cft, struct seq_file *m)
{ {
struct dev_cgroup *devcgroup = cgroup_to_devcgroup(cgroup); struct dev_cgroup *devcgroup = css_to_devcgroup(css);
struct dev_exception_item *ex; struct dev_exception_item *ex;
char maj[MAJMINLEN], min[MAJMINLEN], acc[ACCLEN]; char maj[MAJMINLEN], min[MAJMINLEN], acc[ACCLEN];
...@@ -669,13 +669,13 @@ static int devcgroup_update_access(struct dev_cgroup *devcgroup, ...@@ -669,13 +669,13 @@ static int devcgroup_update_access(struct dev_cgroup *devcgroup,
return rc; return rc;
} }
static int devcgroup_access_write(struct cgroup *cgrp, struct cftype *cft, static int devcgroup_access_write(struct cgroup_subsys_state *css,
const char *buffer) struct cftype *cft, const char *buffer)
{ {
int retval; int retval;
mutex_lock(&devcgroup_mutex); mutex_lock(&devcgroup_mutex);
retval = devcgroup_update_access(cgroup_to_devcgroup(cgrp), retval = devcgroup_update_access(css_to_devcgroup(css),
cft->private, buffer); cft->private, buffer);
mutex_unlock(&devcgroup_mutex); mutex_unlock(&devcgroup_mutex);
return retval; return retval;
......
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