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

sh: add support for folded p4d page tables 



Implement primitives necessary for the 4th level folding, add walks of p4d
level where appropriate and remove usage of __ARCH_USE_5LEVEL_HACK.

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: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Brian Cain <bcain@codeaurora.org>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Christophe Leroy <christophe.leroy@c-s.fr>
Cc: Fenghua Yu <fenghua.yu@intel.com>
Cc: Geert Uytterhoeven <geert+renesas@glider.be>
Cc: Guan Xuetao <gxt@pku.edu.cn>
Cc: James Morse <james.morse@arm.com>
Cc: Jonas Bonn <jonas@southpole.se>
Cc: Julien Thierry <julien.thierry.kdev@gmail.com>
Cc: Ley Foon Tan <ley.foon.tan@intel.com>
Cc: Marc Zyngier <maz@kernel.org>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Rich Felker <dalias@libc.org>
Cc: Russell King <linux@armlinux.org.uk>
Cc: Stafford Horne <shorne@gmail.com>
Cc: Stefan Kristiansson <stefan.kristiansson@saunalahti.fi>
Cc: Suzuki K Poulose <suzuki.poulose@arm.com>
Cc: Tony Luck <tony.luck@intel.com>
Cc: Will Deacon <will@kernel.org>
Cc: Yoshinori Sato <ysato@users.sourceforge.jp>
Link: http://lkml.kernel.org/r/20200414153455.21744-12-rppt@kernel.org


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

arch/sh/include/asm/pgtable-2level.h

+0 −1
Original line number Diff line number Diff line
@@ -2,7 +2,6 @@ 
#ifndef __ASM_SH_PGTABLE_2LEVEL_H

#define __ASM_SH_PGTABLE_2LEVEL_H



#define __ARCH_USE_5LEVEL_HACK

#include <asm-generic/pgtable-nopmd.h>



/*

arch/sh/include/asm/pgtable-3level.h

+0 −1
Original line number Diff line number Diff line
@@ -2,7 +2,6 @@ 
#ifndef __ASM_SH_PGTABLE_3LEVEL_H

#define __ASM_SH_PGTABLE_3LEVEL_H



#define __ARCH_USE_5LEVEL_HACK

#include <asm-generic/pgtable-nopud.h>



/*

arch/sh/kernel/io_trapped.c

+6 −1
Original line number Diff line number Diff line
@@ -136,6 +136,7 @@ EXPORT_SYMBOL_GPL(match_trapped_io_handler); 
static struct trapped_io *lookup_tiop(unsigned long address)

{

	pgd_t *pgd_k;

	p4d_t *p4d_k;

	pud_t *pud_k;

	pmd_t *pmd_k;

	pte_t *pte_k;
@@ -145,7 +146,11 @@ static struct trapped_io *lookup_tiop(unsigned long address) 
	if (!pgd_present(*pgd_k))

		return NULL;



	pud_k = pud_offset(pgd_k, address);

	p4d_k = p4d_offset(pgd_k, address);

	if (!p4d_present(*p4d_k))

		return NULL;



	pud_k = pud_offset(p4d_k, address);

	if (!pud_present(*pud_k))

		return NULL;

arch/sh/mm/cache-sh4.c

+3 −1
Original line number Diff line number Diff line
@@ -209,6 +209,7 @@ static void sh4_flush_cache_page(void *args) 
	unsigned long address, pfn, phys;

	int map_coherent = 0;

	pgd_t *pgd;

	p4d_t *p4d;

	pud_t *pud;

	pmd_t *pmd;

	pte_t *pte;
@@ -224,7 +225,8 @@ static void sh4_flush_cache_page(void *args) 
		return;



	pgd = pgd_offset(vma->vm_mm, address);

	pud = pud_offset(pgd, address);

	p4d = p4d_offset(pgd, address);

	pud = pud_offset(p4d, address);

	pmd = pmd_offset(pud, address);

	pte = pte_offset_kernel(pmd, address);

arch/sh/mm/cache-sh5.c

+6 −1
Original line number Diff line number Diff line
@@ -383,6 +383,7 @@ static void sh64_dcache_purge_user_pages(struct mm_struct *mm, 
				unsigned long addr, unsigned long end)

{

	pgd_t *pgd;

	p4d_t *p4d;

	pud_t *pud;

	pmd_t *pmd;

	pte_t *pte;
@@ -397,7 +398,11 @@ static void sh64_dcache_purge_user_pages(struct mm_struct *mm, 
	if (pgd_bad(*pgd))

		return;



	pud = pud_offset(pgd, addr);

	p4d = p4d_offset(pgd, addr);

	if (p4d_none(*p4d) || p4d_bad(*p4d))

		return;



	pud = pud_offset(p4d, addr);

	if (pud_none(*pud) || pud_bad(*pud))

		return;

CRA Git | Maintained and supported by SUSTech CRA and CCSE