The patch titled
Subject: mm: cma: skip watermarks check for already isolated blocks in split_free_page() fix
has been added to the -mm tree. Its filename is
mm-cma-skip-watermarks-check-for-already-isolated-blocks-in-split_free_page-fix.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/SubmitChecklist when testing your code ***
The -mm tree is included into linux-next and is updated
there every 3-4 working days
------------------------------------------------------
From: Marek Szyprowski <m.szyprowski@xxxxxxxxxxx>
Subject: mm: cma: skip watermarks check for already isolated blocks in split_free_page() fix
Cleanup and simplify the code which uses page migrate type.
Signed-off-by: Marek Szyprowski <m.szyprowski@xxxxxxxxxxx>
Cc: Kyungmin Park <kyungmin.park@xxxxxxxxxxx>
Cc: Arnd Bergmann <arnd@xxxxxxxx>
Cc: Mel Gorman <mel@xxxxxxxxx>
Cc: Michal Nazarewicz <mina86@xxxxxxxxxx>
Cc: Minchan Kim <minchan@xxxxxxxxxx>
Cc: Bartlomiej Zolnierkiewicz <b.zolnierkie@xxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
mm/page_alloc.c | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff -puN mm/page_alloc.c~mm-cma-skip-watermarks-check-for-already-isolated-blocks-in-split_free_page-fix mm/page_alloc.c
--- a/mm/page_alloc.c~mm-cma-skip-watermarks-check-for-already-isolated-blocks-in-split_free_page-fix
+++ a/mm/page_alloc.c
@@ -1393,12 +1393,15 @@ int capture_free_page(struct page *page,
zone = page_zone(page);
order = page_order(page);
+ mt = get_pageblock_migratetype(page);
- if (get_pageblock_migratetype(page) != MIGRATE_ISOLATE) {
+ if (mt != MIGRATE_ISOLATE) {
/* Obey watermarks as if the page was being allocated */
watermark = low_wmark_pages(zone) + (1 << order);
if (!zone_watermark_ok(zone, 0, watermark, 0, 0))
return 0;
+
+ __mod_zone_freepage_state(zone, -(1UL << order), mt);
}
/* Remove page from free list */
@@ -1406,10 +1409,6 @@ int capture_free_page(struct page *page,
zone->free_area[order].nr_free--;
rmv_page_order(page);
- mt = get_pageblock_migratetype(page);
- if (unlikely(mt != MIGRATE_ISOLATE))
- __mod_zone_freepage_state(zone, -(1UL << order), mt);
-
if (alloc_order != order)
expand(zone, page, alloc_order, order,
&zone->free_area[order], migratetype);
_
Patches currently in -mm which might be from m.szyprowski@xxxxxxxxxxx are
linux-next.patch
mm-cma-skip-watermarks-check-for-already-isolated-blocks-in-split_free_page.patch
mm-cma-skip-watermarks-check-for-already-isolated-blocks-in-split_free_page-fix.patch
mm-cma-remove-watermark-hacks.patch
mm-cma-remove-watermark-hacks-fix.patch
mm-cma-warn-if-freed-memory-is-still-in-use.patch
mm-use-migrate_prep-instead-of-migrate_prep_local.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
