From: Matthias Brugger <matthias.bgg@gmail.com>
To: Barry Song <song.bao.hua@hisilicon.com>,
catalin.marinas@arm.com, will@kernel.org, nsaenzjulienne@suse.de,
steve.capper@arm.com, rppt@linux.ibm.com,
akpm@linux-foundation.org
Cc: Roman Gushchin <guro@fb.com>,
linux-kernel@vger.kernel.org,
linux-arm-kernel@lists.infradead.org, linuxarm@huawei.com
Subject: Re: [PATCH v2] arm64: mm: reserve hugetlb CMA after numa_init
Date: Wed, 17 Jun 2020 11:38:34 +0200 [thread overview]
Message-ID: <f76034e6-3a8d-55ef-dc3d-ad1b168c7c1a@gmail.com> (raw)
In-Reply-To: <20200616221924.74780-1-song.bao.hua@hisilicon.com>
On 17/06/2020 00:19, 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.
>
> Fixes: cf11e85fc08c ("mm: hugetlb: optionally allocate gigantic hugepages using cma")
> Cc: Matthias Brugger <matthias.bgg@gmail.com>
> Acked-by: Roman Gushchin <guro@fb.com>
> Signed-off-by: Barry Song <song.bao.hua@hisilicon.com>
Reviewed-by: Matthias Brugger <matthias.bgg@gmail.com>
> ---
> -v2: add Fixes tag according to Matthias Brugger's comment
>
> arch/arm64/mm/init.c | 10 +++++-----
> 1 file changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/arch/arm64/mm/init.c b/arch/arm64/mm/init.c
> index e631e6425165..41914b483d54 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,11 @@ void __init bootmem_init(void)
> min_low_pfn = min;
>
> arm64_numa_init();
> +
> +#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.
>
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2020-06-17 9:38 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-16 22:19 [PATCH v2] arm64: mm: reserve hugetlb CMA after numa_init Barry Song
2020-06-17 4:12 ` Anshuman Khandual
2020-06-17 9:38 ` Matthias Brugger [this message]
2020-06-17 10:18 ` Will Deacon
2020-06-17 11:38 ` Song Bao Hua (Barry Song)
2020-06-17 18:20 ` Roman Gushchin
2020-06-17 21:43 ` Song Bao Hua (Barry Song)
2020-06-18 7:19 ` Will Deacon
2020-06-18 7:43 ` Song Bao Hua (Barry Song)
2020-06-18 7:44 ` Will Deacon
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=f76034e6-3a8d-55ef-dc3d-ad1b168c7c1a@gmail.com \
--to=matthias.bgg@gmail.com \
--cc=akpm@linux-foundation.org \
--cc=catalin.marinas@arm.com \
--cc=guro@fb.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linuxarm@huawei.com \
--cc=nsaenzjulienne@suse.de \
--cc=rppt@linux.ibm.com \
--cc=song.bao.hua@hisilicon.com \
--cc=steve.capper@arm.com \
--cc=will@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).