* [PATCH v3] arm64: mm: reserve hugetlb CMA after numa_init
@ 2020-06-17 21:58 Barry Song
2020-06-18 10:40 ` Will Deacon
0 siblings, 1 reply; 2+ messages in thread
From: Barry Song @ 2020-06-17 21:58 UTC (permalink / raw)
To: catalin.marinas, will, nsaenzjulienne, steve.capper, rppt, akpm
Cc: linux-arm-kernel, linux-kernel, linuxarm, Barry Song,
Matthias Brugger, Roman Gushchin, Anshuman Khandual
hugetlb_cma_reserve() is called at the wrong place. numa_init has not been
done yet. so all reserved memory will be located at node0.
Fixes: cf11e85fc08c ("mm: hugetlb: optionally allocate gigantic hugepages using cma")
Cc: Matthias Brugger <matthias.bgg@gmail.com>
Cc: Will Deacon <will@kernel.org>
Acked-by: Roman Gushchin <guro@fb.com>
Reviewed-by: Anshuman Khandual <anshuman.khandual@arm.com>
Signed-off-by: Barry Song <song.bao.hua@hisilicon.com>
---
-v3:
add review-by;
add comment according to Will's feedback
arch/arm64/mm/init.c | 15 ++++++++++-----
1 file changed, 10 insertions(+), 5 deletions(-)
diff --git a/arch/arm64/mm/init.c b/arch/arm64/mm/init.c
index e631e6425165..1e93cfc7c47a 100644
--- a/arch/arm64/mm/init.c
+++ b/arch/arm64/mm/init.c
@@ -404,11 +404,6 @@ void __init arm64_memblock_init(void)
high_memory = __va(memblock_end_of_DRAM() - 1) + 1;
dma_contiguous_reserve(arm64_dma32_phys_limit);
-
-#ifdef CONFIG_ARM64_4K_PAGES
- hugetlb_cma_reserve(PUD_SHIFT - PAGE_SHIFT);
-#endif
-
}
void __init bootmem_init(void)
@@ -424,6 +419,16 @@ void __init bootmem_init(void)
min_low_pfn = min;
arm64_numa_init();
+
+ /*
+ * must be done after arm64_numa_init() which calls numa_init() to
+ * initialize node_online_map that gets used in hugetlb_cma_reserve()
+ * while allocating required CMA size across online nodes.
+ */
+#ifdef CONFIG_ARM64_4K_PAGES
+ hugetlb_cma_reserve(PUD_SHIFT - PAGE_SHIFT);
+#endif
+
/*
* Sparsemem tries to allocate bootmem in memory_present(), so must be
* done after the fixed reservations.
--
2.23.0
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH v3] arm64: mm: reserve hugetlb CMA after numa_init
2020-06-17 21:58 [PATCH v3] arm64: mm: reserve hugetlb CMA after numa_init Barry Song
@ 2020-06-18 10:40 ` Will Deacon
0 siblings, 0 replies; 2+ messages in thread
From: Will Deacon @ 2020-06-18 10:40 UTC (permalink / raw)
To: Barry Song, nsaenzjulienne, steve.capper, catalin.marinas, akpm, rppt
Cc: Will Deacon, linux-arm-kernel, linux-kernel, linuxarm,
Matthias Brugger, Roman Gushchin, Anshuman Khandual
On Thu, 18 Jun 2020 09:58:28 +1200, Barry Song wrote:
> hugetlb_cma_reserve() is called at the wrong place. numa_init has not been
> done yet. so all reserved memory will be located at node0.
Applied to arm64 (for-next/fixes), thanks!
[1/1] arm64: mm: reserve hugetlb CMA after numa_init
https://git.kernel.org/arm64/c/618e07865b74
Cheers,
--
Will
https://fixes.arm64.dev
https://next.arm64.dev
https://will.arm64.dev
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-06-18 10:41 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-06-17 21:58 [PATCH v3] arm64: mm: reserve hugetlb CMA after numa_init Barry Song
2020-06-18 10:40 ` Will Deacon
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).