cgroup/cpuset: Enable memory migration for cpuset v2

When a user changes cpuset.cpus, each task in a v2 cpuset will be moved
to one of the new cpus if it is not there already. For memory, however,
they won't be migrated to the new nodes when cpuset.mems changes. This is
an inconsistency in behavior.

In cpuset v1, there is a memory_migrate control file to enable such
behavior by setting the CS_MEMORY_MIGRATE flag. Make it the default
for cpuset v2 so that we have a consistent set of behavior for both
cpus and memory.

There is certainly a cost to make memory migration the default, but it
is a one time cost that shouldn't really matter as long as cpuset.mems
isn't changed frequenty.  Update the cgroup-v2.rst file to document the
new behavior and recommend against changing cpuset.mems frequently.

Since there won't be any concurrent access to the newly allocated cpuset
structure in cpuset_css_alloc(), we can use the cheaper non-atomic
__set_bit() instead of the more expensive atomic set_bit().

Signed-off-by: Waiman Long <longman@redhat.com>
Acked-by: Johannes Weiner <hannes@cmpxchg.org>
Signed-off-by: Tejun Heo <tj@kernel.org>

diff --git a/Documentation/admin-guide/cgroup-v2.rst b/Documentation/admin-guide/cgroup-v2.rst
index 5c7377b5bd3e37b086db5d245a7e9027fffad17b..babbe04c8d37d8a9c95c93a6916c47137672c816 100644 (file)
--- a/Documentation/admin-guide/cgroup-v2.rst
+++ b/Documentation/admin-guide/cgroup-v2.rst
@@ -2056,6 +2056,17 @@ Cpuset Interface Files
        The value of "cpuset.mems" stays constant until the next update
        and won't be affected by any memory nodes hotplug events.
 
+       Setting a non-empty value to "cpuset.mems" causes memory of
+       tasks within the cgroup to be migrated to the designated nodes if
+       they are currently using memory outside of the designated nodes.
+
+       There is a cost for this memory migration.  The migration
+       may not be complete and some memory pages may be left behind.
+       So it is recommended that "cpuset.mems" should be set properly
+       before spawning new tasks into the cpuset.  Even if there is
+       a need to change "cpuset.mems" with active tasks, it shouldn't
+       be done frequently.
+
   cpuset.mems.effective
        A read-only multiple values file which exists on all
        cpuset-enabled cgroups.

diff --git a/kernel/cgroup/cpuset.c b/kernel/cgroup/cpuset.c
index fcc11f2d3b5beeb5850950786ccb47f5673b267d..44d234b0df5e36d795f80d3e8af30d607c577cdb 100644 (file)
--- a/kernel/cgroup/cpuset.c
+++ b/kernel/cgroup/cpuset.c
@@ -2761,12 +2761,16 @@ cpuset_css_alloc(struct cgroup_subsys_state *parent_css)
                return ERR_PTR(-ENOMEM);
        }
 
-       set_bit(CS_SCHED_LOAD_BALANCE, &cs->flags);
+       __set_bit(CS_SCHED_LOAD_BALANCE, &cs->flags);
        nodes_clear(cs->mems_allowed);
        nodes_clear(cs->effective_mems);
        fmeter_init(&cs->fmeter);
        cs->relax_domain_level = -1;
 
+       /* Set CS_MEMORY_MIGRATE for default hierarchy */
+       if (cgroup_subsys_on_dfl(cpuset_cgrp_subsys))
+               __set_bit(CS_MEMORY_MIGRATE, &cs->flags);
+
        return &cs->css;
 }