Re: [PATCH 1/2] mmotm: mm-oom-rework-oom-detection-fix

From: Hillf Danton
Date: Fri May 13 2016 - 00:00:01 EST


> From: Michal Hocko <mhocko@xxxxxxxx>
>
> watermark check should use classzone_idx rather than high_zoneidx
> to check reserves against the correct (preferred) zone.
>
> Signed-off-by: Michal Hocko <mhocko@xxxxxxxx>
> ---
Acked-by: Hillf Danton <hillf.zj@xxxxxxxxxxxxxxx>

> mm/page_alloc.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/mm/page_alloc.c b/mm/page_alloc.c
> index 0d9008042efa..620ec002aea2 100644
> --- a/mm/page_alloc.c
> +++ b/mm/page_alloc.c
> @@ -3496,7 +3496,7 @@ should_reclaim_retry(gfp_t gfp_mask, unsigned order,
> * available?
> */
> if (__zone_watermark_ok(zone, order, min_wmark_pages(zone),
> - ac->high_zoneidx, alloc_flags, available)) {
> + ac_classzone_idx(ac), alloc_flags, available)) {
> /*
> * If we didn't make any progress and have a lot of
> * dirty + writeback pages then we should wait for
> --
> 2.8.1