Merge tag 'net-next-6.7' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev...

[linux.git] / kernel / cgroup / cgroup.c

diff --git a/kernel/cgroup/cgroup.c b/kernel/cgroup/cgroup.c
index b6d64f3b888832428b896e505222d763babd4e7f..484adb375b155bc00bfaaf0bc808e4b1d43ea097 100644 (file)
--- a/kernel/cgroup/cgroup.c
+++ b/kernel/cgroup/cgroup.c
@@ -207,6 +207,8 @@ static u16 have_exit_callback __read_mostly;
 static u16 have_release_callback __read_mostly;
 static u16 have_canfork_callback __read_mostly;
 
+static bool have_favordynmods __ro_after_init = IS_ENABLED(CONFIG_CGROUP_FAVOR_DYNMODS);
+
 /* cgroup namespace for init task */
 struct cgroup_namespace init_cgroup_ns = {
        .ns.count       = REFCOUNT_INIT(2),
@@ -1350,7 +1352,9 @@ static void cgroup_destroy_root(struct cgroup_root *root)
                cgroup_root_count--;
        }
 
-       cgroup_favor_dynmods(root, false);
+       if (!have_favordynmods)
+               cgroup_favor_dynmods(root, false);
+
        cgroup_exit_root_id(root);
 
        cgroup_unlock();
@@ -1719,20 +1723,22 @@ static int css_populate_dir(struct cgroup_subsys_state *css)
 
        if (!css->ss) {
                if (cgroup_on_dfl(cgrp)) {
-                       ret = cgroup_addrm_files(&cgrp->self, cgrp,
+                       ret = cgroup_addrm_files(css, cgrp,
                                                 cgroup_base_files, true);
                        if (ret < 0)
                                return ret;
 
                        if (cgroup_psi_enabled()) {
-                               ret = cgroup_addrm_files(&cgrp->self, cgrp,
+                               ret = cgroup_addrm_files(css, cgrp,
                                                         cgroup_psi_files, true);
                                if (ret < 0)
                                        return ret;
                        }
                } else {
-                       cgroup_addrm_files(css, cgrp,
-                                          cgroup1_base_files, true);
+                       ret = cgroup_addrm_files(css, cgrp,
+                                                cgroup1_base_files, true);
+                       if (ret < 0)
+                               return ret;
                }
        } else {
                list_for_each_entry(cfts, &css->ss->cfts, node) {
@@ -2243,9 +2249,9 @@ static int cgroup_init_fs_context(struct fs_context *fc)
        fc->user_ns = get_user_ns(ctx->ns->user_ns);
        fc->global = true;
 
-#ifdef CONFIG_CGROUP_FAVOR_DYNMODS
-       ctx->flags |= CGRP_ROOT_FAVOR_DYNMODS;
-#endif
+       if (have_favordynmods)
+               ctx->flags |= CGRP_ROOT_FAVOR_DYNMODS;
+
        return 0;
 }
 
@@ -6127,7 +6133,7 @@ int __init cgroup_init(void)
 
                if (cgroup1_ssid_disabled(ssid))
                        pr_info("Disabling %s control group subsystem in v1 mounts\n",
-                               ss->name);
+                               ss->legacy_name);
 
                cgrp_dfl_root.subsys_mask |= 1 << ss->id;
 
@@ -6770,6 +6776,12 @@ static int __init enable_cgroup_debug(char *str)
 }
 __setup("cgroup_debug", enable_cgroup_debug);
 
+static int __init cgroup_favordynmods_setup(char *str)
+{
+       return (kstrtobool(str, &have_favordynmods) == 0);
+}
+__setup("cgroup_favordynmods=", cgroup_favordynmods_setup);
+
 /**
  * css_tryget_online_from_dir - get corresponding css from a cgroup dentry
  * @dentry: directory dentry of interest