cgroup: Add mount flag to enable cpuset to use v2 behavior in v1 cgroup

[mirror_ubuntu-bionic-kernel.git] / kernel / cgroup / cgroup-v1.c

diff --git a/kernel/cgroup/cgroup-v1.c b/kernel/cgroup/cgroup-v1.c
index f0e8601b13cb5affeaeabdbcbe7b190e765156ea..024085daab1aede5958235b0663c19ec667b5836 100644 (file)
--- a/kernel/cgroup/cgroup-v1.c
+++ b/kernel/cgroup/cgroup-v1.c
@@ -895,6 +895,8 @@ static int cgroup1_show_options(struct seq_file *seq, struct kernfs_root *kf_roo
                seq_puts(seq, ",noprefix");
        if (root->flags & CGRP_ROOT_XATTR)
                seq_puts(seq, ",xattr");
+       if (root->flags & CGRP_ROOT_CPUSET_V2_MODE)
+               seq_puts(seq, ",cpuset_v2_mode");
 
        spin_lock(&release_agent_path_lock);
        if (strlen(root->release_agent_path))
@@ -949,6 +951,10 @@ static int parse_cgroupfs_options(char *data, struct cgroup_sb_opts *opts)
                        opts->cpuset_clone_children = true;
                        continue;
                }
+               if (!strcmp(token, "cpuset_v2_mode")) {
+                       opts->flags |= CGRP_ROOT_CPUSET_V2_MODE;
+                       continue;
+               }
                if (!strcmp(token, "xattr")) {
                        opts->flags |= CGRP_ROOT_XATTR;
                        continue;