Skip to content

Commit 3e509c9

Browse files
xzpeterakpm00
authored andcommitted
mm/arm64: support large pfn mappings
Support huge pfnmaps by using bit 56 (PTE_SPECIAL) for "special" on pmds/puds. Provide the pmd/pud helpers to set/get special bit. There's one more thing missing for arm64 which is the pxx_pgprot() for pmd/pud. Add them too, which is mostly the same as the pte version by dropping the pfn field. These helpers are essential to be used in the new follow_pfnmap*() API to report valid pgprot_t results. Note that arm64 doesn't yet support huge PUD yet, but it's still straightforward to provide the pud helpers that we need altogether. Only PMD helpers will make an immediate benefit until arm64 will support huge PUDs first in general (e.g. in THPs). Link: https://lkml.kernel.org/r/[email protected] Signed-off-by: Peter Xu <[email protected]> Cc: Catalin Marinas <[email protected]> Cc: Will Deacon <[email protected]> Cc: Alexander Gordeev <[email protected]> Cc: Alex Williamson <[email protected]> Cc: Aneesh Kumar K.V <[email protected]> Cc: Borislav Petkov <[email protected]> Cc: Christian Borntraeger <[email protected]> Cc: Dave Hansen <[email protected]> Cc: David Hildenbrand <[email protected]> Cc: Gavin Shan <[email protected]> Cc: Gerald Schaefer <[email protected]> Cc: Heiko Carstens <[email protected]> Cc: Ingo Molnar <[email protected]> Cc: Jason Gunthorpe <[email protected]> Cc: Matthew Wilcox <[email protected]> Cc: Niklas Schnelle <[email protected]> Cc: Paolo Bonzini <[email protected]> Cc: Ryan Roberts <[email protected]> Cc: Sean Christopherson <[email protected]> Cc: Sven Schnelle <[email protected]> Cc: Thomas Gleixner <[email protected]> Cc: Vasily Gorbik <[email protected]> Cc: Zi Yan <[email protected]> Signed-off-by: Andrew Morton <[email protected]>
1 parent 7518202 commit 3e509c9

File tree

2 files changed

+30
-0
lines changed

2 files changed

+30
-0
lines changed

arch/arm64/Kconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,7 @@ config ARM64
9999
select ARCH_SUPPORTS_NUMA_BALANCING
100100
select ARCH_SUPPORTS_PAGE_TABLE_CHECK
101101
select ARCH_SUPPORTS_PER_VMA_LOCK
102+
select ARCH_SUPPORTS_HUGE_PFNMAP if TRANSPARENT_HUGEPAGE
102103
select ARCH_WANT_BATCHED_UNMAP_TLB_FLUSH
103104
select ARCH_WANT_COMPAT_IPC_PARSE_VERSION if COMPAT
104105
select ARCH_WANT_DEFAULT_BPF_JIT

arch/arm64/include/asm/pgtable.h

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -578,6 +578,14 @@ static inline pmd_t pmd_mkdevmap(pmd_t pmd)
578578
return pte_pmd(set_pte_bit(pmd_pte(pmd), __pgprot(PTE_DEVMAP)));
579579
}
580580

581+
#ifdef CONFIG_ARCH_SUPPORTS_PMD_PFNMAP
582+
#define pmd_special(pte) (!!((pmd_val(pte) & PTE_SPECIAL)))
583+
static inline pmd_t pmd_mkspecial(pmd_t pmd)
584+
{
585+
return set_pmd_bit(pmd, __pgprot(PTE_SPECIAL));
586+
}
587+
#endif
588+
581589
#define __pmd_to_phys(pmd) __pte_to_phys(pmd_pte(pmd))
582590
#define __phys_to_pmd_val(phys) __phys_to_pte_val(phys)
583591
#define pmd_pfn(pmd) ((__pmd_to_phys(pmd) & PMD_MASK) >> PAGE_SHIFT)
@@ -595,6 +603,27 @@ static inline pmd_t pmd_mkdevmap(pmd_t pmd)
595603
#define pud_pfn(pud) ((__pud_to_phys(pud) & PUD_MASK) >> PAGE_SHIFT)
596604
#define pfn_pud(pfn,prot) __pud(__phys_to_pud_val((phys_addr_t)(pfn) << PAGE_SHIFT) | pgprot_val(prot))
597605

606+
#ifdef CONFIG_ARCH_SUPPORTS_PUD_PFNMAP
607+
#define pud_special(pte) pte_special(pud_pte(pud))
608+
#define pud_mkspecial(pte) pte_pud(pte_mkspecial(pud_pte(pud)))
609+
#endif
610+
611+
#define pmd_pgprot pmd_pgprot
612+
static inline pgprot_t pmd_pgprot(pmd_t pmd)
613+
{
614+
unsigned long pfn = pmd_pfn(pmd);
615+
616+
return __pgprot(pmd_val(pfn_pmd(pfn, __pgprot(0))) ^ pmd_val(pmd));
617+
}
618+
619+
#define pud_pgprot pud_pgprot
620+
static inline pgprot_t pud_pgprot(pud_t pud)
621+
{
622+
unsigned long pfn = pud_pfn(pud);
623+
624+
return __pgprot(pud_val(pfn_pud(pfn, __pgprot(0))) ^ pud_val(pud));
625+
}
626+
598627
static inline void __set_pte_at(struct mm_struct *mm,
599628
unsigned long __always_unused addr,
600629
pte_t *ptep, pte_t pte, unsigned int nr)

0 commit comments

Comments
 (0)