cgroup: make CONFIG_CGROUP_NET_PRIO bool and drop unnecessary init_netclassid_cgroup()

net_prio is the only cgroup which is allowed to be built as a module.
The savings from allowing one controller to be built as a module are
tiny especially given that cgroup module support itself adds quite a
bit of complexity.

Given that none of other controllers has much chance of being made a
module and that we're unlikely to add new modular controllers, the
added complexity is simply not justifiable.

As a first step to drop cgroup module support, this patch changes the
config option to bool from tristate and drops module related code from
it.

Also, while an earlier commit fe1217c4f3f7 ("net: net_cls: move
cgroupfs classid handling into core") dropped module support from
net_cls cgroup, it retained a call to cgroup_load_subsys(), which is
noop for built-in controllers.  Drop it along with
init_netclassid_cgroup().

v2: Removed modular version of task_netprioidx() in
    include/net/netprio_cgroup.h as suggested by Li Zefan.

v3: Rebased on top of fe1217c4f3f7 ("net: net_cls: move cgroupfs
    classid handling into core").  net_cls cgroup part is mostly
    dropped except for removal of init_netclassid_cgroup().

Signed-off-by: Tejun Heo <tj@kernel.org>
Acked-by: Neil Horman <nhorman@tuxdriver.com>
Acked-by: "David S. Miller" <davem@davemloft.net>
Acked-by: Li Zefan <lizefan@huawei.com>
Cc: Thomas Graf <tgraf@suug.ch>

diff --git a/include/net/netprio_cgroup.h b/include/net/netprio_cgroup.h
index dafc09f0fdbc86f8b87180cbee2e733694b89085..b7ff5bd3c3c38c40c64a4a049f25044a9efd04fa 100644 (file)
--- a/include/net/netprio_cgroup.h
+++ b/include/net/netprio_cgroup.h
@@ -27,7 +27,6 @@ struct netprio_map {
 
 void sock_update_netprioidx(struct sock *sk);
 
-#if IS_BUILTIN(CONFIG_CGROUP_NET_PRIO)
 static inline u32 task_netprioidx(struct task_struct *p)
 {
        struct cgroup_subsys_state *css;
@@ -39,20 +38,6 @@ static inline u32 task_netprioidx(struct task_struct *p)
        rcu_read_unlock();
        return idx;
 }
-#elif IS_MODULE(CONFIG_CGROUP_NET_PRIO)
-static inline u32 task_netprioidx(struct task_struct *p)
-{
-       struct cgroup_subsys_state *css;
-       u32 idx = 0;
-
-       rcu_read_lock();
-       css = task_css(p, net_prio_subsys_id);
-       if (css)
-               idx = css->cgroup->id;
-       rcu_read_unlock();
-       return idx;
-}
-#endif
 #else /* !CONFIG_CGROUP_NET_PRIO */
 static inline u32 task_netprioidx(struct task_struct *p)
 {

diff --git a/net/Kconfig b/net/Kconfig
index e411046a62e3f0fe82281bc6b97dd8a1183558d1..a83bc4cc45a485c72e30301482a8216055a331b7 100644 (file)
--- a/net/Kconfig
+++ b/net/Kconfig
@@ -239,7 +239,7 @@ config XPS
        default y
 
 config CGROUP_NET_PRIO
-       tristate "Network priority cgroup"
+       bool "Network priority cgroup"
        depends on CGROUPS
        ---help---
          Cgroup subsystem for use in assigning processes to network priorities on

diff --git a/net/core/netclassid_cgroup.c b/net/core/netclassid_cgroup.c
index 719efd541668c9b91fd79d6faa228c0923dafe24..9fc7f90d034c7c44495ff18d76f97e58746aa621 100644 (file)
--- a/net/core/netclassid_cgroup.c
+++ b/net/core/netclassid_cgroup.c
@@ -112,9 +112,3 @@ struct cgroup_subsys net_cls_subsys = {
        .base_cftypes           = ss_files,
        .module                 = THIS_MODULE,
 };
-
-static int __init init_netclassid_cgroup(void)
-{
-       return cgroup_load_subsys(&net_cls_subsys);
-}
-__initcall(init_netclassid_cgroup);

diff --git a/net/core/netprio_cgroup.c b/net/core/netprio_cgroup.c
index 9043caedcd083bf48836d0a970d48d8c533f86ee..cc3a31e7dc08c1cdfd74130d30dd7d06298991dd 100644 (file)
--- a/net/core/netprio_cgroup.c
+++ b/net/core/netprio_cgroup.c
@@ -283,37 +283,9 @@ static struct notifier_block netprio_device_notifier = {
 
 static int __init init_cgroup_netprio(void)
 {
-       int ret;
-
-       ret = cgroup_load_subsys(&net_prio_subsys);
-       if (ret)
-               goto out;
-
        register_netdevice_notifier(&netprio_device_notifier);
-
-out:
-       return ret;
-}
-
-static void __exit exit_cgroup_netprio(void)
-{
-       struct netprio_map *old;
-       struct net_device *dev;
-
-       unregister_netdevice_notifier(&netprio_device_notifier);
-
-       cgroup_unload_subsys(&net_prio_subsys);
-
-       rtnl_lock();
-       for_each_netdev(&init_net, dev) {
-               old = rtnl_dereference(dev->priomap);
-               RCU_INIT_POINTER(dev->priomap, NULL);
-               if (old)
-                       kfree_rcu(old, rcu);
-       }
-       rtnl_unlock();
+       return 0;
 }
 
-module_init(init_cgroup_netprio);
-module_exit(exit_cgroup_netprio);
+subsys_initcall(init_cgroup_netprio);
 MODULE_LICENSE("GPL v2");