Merge tag 'for-linus-5.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml

[linux-2.6-microblaze.git] / Documentation / admin-guide / mm / numa_memory_policy.rst

diff --git a/Documentation/admin-guide/mm/numa_memory_policy.rst b/Documentation/admin-guide/mm/numa_memory_policy.rst
index 067a90a..64fd0ba 100644 (file)
--- a/Documentation/admin-guide/mm/numa_memory_policy.rst
+++ b/Documentation/admin-guide/mm/numa_memory_policy.rst
@@ -245,6 +245,13 @@ MPOL_INTERLEAVED
        address range or file.  During system boot up, the temporary
        interleaved system default policy works in this mode.
 
        address range or file.  During system boot up, the temporary
        interleaved system default policy works in this mode.
 

+MPOL_PREFERRED_MANY
+       This mode specifices that the allocation should be preferrably
+       satisfied from the nodemask specified in the policy. If there is
+       a memory pressure on all nodes in the nodemask, the allocation
+       can fall back to all existing numa nodes. This is effectively
+       MPOL_PREFERRED allowed for a mask rather than a single node.
+

 NUMA memory policy supports the following optional mode flags:
 
 MPOL_F_STATIC_NODES
 NUMA memory policy supports the following optional mode flags:
 
 MPOL_F_STATIC_NODES


@@ -253,10 +260,10 @@ MPOL_F_STATIC_NODES
        nodes changes after the memory policy has been defined.
 
        Without this flag, any time a mempolicy is rebound because of a
        nodes changes after the memory policy has been defined.
 
        Without this flag, any time a mempolicy is rebound because of a

-       change in the set of allowed nodes, the node (Preferred) or
-       nodemask (Bind, Interleave) is remapped to the new set of
-       allowed nodes.  This may result in nodes being used that were
-       previously undesired.
+        change in the set of allowed nodes, the preferred nodemask (Preferred
+        Many), preferred node (Preferred) or nodemask (Bind, Interleave) is
+        remapped to the new set of allowed nodes.  This may result in nodes
+        being used that were previously undesired.

 
        With this flag, if the user-specified nodes overlap with the
        nodes allowed by the task's cpuset, then the memory policy is
 
        With this flag, if the user-specified nodes overlap with the
        nodes allowed by the task's cpuset, then the memory policy is