• K
    mempolicy: silently restrict nodemask to allowed nodes · 31f1de46
    KOSAKI Motohiro 提交于
    Kosaki Motohito noted that "numactl --interleave=all ..." failed in the
    presence of memoryless nodes.  This patch attempts to fix that problem.
    
    Some background:
    
    numactl --interleave=all calls set_mempolicy(2) with a fully populated
    [out to MAXNUMNODES] nodemask.  set_mempolicy() [in do_set_mempolicy()]
    calls contextualize_policy() which requires that the nodemask be a
    subset of the current task's mems_allowed; else EINVAL will be returned.
    
    A task's mems_allowed will always be a subset of node_states[N_HIGH_MEMORY]
    i.e., nodes with memory.  So, a fully populated nodemask will be
    declared invalid if it includes memoryless nodes.
    
      NOTE:  the same thing will occur when running in a cpuset
             with restricted mem_allowed--for the same reason:
             node mask contains dis-allowed nodes.
    
    mbind(2), on the other hand, just masks off any nodes in the nodemask
    that are not included in the caller's mems_allowed.
    
    In each case [mbind() and set_mempolicy()], mpol_check_policy() will
    complain [again, resulting in EINVAL] if the nodemask contains any
    memoryless nodes.  This is somewhat redundant as mpol_new() will remove
    memoryless nodes for interleave policy, as will bind_zonelist()--called
    by mpol_new() for BIND policy.
    
    Proposed fix:
    
    1) modify contextualize_policy logic to:
       a) remember whether the incoming node mask is empty.
       b) if not, restrict the nodemask to allowed nodes, as is
          currently done in-line for mbind().  This guarantees
          that the resulting mask includes only nodes with memory.
    
          NOTE:  this is a [benign, IMO] change in behavior for
                 set_mempolicy().  Dis-allowed nodes will be
                 silently ignored, rather than returning an error.
    
       c) fold this code into mpol_check_policy(), replace 2 calls to
          contextualize_policy() to call mpol_check_policy() directly
          and remove contextualize_policy().
    
    2) In existing mpol_check_policy() logic, after "contextualization":
       a) MPOL_DEFAULT:  require that in coming mask "was_empty"
       b) MPOL_{BIND|INTERLEAVE}:  require that contextualized nodemask
          contains at least one node.
       c) add a case for MPOL_PREFERRED:  if in coming was not empty
          and resulting mask IS empty, user specified invalid nodes.
          Return EINVAL.
       c) remove the now redundant check for memoryless nodes
    
    3) remove the now redundant masking of policy nodes for interleave
       policy from mpol_new().
    
    4) Now that mpol_check_policy() contextualizes the nodemask, remove
       the in-line nodes_and() from sys_mbind().  I believe that this
       restores mbind() to the behavior before the memoryless-nodes
       patch series.  E.g., we'll no longer treat an invalid nodemask
       with MPOL_PREFERRED as local allocation.
    
    [ Patch history:
    
      v1 -> v2:
       - Communicate whether or not incoming node mask was empty to
         mpol_check_policy() for better error checking.
       - As suggested by David Rientjes, remove the now unused
         cpuset_nodes_subset_current_mems_allowed() from cpuset.h
    
      v2 -> v3:
       - As suggested by Kosaki Motohito, fold the "contextualization"
         of policy nodemask into mpol_check_policy().  Looks a little
         cleaner. ]
    Signed-off-by: NLee Schermerhorn <lee.schermerhorn@hp.com>
    Signed-off-by: NKOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
    Tested-by: NKOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
    Acked-by: NDavid Rientjes <rientjes@google.com>
    Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
    31f1de46
mempolicy.c 51.3 KB