diff options
| author | Mike Rapoport <rppt@linux.ibm.com> | 2020-06-04 16:46:39 -0700 | 
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-06-04 19:06:21 -0700 | 
| commit | b187fb7fca9cc420d111b2e058b69fae5eea18bc (patch) | |
| tree | a4660a9abb13621b640406700acf302103316a06 /arch/openrisc/mm/fault.c | |
| parent | 9f4e70379f609d3bcc9d67eafecda75a495ffb4b (diff) | |
openrisc: 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: Mike Rapoport <rppt@linux.ibm.com>
Signed-off-by: Andrew 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-8-rppt@kernel.org
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/openrisc/mm/fault.c')
| -rw-r--r-- | arch/openrisc/mm/fault.c | 10 | 
1 files changed, 8 insertions, 2 deletions
diff --git a/arch/openrisc/mm/fault.c b/arch/openrisc/mm/fault.c index 8af1cc78c4fb..6e0a11ac4c00 100644 --- a/arch/openrisc/mm/fault.c +++ b/arch/openrisc/mm/fault.c @@ -295,6 +295,7 @@ vmalloc_fault:  		int offset = pgd_index(address);  		pgd_t *pgd, *pgd_k; +		p4d_t *p4d, *p4d_k;  		pud_t *pud, *pud_k;  		pmd_t *pmd, *pmd_k;  		pte_t *pte_k; @@ -321,8 +322,13 @@ vmalloc_fault:  		 * it exists.  		 */ -		pud = pud_offset(pgd, address); -		pud_k = pud_offset(pgd_k, address); +		p4d = p4d_offset(pgd, address); +		p4d_k = p4d_offset(pgd_k, address); +		if (!p4d_present(*p4d_k)) +			goto no_context; + +		pud = pud_offset(p4d, address); +		pud_k = pud_offset(p4d_k, address);  		if (!pud_present(*pud_k))  			goto no_context;  | 
