From: Matthias Brugger <matthias.bgg@gmail.com>
To: Roman Gushchin <guro@fb.com>, Barry Song <song.bao.hua@hisilicon.com>
Cc: catalin.marinas@arm.com, john.garry@huawei.com,
linux-kernel@vger.kernel.org, linuxarm@huawei.com,
iommu@lists.linux-foundation.org, prime.zeng@hisilicon.com,
Jonathan.Cameron@huawei.com, robin.murphy@arm.com, hch@lst.de,
linux-arm-kernel@lists.infradead.org, m.szyprowski@samsung.com
Subject: Re: [PATCH 2/3] arm64: mm: reserve hugetlb CMA after numa_init
Date: Sun, 7 Jun 2020 22:14:36 +0200 [thread overview]
Message-ID: <bad059a3-c564-30a1-198f-1c92de601aed@gmail.com> (raw)
In-Reply-To: <20200603032219.GA548147@carbon.lan>
On 03/06/2020 05:22, Roman Gushchin wrote:
> On Wed, Jun 03, 2020 at 02:42:30PM +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.
>>
>> Cc: Roman Gushchin <guro@fb.com>
>> Signed-off-by: Barry Song <song.bao.hua@hisilicon.com>
>
> Acked-by: Roman Gushchin <guro@fb.com>
>
When did this break or was it broken since the beginning?
In any case, could you provide a "Fixes" tag for it, so that it can easily be
backported to older releases.
Regards,
Matthias
> Thanks!
>
>> ---
>> 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 e42727e3568e..8f0e70ebb49d 100644
>> --- a/arch/arm64/mm/init.c
>> +++ b/arch/arm64/mm/init.c
>> @@ -458,11 +458,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)
>> @@ -478,6 +473,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.
>> --
>> 2.23.0
>>
>>
>
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
>
_______________________________________________
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-07 20:14 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-03 2:42 [PATCH 0/3] support per-numa CMA for ARM server Barry Song
2020-06-03 2:42 ` [PATCH 1/3] dma-direct: provide the ability to reserve per-numa CMA Barry Song
2020-06-03 6:55 ` kbuild test robot
2020-06-03 7:18 ` kbuild test robot
2020-06-03 7:18 ` [RFC PATCH] dma-direct: dma_contiguous_pernuma_area[] can be static kbuild test robot
2020-06-04 11:36 ` [PATCH 1/3] dma-direct: provide the ability to reserve per-numa CMA Dan Carpenter
2020-06-05 6:04 ` Song Bao Hua (Barry Song)
2020-06-05 8:57 ` Dan Carpenter
2020-06-06 3:46 ` [kbuild-all] " Philip Li
2020-06-06 10:15 ` Song Bao Hua (Barry Song)
2020-06-05 13:57 ` kernel test robot
2020-06-03 2:42 ` [PATCH 2/3] arm64: mm: reserve hugetlb CMA after numa_init Barry Song
2020-06-03 3:22 ` Roman Gushchin
2020-06-07 20:14 ` Matthias Brugger [this message]
2020-06-08 0:50 ` Song Bao Hua (Barry Song)
2020-06-09 15:33 ` Matthias Brugger
2020-06-03 2:42 ` [PATCH 3/3] arm64: mm: reserve per-numa " Barry Song
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=bad059a3-c564-30a1-198f-1c92de601aed@gmail.com \
--to=matthias.bgg@gmail.com \
--cc=Jonathan.Cameron@huawei.com \
--cc=catalin.marinas@arm.com \
--cc=guro@fb.com \
--cc=hch@lst.de \
--cc=iommu@lists.linux-foundation.org \
--cc=john.garry@huawei.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linuxarm@huawei.com \
--cc=m.szyprowski@samsung.com \
--cc=prime.zeng@hisilicon.com \
--cc=robin.murphy@arm.com \
--cc=song.bao.hua@hisilicon.com \
/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).