• David Rientjes's avatar
    oom: fix constraint deadlock · 2b45ab33
    David Rientjes authored
    Fixes a deadlock in the OOM killer for allocations that are not
    __GFP_HARDWALL.
    
    Before the OOM killer checks for the allocation constraint, it takes
    callback_mutex.
    
    constrained_alloc() iterates through each zone in the allocation zonelist
    and calls cpuset_zone_allowed_softwall() to determine whether an allocation
    for gfp_mask is possible.  If a zone's node is not in the OOM-triggering
    task's mems_allowed, it is not exiting, and we did not fail on a
    __GFP_HARDWALL allocation, cpuset_zone_allowed_softwall() attempts to take
    callback_mutex to check the nearest exclusive ancestor of current's cpuset.
     This results in deadlock.
    
    We now take callback_mutex after iterating through the zonelist since we
    don't need it yet.
    
    Cc: Andi Kleen <ak@suse.de>
    Cc: Nick Piggin <npiggin@suse.de>
    Cc: Christoph Lameter <clameter@engr.sgi.com>
    Cc: Martin J. Bligh <mbligh@mbligh.org>
    Signed-off-by: default avatarDavid Rientjes <rientjes@google.com>
    Cc: <stable@kernel.org>
    Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
    Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
    2b45ab33
oom_kill.c 12.1 KB