* [PATCH] arm64: mm: handle ARM64_KERNEL_USES_PMD_MAPS in vmemmap_populate()
@ 2022-09-20 1:49 Kefeng Wang
2022-09-22 20:01 ` Catalin Marinas
2022-09-23 11:48 ` Anshuman Khandual
0 siblings, 2 replies; 3+ messages in thread
From: Kefeng Wang @ 2022-09-20 1:49 UTC (permalink / raw)
To: Catalin Marinas, Will Deacon, linux-arm-kernel; +Cc: linux-kernel, Kefeng Wang
Directly check ARM64_SWAPPER_USES_SECTION_MAPS to choose base page
or PMD level huge page mapping in vmemmap_populate() to simplify
code a bit.
Signed-off-by: Kefeng Wang <wangkefeng.wang@huawei.com>
---
arch/arm64/mm/mmu.c | 13 ++++---------
1 file changed, 4 insertions(+), 9 deletions(-)
diff --git a/arch/arm64/mm/mmu.c b/arch/arm64/mm/mmu.c
index 5810eddfb48e..784afa9c60ac 100644
--- a/arch/arm64/mm/mmu.c
+++ b/arch/arm64/mm/mmu.c
@@ -1180,14 +1180,6 @@ static void free_empty_tables(unsigned long addr, unsigned long end,
}
#endif
-#if !ARM64_KERNEL_USES_PMD_MAPS
-int __meminit vmemmap_populate(unsigned long start, unsigned long end, int node,
- struct vmem_altmap *altmap)
-{
- WARN_ON((start < VMEMMAP_START) || (end > VMEMMAP_END));
- return vmemmap_populate_basepages(start, end, node, altmap);
-}
-#else /* !ARM64_KERNEL_USES_PMD_MAPS */
int __meminit vmemmap_populate(unsigned long start, unsigned long end, int node,
struct vmem_altmap *altmap)
{
@@ -1199,6 +1191,10 @@ int __meminit vmemmap_populate(unsigned long start, unsigned long end, int node,
pmd_t *pmdp;
WARN_ON((start < VMEMMAP_START) || (end > VMEMMAP_END));
+
+ if (!ARM64_KERNEL_USES_PMD_MAPS)
+ return vmemmap_populate_basepages(start, end, node, altmap);
+
do {
next = pmd_addr_end(addr, end);
@@ -1232,7 +1228,6 @@ int __meminit vmemmap_populate(unsigned long start, unsigned long end, int node,
return 0;
}
-#endif /* !ARM64_KERNEL_USES_PMD_MAPS */
#ifdef CONFIG_MEMORY_HOTPLUG
void vmemmap_free(unsigned long start, unsigned long end,
--
2.35.3
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] arm64: mm: handle ARM64_KERNEL_USES_PMD_MAPS in vmemmap_populate()
2022-09-20 1:49 [PATCH] arm64: mm: handle ARM64_KERNEL_USES_PMD_MAPS in vmemmap_populate() Kefeng Wang
@ 2022-09-22 20:01 ` Catalin Marinas
2022-09-23 11:48 ` Anshuman Khandual
1 sibling, 0 replies; 3+ messages in thread
From: Catalin Marinas @ 2022-09-22 20:01 UTC (permalink / raw)
To: Will Deacon, linux-arm-kernel, Kefeng Wang; +Cc: linux-kernel
On Tue, 20 Sep 2022 09:49:51 +0800, Kefeng Wang wrote:
> Directly check ARM64_SWAPPER_USES_SECTION_MAPS to choose base page
> or PMD level huge page mapping in vmemmap_populate() to simplify
> code a bit.
>
>
Applied to arm64 (for-next/misc), thanks!
[1/1] arm64: mm: handle ARM64_KERNEL_USES_PMD_MAPS in vmemmap_populate()
https://git.kernel.org/arm64/c/739e49e0fc80
--
Catalin
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] arm64: mm: handle ARM64_KERNEL_USES_PMD_MAPS in vmemmap_populate()
2022-09-20 1:49 [PATCH] arm64: mm: handle ARM64_KERNEL_USES_PMD_MAPS in vmemmap_populate() Kefeng Wang
2022-09-22 20:01 ` Catalin Marinas
@ 2022-09-23 11:48 ` Anshuman Khandual
1 sibling, 0 replies; 3+ messages in thread
From: Anshuman Khandual @ 2022-09-23 11:48 UTC (permalink / raw)
To: Kefeng Wang, Catalin Marinas, Will Deacon, linux-arm-kernel; +Cc: linux-kernel
On 9/20/22 07:19, Kefeng Wang wrote:
> Directly check ARM64_SWAPPER_USES_SECTION_MAPS to choose base page
> or PMD level huge page mapping in vmemmap_populate() to simplify
> code a bit.
>
> Signed-off-by: Kefeng Wang <wangkefeng.wang@huawei.com>
Reviewed-by: Anshuman Khandual <anshuman.khandual@arm.com>
> ---
> arch/arm64/mm/mmu.c | 13 ++++---------
> 1 file changed, 4 insertions(+), 9 deletions(-)
>
> diff --git a/arch/arm64/mm/mmu.c b/arch/arm64/mm/mmu.c
> index 5810eddfb48e..784afa9c60ac 100644
> --- a/arch/arm64/mm/mmu.c
> +++ b/arch/arm64/mm/mmu.c
> @@ -1180,14 +1180,6 @@ static void free_empty_tables(unsigned long addr, unsigned long end,
> }
> #endif
>
> -#if !ARM64_KERNEL_USES_PMD_MAPS
> -int __meminit vmemmap_populate(unsigned long start, unsigned long end, int node,
> - struct vmem_altmap *altmap)
> -{
> - WARN_ON((start < VMEMMAP_START) || (end > VMEMMAP_END));
> - return vmemmap_populate_basepages(start, end, node, altmap);
> -}
> -#else /* !ARM64_KERNEL_USES_PMD_MAPS */
> int __meminit vmemmap_populate(unsigned long start, unsigned long end, int node,
> struct vmem_altmap *altmap)
> {
> @@ -1199,6 +1191,10 @@ int __meminit vmemmap_populate(unsigned long start, unsigned long end, int node,
> pmd_t *pmdp;
>
> WARN_ON((start < VMEMMAP_START) || (end > VMEMMAP_END));
> +
> + if (!ARM64_KERNEL_USES_PMD_MAPS)
> + return vmemmap_populate_basepages(start, end, node, altmap);
> +
> do {
> next = pmd_addr_end(addr, end);
>
> @@ -1232,7 +1228,6 @@ int __meminit vmemmap_populate(unsigned long start, unsigned long end, int node,
>
> return 0;
> }
> -#endif /* !ARM64_KERNEL_USES_PMD_MAPS */
>
> #ifdef CONFIG_MEMORY_HOTPLUG
> void vmemmap_free(unsigned long start, unsigned long end,
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-09-23 11:50 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-09-20 1:49 [PATCH] arm64: mm: handle ARM64_KERNEL_USES_PMD_MAPS in vmemmap_populate() Kefeng Wang
2022-09-22 20:01 ` Catalin Marinas
2022-09-23 11:48 ` Anshuman Khandual
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).