From: "Gregory Price (Meta)" With memory_spread_page set, cpuset_mem_spread_node() rotates the preferred node for page cache over the task's mems_allowed. mems_allowed can include private nodes. A private preferred node will fall back to the nearest common node, which takes an extra share. Rotate only over the allowed nodes outside N_MEMORY_PRIVATE. A task's mems_allowed always holds common memory, so the loop always terminates. Signed-off-by: Gregory Price (Meta) --- kernel/cgroup/cpuset.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/kernel/cgroup/cpuset.c b/kernel/cgroup/cpuset.c index 6802ca13c46b..8401b69ee3da 100644 --- a/kernel/cgroup/cpuset.c +++ b/kernel/cgroup/cpuset.c @@ -4600,7 +4600,14 @@ void cpuset_nodes_allowed(struct cgroup *cgroup, nodemask_t *mask) */ static int cpuset_spread_node(int *rotor) { - return *rotor = next_node_in(*rotor, current->mems_allowed); + int nid = *rotor; + + /* Spread page cache only over memory that ordinary allocations use. */ + do { + nid = next_node_in(nid, current->mems_allowed); + } while (nid < MAX_NUMNODES && node_state(nid, N_MEMORY_PRIVATE)); + + return *rotor = nid; } /** -- 2.56.1