Commit 2e30abd1 authored by Marek Szyprowski's avatar Marek Szyprowski Committed by Linus Torvalds

mm: cma: skip watermarks check for already isolated blocks in split_free_page()

Since commit 2139cbe6 ("cma: fix counting of isolated pages") free
pages in isolated pageblocks are not accounted to NR_FREE_PAGES counters,
so watermarks check is not required if one operates on a free page in
isolated pageblock.
Signed-off-by: default avatarMarek Szyprowski <m.szyprowski@samsung.com>
Cc: Kyungmin Park <kyungmin.park@samsung.com>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Mel Gorman <mel@csn.ul.ie>
Acked-by: default avatarMichal Nazarewicz <mina86@mina86.com>
Cc: Minchan Kim <minchan@kernel.org>
Cc: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent e1e12d2f
...@@ -1394,21 +1394,22 @@ int capture_free_page(struct page *page, int alloc_order, int migratetype) ...@@ -1394,21 +1394,22 @@ int capture_free_page(struct page *page, int alloc_order, int migratetype)
zone = page_zone(page); zone = page_zone(page);
order = page_order(page); order = page_order(page);
mt = get_pageblock_migratetype(page);
/* Obey watermarks as if the page was being allocated */ if (mt != MIGRATE_ISOLATE) {
watermark = low_wmark_pages(zone) + (1 << order); /* Obey watermarks as if the page was being allocated */
if (!zone_watermark_ok(zone, 0, watermark, 0, 0)) watermark = low_wmark_pages(zone) + (1 << order);
return 0; if (!zone_watermark_ok(zone, 0, watermark, 0, 0))
return 0;
__mod_zone_freepage_state(zone, -(1UL << alloc_order), mt);
}
/* Remove page from free list */ /* Remove page from free list */
list_del(&page->lru); list_del(&page->lru);
zone->free_area[order].nr_free--; zone->free_area[order].nr_free--;
rmv_page_order(page); rmv_page_order(page);
mt = get_pageblock_migratetype(page);
if (unlikely(mt != MIGRATE_ISOLATE))
__mod_zone_freepage_state(zone, -(1UL << alloc_order), mt);
if (alloc_order != order) if (alloc_order != order)
expand(zone, page, alloc_order, order, expand(zone, page, alloc_order, order,
&zone->free_area[order], migratetype); &zone->free_area[order], migratetype);
......
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