cgroup: rename cgroup_subsys->base_cftypes to ->legacy_cftypes

Currently, cgroup_subsys->base_cftypes is used for both the unified
default hierarchy and legacy ones and subsystems can mark each file
with either CFTYPE_ONLY_ON_DFL or CFTYPE_INSANE if it has to appear
only on one of them.  This is quite hairy and error-prone.  Also, we
may end up exposing interface files to the default hierarchy without
thinking it through.

cgroup_subsys will grow two separate cftype arrays and apply each only
on the hierarchies of the matching type.  This will allow organizing
cftypes in a lot clearer way and encourage subsystems to scrutinize
the interface which is being exposed in the new default hierarchy.

In preparation, this patch renames cgroup_subsys->base_cftypes to
cgroup_subsys->legacy_cftypes.  This patch is pure rename.

Signed-off-by: Tejun Heo <tj@kernel.org>
Acked-by: Neil Horman <nhorman@tuxdriver.com>
Acked-by: Li Zefan <lizefan@huawei.com>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Cc: Michal Hocko <mhocko@suse.cz>
Cc: Vivek Goyal <vgoyal@redhat.com>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Arnaldo Carvalho de Melo <acme@kernel.org>
Cc: Aristeu Rozanski <aris@redhat.com>
Cc: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>

diff --git a/block/blk-cgroup.c b/block/blk-cgroup.c
index 63c3cd454d1edbfdb9b37578e14c7c39fc694135..5cfbc723041c7db3f3481e3259f8bac0d60c700b 100644 (file)
--- a/block/blk-cgroup.c
+++ b/block/blk-cgroup.c
@@ -924,7 +924,7 @@ struct cgroup_subsys blkio_cgrp_subsys = {
        .css_offline = blkcg_css_offline,
        .css_free = blkcg_css_free,
        .can_attach = blkcg_can_attach,
-       .base_cftypes = blkcg_files,
+       .legacy_cftypes = blkcg_files,
 #ifdef CONFIG_MEMCG
        /*
         * This ensures that, if available, memcg is automatically enabled

diff --git a/include/linux/cgroup.h b/include/linux/cgroup.h
index 7bb274487c896b21d5fbc59da1c581f564e4dec5..a6e9c2eeab89fe0b05f57de4747f94a1c80f1c24 100644 (file)
--- a/include/linux/cgroup.h
+++ b/include/linux/cgroup.h
@@ -672,7 +672,7 @@ struct cgroup_subsys {
        struct list_head cfts;
 
        /* base cftypes, automatically registered with subsys itself */
-       struct cftype *base_cftypes;
+       struct cftype *legacy_cftypes;  /* used on the legacy hierarchies */
 
        /*
         * A subsystem may depend on other subsystems.  When such subsystem

diff --git a/kernel/cgroup.c b/kernel/cgroup.c
index 7e5fee5d642219d43a058f4445dbd11d22e03c10..6496a83b0314d2e2623ab29c4e54de08dc748ee4 100644 (file)
--- a/kernel/cgroup.c
+++ b/kernel/cgroup.c
@@ -4890,7 +4890,7 @@ int __init cgroup_init(void)
                 */
                if (!ss->disabled) {
                        cgrp_dfl_root.subsys_mask |= 1 << ss->id;
-                       WARN_ON(cgroup_add_cftypes(ss, ss->base_cftypes));
+                       WARN_ON(cgroup_add_cftypes(ss, ss->legacy_cftypes));
                }
        }
 
@@ -5480,6 +5480,6 @@ static struct cftype debug_files[] =  {
 struct cgroup_subsys debug_cgrp_subsys = {
        .css_alloc = debug_css_alloc,
        .css_free = debug_css_free,
-       .base_cftypes = debug_files,
+       .legacy_cftypes = debug_files,
 };
 #endif /* CONFIG_CGROUP_DEBUG */

diff --git a/kernel/cgroup_freezer.c b/kernel/cgroup_freezer.c
index a79e40f9d700497d8781faf844774873c9ae1bd0..92b98cc0ee7639270d75aa64b59236d3c3283b69 100644 (file)
--- a/kernel/cgroup_freezer.c
+++ b/kernel/cgroup_freezer.c
@@ -480,5 +480,5 @@ struct cgroup_subsys freezer_cgrp_subsys = {
        .css_free       = freezer_css_free,
        .attach         = freezer_attach,
        .fork           = freezer_fork,
-       .base_cftypes   = files,
+       .legacy_cftypes = files,
 };

diff --git a/kernel/cpuset.c b/kernel/cpuset.c
index 53a9bbf163912a9298595dacf1445c4c5b1ad916..f337f42a07ac051e6ae54dda7cbed3bb9284752a 100644 (file)
--- a/kernel/cpuset.c
+++ b/kernel/cpuset.c
@@ -2036,7 +2036,7 @@ struct cgroup_subsys cpuset_cgrp_subsys = {
        .cancel_attach  = cpuset_cancel_attach,
        .attach         = cpuset_attach,
        .bind           = cpuset_bind,
-       .base_cftypes   = files,
+       .legacy_cftypes = files,
        .early_init     = 1,
 };
 

diff --git a/kernel/sched/core.c b/kernel/sched/core.c
index 3bdf01b494fe29c267a0abe73828b02a799a737d..6628e8014824263db5d3223d2f071885b2522297 100644 (file)
--- a/kernel/sched/core.c
+++ b/kernel/sched/core.c
@@ -8088,7 +8088,7 @@ struct cgroup_subsys cpu_cgrp_subsys = {
        .can_attach     = cpu_cgroup_can_attach,
        .attach         = cpu_cgroup_attach,
        .exit           = cpu_cgroup_exit,
-       .base_cftypes   = cpu_files,
+       .legacy_cftypes = cpu_files,
        .early_init     = 1,
 };
 

diff --git a/kernel/sched/cpuacct.c b/kernel/sched/cpuacct.c
index 9cf350c94ec4e14fc8d30500eb6a308f121cb97f..dd7cbb55bbf2c98591dd31603790676136eafd82 100644 (file)
--- a/kernel/sched/cpuacct.c
+++ b/kernel/sched/cpuacct.c
@@ -278,6 +278,6 @@ void cpuacct_account_field(struct task_struct *p, int index, u64 val)
 struct cgroup_subsys cpuacct_cgrp_subsys = {
        .css_alloc      = cpuacct_css_alloc,
        .css_free       = cpuacct_css_free,
-       .base_cftypes   = files,
+       .legacy_cftypes = files,
        .early_init     = 1,
 };

diff --git a/mm/memcontrol.c b/mm/memcontrol.c
index a2a4bd69a7ae8e3c1fb5774d77eaa1464d97958e..8331f2739e2c42c1dda74795a86da51d028a26ed 100644 (file)
--- a/mm/memcontrol.c
+++ b/mm/memcontrol.c
@@ -7048,7 +7048,7 @@ struct cgroup_subsys memory_cgrp_subsys = {
        .cancel_attach = mem_cgroup_cancel_attach,
        .attach = mem_cgroup_move_task,
        .bind = mem_cgroup_bind,
-       .base_cftypes = mem_cgroup_files,
+       .legacy_cftypes = mem_cgroup_files,
        .early_init = 0,
 };
 

diff --git a/net/core/netclassid_cgroup.c b/net/core/netclassid_cgroup.c
index 30d903b19c62095a51efeae2fedd96b9c943d13d..1f2a126f4ffa07a6e50cd2b57a6042afca3ee3ad 100644 (file)
--- a/net/core/netclassid_cgroup.c
+++ b/net/core/netclassid_cgroup.c
@@ -107,5 +107,5 @@ struct cgroup_subsys net_cls_cgrp_subsys = {
        .css_online             = cgrp_css_online,
        .css_free               = cgrp_css_free,
        .attach                 = cgrp_attach,
-       .base_cftypes           = ss_files,
+       .legacy_cftypes         = ss_files,
 };

diff --git a/net/core/netprio_cgroup.c b/net/core/netprio_cgroup.c
index 2f385b9bccc0f3beae1fc3c7166f60310358ef54..cbd0a199bf52c79780e7935f1ed123f3f86758ec 100644 (file)
--- a/net/core/netprio_cgroup.c
+++ b/net/core/netprio_cgroup.c
@@ -249,7 +249,7 @@ struct cgroup_subsys net_prio_cgrp_subsys = {
        .css_online     = cgrp_css_online,
        .css_free       = cgrp_css_free,
        .attach         = net_prio_attach,
-       .base_cftypes   = ss_files,
+       .legacy_cftypes = ss_files,
 };
 
 static int netprio_device_event(struct notifier_block *unused,

diff --git a/security/device_cgroup.c b/security/device_cgroup.c
index d9d69e6930edf5266e1c2bc77fff39528fee5467..188c1d26393b56bfd13814e7834119a440410114 100644 (file)
--- a/security/device_cgroup.c
+++ b/security/device_cgroup.c
@@ -796,7 +796,7 @@ struct cgroup_subsys devices_cgrp_subsys = {
        .css_free = devcgroup_css_free,
        .css_online = devcgroup_online,
        .css_offline = devcgroup_offline,
-       .base_cftypes = dev_cgroup_files,
+       .legacy_cftypes = dev_cgroup_files,
 };
 
 /**