Skip to content

Commit 510fbd8

Browse files
mrutland-armAlex Shi
authored andcommitted
arm64: mm: add functions to walk tables in fixmap
As a preparatory step to allow us to allocate early page tables from unmapped memory using memblock_alloc, add new p??_{set,clear}_fixmap* functions which can be used to walk page tables outside of the linear mapping by using fixmap slots. Signed-off-by: Mark Rutland <mark.rutland@arm.com> Reviewed-by: Catalin Marinas <catalin.marinas@arm.com> Tested-by: Ard Biesheuvel <ard.biesheuvel@linaro.org> Reviewed-by: Ard Biesheuvel <ard.biesheuvel@linaro.org> Tested-by: Jeremy Linton <jeremy.linton@arm.com> Cc: Laura Abbott <labbott@fedoraproject.org> Cc: Will Deacon <will.deacon@arm.com> Signed-off-by: Catalin Marinas <catalin.marinas@arm.com> (cherry picked from commit 961faac114819a01e627fe9c9c82b830bb3849d4) Signed-off-by: Alex Shi <alex.shi@linaro.org>
1 parent cae5875 commit 510fbd8

2 files changed

Lines changed: 36 additions & 0 deletions

File tree

arch/arm64/include/asm/fixmap.h

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,16 @@ enum fixed_addresses {
6262

6363
FIX_BTMAP_END = __end_of_permanent_fixed_addresses,
6464
FIX_BTMAP_BEGIN = FIX_BTMAP_END + TOTAL_FIX_BTMAPS - 1,
65+
66+
/*
67+
* Used for kernel page table creation, so unmapped memory may be used
68+
* for tables.
69+
*/
70+
FIX_PTE,
71+
FIX_PMD,
72+
FIX_PUD,
73+
FIX_PGD,
74+
6575
__end_of_fixed_addresses
6676
};
6777

arch/arm64/include/asm/pgtable.h

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@
5959

6060
#ifndef __ASSEMBLY__
6161

62+
#include <asm/fixmap.h>
6263
#include <linux/mmdebug.h>
6364

6465
extern void __pte_error(const char *file, int line, unsigned long val);
@@ -431,6 +432,10 @@ static inline phys_addr_t pmd_page_paddr(pmd_t pmd)
431432
#define pte_unmap(pte) do { } while (0)
432433
#define pte_unmap_nested(pte) do { } while (0)
433434

435+
#define pte_set_fixmap(addr) ((pte_t *)set_fixmap_offset(FIX_PTE, addr))
436+
#define pte_set_fixmap_offset(pmd, addr) pte_set_fixmap(pte_offset_phys(pmd, addr))
437+
#define pte_clear_fixmap() clear_fixmap(FIX_PTE)
438+
434439
#define pmd_page(pmd) pfn_to_page(__phys_to_pfn(pmd_val(pmd) & PHYS_MASK))
435440

436441
/*
@@ -470,12 +475,21 @@ static inline phys_addr_t pud_page_paddr(pud_t pud)
470475
#define pmd_offset_phys(dir, addr) (pud_page_paddr(*(dir)) + pmd_index(addr) * sizeof(pmd_t))
471476
#define pmd_offset(dir, addr) ((pmd_t *)__va(pmd_offset_phys((dir), (addr))))
472477

478+
#define pmd_set_fixmap(addr) ((pmd_t *)set_fixmap_offset(FIX_PMD, addr))
479+
#define pmd_set_fixmap_offset(pud, addr) pmd_set_fixmap(pmd_offset_phys(pud, addr))
480+
#define pmd_clear_fixmap() clear_fixmap(FIX_PMD)
481+
473482
#define pud_page(pud) pfn_to_page(__phys_to_pfn(pud_val(pud) & PHYS_MASK))
474483

475484
#else
476485

477486
#define pud_page_paddr(pud) ({ BUILD_BUG(); 0; })
478487

488+
/* Match pmd_offset folding in <asm/generic/pgtable-nopmd.h> */
489+
#define pmd_set_fixmap(addr) NULL
490+
#define pmd_set_fixmap_offset(pudp, addr) ((pmd_t *)pudp)
491+
#define pmd_clear_fixmap()
492+
479493
#endif /* CONFIG_PGTABLE_LEVELS > 2 */
480494

481495
#if CONFIG_PGTABLE_LEVELS > 3
@@ -508,12 +522,21 @@ static inline phys_addr_t pgd_page_paddr(pgd_t pgd)
508522
#define pud_offset_phys(dir, addr) (pgd_page_paddr(*(dir)) + pud_index(addr) * sizeof(pud_t))
509523
#define pud_offset(dir, addr) ((pud_t *)__va(pud_offset_phys((dir), (addr))))
510524

525+
#define pud_set_fixmap(addr) ((pud_t *)set_fixmap_offset(FIX_PUD, addr))
526+
#define pud_set_fixmap_offset(pgd, addr) pud_set_fixmap(pud_offset_phys(pgd, addr))
527+
#define pud_clear_fixmap() clear_fixmap(FIX_PUD)
528+
511529
#define pgd_page(pgd) pfn_to_page(__phys_to_pfn(pgd_val(pgd) & PHYS_MASK))
512530

513531
#else
514532

515533
#define pgd_page_paddr(pgd) ({ BUILD_BUG(); 0;})
516534

535+
/* Match pud_offset folding in <asm/generic/pgtable-nopud.h> */
536+
#define pud_set_fixmap(addr) NULL
537+
#define pud_set_fixmap_offset(pgdp, addr) ((pud_t *)pgdp)
538+
#define pud_clear_fixmap()
539+
517540
#endif /* CONFIG_PGTABLE_LEVELS > 3 */
518541

519542
#define pgd_ERROR(pgd) __pgd_error(__FILE__, __LINE__, pgd_val(pgd))
@@ -528,6 +551,9 @@ static inline phys_addr_t pgd_page_paddr(pgd_t pgd)
528551
/* to find an entry in a kernel page-table-directory */
529552
#define pgd_offset_k(addr) pgd_offset(&init_mm, addr)
530553

554+
#define pgd_set_fixmap(addr) ((pgd_t *)set_fixmap_offset(FIX_PGD, addr))
555+
#define pgd_clear_fixmap() clear_fixmap(FIX_PGD)
556+
531557
static inline pte_t pte_modify(pte_t pte, pgprot_t newprot)
532558
{
533559
const pteval_t mask = PTE_USER | PTE_PXN | PTE_UXN | PTE_RDONLY |

0 commit comments

Comments
 (0)