[PATCH v2 3/4] mm: add accounting for CMA pages and use them for watermark calculation
From: Bartlomiej Zolnierkiewicz <hidden>
Date: 2012-09-03 15:33:35
Subsystem:
memory management, memory management - page allocator, the rest · Maintainers:
Andrew Morton, Vlastimil Babka, Linus Torvalds
From: Marek Szyprowski <m.szyprowski@samsung.com> During watermark check we need to decrease available free pages number by free CMA pages number because unmovable allocations cannot use pages from CMA areas. Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com> Cc: Michal Nazarewicz <redacted> Cc: Minchan Kim <minchan@kernel.org> Cc: Mel Gorman <mgorman@suse.de> Signed-off-by: Bartlomiej Zolnierkiewicz <redacted> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com> --- mm/page_alloc.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index 8afae42..115edf6 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c@@ -1626,7 +1626,7 @@ static inline bool should_fail_alloc_page(gfp_t gfp_mask, unsigned int order) * of the allocation. */ static bool __zone_watermark_ok(struct zone *z, int order, unsigned long mark, - int classzone_idx, int alloc_flags, long free_pages) + int classzone_idx, int alloc_flags, long free_pages, long free_cma_pages) { /* free_pages my go negative - that's OK */ long min = mark;
@@ -1639,7 +1639,7 @@ static bool __zone_watermark_ok(struct zone *z, int order, unsigned long mark, if (alloc_flags & ALLOC_HARDER) min -= min / 4; - if (free_pages <= min + lowmem_reserve) + if (free_pages - free_cma_pages <= min + lowmem_reserve) return false; for (o = 0; o < order; o++) { /* At the next order, this order's pages become unavailable */
@@ -1672,13 +1672,15 @@ bool zone_watermark_ok(struct zone *z, int order, unsigned long mark, int classzone_idx, int alloc_flags) { return __zone_watermark_ok(z, order, mark, classzone_idx, alloc_flags, - zone_page_state(z, NR_FREE_PAGES)); + zone_page_state(z, NR_FREE_PAGES), + zone_page_state(z, NR_FREE_CMA_PAGES)); } bool zone_watermark_ok_safe(struct zone *z, int order, unsigned long mark, int classzone_idx, int alloc_flags) { long free_pages = zone_page_state(z, NR_FREE_PAGES); + long free_cma_pages = zone_page_state(z, NR_FREE_CMA_PAGES); if (z->percpu_drift_mark && free_pages < z->percpu_drift_mark) free_pages = zone_page_state_snapshot(z, NR_FREE_PAGES);
@@ -1692,7 +1694,7 @@ bool zone_watermark_ok_safe(struct zone *z, int order, unsigned long mark, */ free_pages -= nr_zone_isolate_freepages(z); return __zone_watermark_ok(z, order, mark, classzone_idx, alloc_flags, - free_pages); + free_pages, free_cma_pages); } #ifdef CONFIG_NUMA
--
1.7.11.3
--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>