Commit da175d06 authored by Mel Gorman's avatar Mel Gorman Committed by Linus Torvalds

mm: vmscan: evaluate the watermarks against the correct classzone

When deciding if kswapd is sleeping prematurely, the classzone is taken
into account but this is different to what balance_pgdat() and the
allocator are doing.  Specifically, the DMA zone will be checked based on
the classzone used when waking kswapd which could be for a GFP_KERNEL or
GFP_HIGHMEM request.  The lowmem reserve limit kicks in, the watermark is
not met and kswapd thinks it's sleeping prematurely keeping kswapd awake in
error.
Signed-off-by: default avatarMel Gorman <mgorman@suse.de>
Reported-by: default avatarPádraig Brady <P@draigBrady.com>
Tested-by: default avatarPádraig Brady <P@draigBrady.com>
Tested-by: default avatarAndrew Lutomirski <luto@mit.edu>
Acked-by: default avatarRik van Riel <riel@redhat.com>
Reviewed-by: default avatarMinchan Kim <minchan.kim@gmail.com>
Cc: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Cc: <stable@kernel.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent d7868dae
...@@ -2344,7 +2344,7 @@ static bool sleeping_prematurely(pg_data_t *pgdat, int order, long remaining, ...@@ -2344,7 +2344,7 @@ static bool sleeping_prematurely(pg_data_t *pgdat, int order, long remaining,
} }
if (!zone_watermark_ok_safe(zone, order, high_wmark_pages(zone), if (!zone_watermark_ok_safe(zone, order, high_wmark_pages(zone),
classzone_idx, 0)) i, 0))
all_zones_ok = false; all_zones_ok = false;
else else
balanced += zone->present_pages; balanced += zone->present_pages;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment