The patch titled
Subject: mm/cma.c: free the reserved memblock when free cma pages
has been removed from the -mm tree. Its filename was
free-the-reserved-memblock-when-free-cma-pages.patch
This patch was dropped because it had testing failures
------------------------------------------------------
From: "Wang, Yalin" <Yalin.Wang@xxxxxxxxxxxxxx>
Subject: mm/cma.c: free the reserved memblock when free cma pages
Add memblock_free to also free the reserved memblock, so that the cma
pages are not marked as reserved memory in
/sys/kernel/debug/memblock/reserved debug file
Cc: Marek Szyprowski <m.szyprowski@xxxxxxxxxxx>
Cc: Michal Hocko <mhocko@xxxxxxx>
Cc: Hugh Dickins <hughd@xxxxxxxxxx>
Cc: Bartlomiej Zolnierkiewicz <b.zolnierkie@xxxxxxxxxxx>
Acked-by: Minchan Kim <minchan@xxxxxxxxxx>
Cc: Joonsoo Kim <iamjoonsoo.kim@xxxxxxx>
Cc: Sasha Levin <sasha.levin@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
mm/cma.c | 6 +++++-
mm/page_alloc.c | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
diff -puN mm/cma.c~free-the-reserved-memblock-when-free-cma-pages mm/cma.c
--- a/mm/cma.c~free-the-reserved-memblock-when-free-cma-pages
+++ a/mm/cma.c
@@ -217,7 +217,11 @@ int __init cma_declare_contiguous(phys_a
goto err;
}
- /* Reserve memory */
+ /*
+ * Reserve memory, and the reserved memory are marked as reserved by
+ * memblock driver, remember to clear the reserved status when free
+ * these cma pages, see init_cma_reserved_pageblock()
+ */
if (base && fixed) {
if (memblock_is_region_reserved(base, size) ||
memblock_reserve(base, size) < 0) {
diff -puN mm/page_alloc.c~free-the-reserved-memblock-when-free-cma-pages mm/page_alloc.c
--- a/mm/page_alloc.c~free-the-reserved-memblock-when-free-cma-pages
+++ a/mm/page_alloc.c
@@ -835,8 +835,8 @@ void __init init_cma_reserved_pageblock(
set_page_refcounted(page);
__free_pages(page, pageblock_order);
}
-
adjust_managed_page_count(page, pageblock_nr_pages);
+ memblock_free(page_to_phys(page), pageblock_nr_pages << PAGE_SHIFT);
}
#endif
_
Patches currently in -mm which might be from Yalin.Wang@xxxxxxxxxxxxxx are
linux-next.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
