Commit e05c7b1f authored by Mike Rapoport's avatar Mike Rapoport Committed by Linus Torvalds
Browse files

mm: pgtable: add shortcuts for accessing kernel PMD and PTE 

The powerpc 32-bit implementation of pgtable has nice shortcuts for
accessing kernel PMD and PTE for a given virtual address.  Make these
helpers available for all architectures.

[rppt@linux.ibm.com: microblaze: fix page table traversal in setup_rt_frame()]
  Link: http://lkml.kernel.org/r/20200518191511.GD1118872@kernel.org


[akpm@linux-foundation.org: s/pmd_ptr_k/pmd_off_k/ in various powerpc places]

Signed-off-by: default avatarMike Rapoport <rppt@linux.ibm.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Brian Cain <bcain@codeaurora.org>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Chris Zankel <chris@zankel.net>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Greentime Hu <green.hu@gmail.com>
Cc: Greg Ungerer <gerg@linux-m68k.org>
Cc: Guan Xuetao <gxt@pku.edu.cn>
Cc: Guo Ren <guoren@kernel.org>
Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
Cc: Helge Deller <deller@gmx.de>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Ley Foon Tan <ley.foon.tan@intel.com>
Cc: Mark Salter <msalter@redhat.com>
Cc: Matthew Wilcox <willy@infradead.org>
Cc: Matt Turner <mattst88@gmail.com>
Cc: Max Filippov <jcmvbkbc@gmail.com>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: Michal Simek <monstr@monstr.eu>
Cc: Nick Hu <nickhu@andestech.com>
Cc: Paul Walmsley <paul.walmsley@sifive.com>
Cc: Richard Weinberger <richard@nod.at>
Cc: Rich Felker <dalias@libc.org>
Cc: Russell King <linux@armlinux.org.uk>
Cc: Stafford Horne <shorne@gmail.com>
Cc: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Tony Luck <tony.luck@intel.com>
Cc: Vincent Chen <deanbo422@gmail.com>
Cc: Vineet Gupta <vgupta@synopsys.com>
Cc: Will Deacon <will@kernel.org>
Cc: Yoshinori Sato <ysato@users.sourceforge.jp>
Link: http://lkml.kernel.org/r/20200514170327.31389-9-rppt@kernel.org


Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 88107d33

arch/arc/mm/highmem.c

+1 −9
Original line number Diff line number Diff line
@@ -92,17 +92,9 @@ EXPORT_SYMBOL(kunmap_atomic_high); 


static noinline pte_t * __init alloc_kmap_pgtable(unsigned long kvaddr)

{

	pgd_t *pgd_k;

	p4d_t *p4d_k;

	pud_t *pud_k;

	pmd_t *pmd_k;

	pmd_t *pmd_k = pmd_off_k(kvaddr);

	pte_t *pte_k;



	pgd_k = pgd_offset_k(kvaddr);

	p4d_k = p4d_offset(pgd_k, kvaddr);

	pud_k = pud_offset(p4d_k, kvaddr);

	pmd_k = pmd_offset(pud_k, kvaddr);



	pte_k = (pte_t *)memblock_alloc_low(PAGE_SIZE, PAGE_SIZE);

	if (!pte_k)

		panic("%s: Failed to allocate %lu bytes align=0x%lx\n",

arch/arm/mach-sa1100/assabet.c

+1 −1
Original line number Diff line number Diff line
@@ -632,7 +632,7 @@ static void __init map_sa1100_gpio_regs( void ) 
	int prot = PMD_TYPE_SECT | PMD_SECT_AP_WRITE | PMD_DOMAIN(DOMAIN_IO);

	pmd_t *pmd;



	pmd = pmd_offset(pud_offset(p4d_offset(pgd_offset_k(virt), virt), virt), virt);

	pmd = pmd_off_k(virt);

	*pmd = __pmd(phys | prot);

	flush_pmd_entry(pmd);

}

arch/arm/mm/highmem.c

+2 −2
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ 
static inline void set_fixmap_pte(int idx, pte_t pte)

{

	unsigned long vaddr = __fix_to_virt(idx);

	pte_t *ptep = pte_offset_kernel(pmd_off_k(vaddr), vaddr);

	pte_t *ptep = virt_to_kpte(vaddr);



	set_pte_ext(ptep, pte, 0);

	local_flush_tlb_kernel_page(vaddr);
@@ -26,7 +26,7 @@ static inline void set_fixmap_pte(int idx, pte_t pte) 


static inline pte_t get_fixmap_pte(unsigned long vaddr)

{

	pte_t *ptep = pte_offset_kernel(pmd_off_k(vaddr), vaddr);

	pte_t *ptep = virt_to_kpte(vaddr);



	return *ptep;

}

arch/arm/mm/ioremap.c

+4 −27
Original line number Diff line number Diff line
@@ -141,16 +141,8 @@ void __check_vmalloc_seq(struct mm_struct *mm) 
static void unmap_area_sections(unsigned long virt, unsigned long size)

{

	unsigned long addr = virt, end = virt + (size & ~(SZ_1M - 1));

	pgd_t *pgd;

	p4d_t *p4d;

	pud_t *pud;

	pmd_t *pmdp;



	flush_cache_vunmap(addr, end);

	pgd = pgd_offset_k(addr);

	p4d = p4d_offset(pgd, addr);

	pud = pud_offset(p4d, addr);

	pmdp = pmd_offset(pud, addr);

	pmd_t *pmdp = pmd_off_k(addr);



	do {

		pmd_t pmd = *pmdp;
@@ -191,10 +183,7 @@ remap_area_sections(unsigned long virt, unsigned long pfn, 
		    size_t size, const struct mem_type *type)

{

	unsigned long addr = virt, end = virt + size;

	pgd_t *pgd;

	p4d_t *p4d;

	pud_t *pud;

	pmd_t *pmd;

	pmd_t *pmd = pmd_off_k(addr);



	/*

	 * Remove and free any PTE-based mapping, and
@@ -202,10 +191,6 @@ remap_area_sections(unsigned long virt, unsigned long pfn, 
	 */

	unmap_area_sections(virt, size);



	pgd = pgd_offset_k(addr);

	p4d = p4d_offset(pgd, addr);

	pud = pud_offset(p4d, addr);

	pmd = pmd_offset(pud, addr);

	do {

		pmd[0] = __pmd(__pfn_to_phys(pfn) | type->prot_sect);

		pfn += SZ_1M >> PAGE_SHIFT;
@@ -225,21 +210,13 @@ remap_area_supersections(unsigned long virt, unsigned long pfn, 
			 size_t size, const struct mem_type *type)

{

	unsigned long addr = virt, end = virt + size;

	pgd_t *pgd;

	p4d_t *p4d;

	pud_t *pud;

	pmd_t *pmd;

	pmd_t *pmd = pmd_off_k(addr);



	/*

	 * Remove and free any PTE-based mapping, and

	 * sync the current kernel mapping.

	 */

	unmap_area_sections(virt, size);



	pgd = pgd_offset_k(virt);

	p4d = p4d_offset(pgd, addr);

	pud = pud_offset(p4d, addr);

	pmd = pmd_offset(pud, addr);

	do {

		unsigned long super_pmd_val, i;

arch/arm/mm/mm.h

+0 −5
Original line number Diff line number Diff line
@@ -35,11 +35,6 @@ static inline pte_t get_top_pte(unsigned long va) 
	return *ptep;

}



static inline pmd_t *pmd_off_k(unsigned long virt)

{

	return pmd_offset(pud_offset(p4d_offset(pgd_offset_k(virt), virt), virt), virt);

}



struct mem_type {

	pteval_t prot_pte;

	pteval_t prot_pte_s2;

CRA Git | Maintained and supported by SUSTech CRA and CCSE