[tip:x86/mm] x86/mm: Convert trivial cases of page table walk to 5-level paging

[tip-bot for Kirill A. Shutemov]

Commit-ID:  e0c4f6750e130541cca7390739d25feb522acfff
Gitweb: http://git.kernel.org/tip/e0c4f6750e130541cca7390739d25feb522acfff
Author: Kirill A. Shutemov 
AuthorDate: Mon, 13 Mar 2017 17:33:05 +0300
Committer:  Ingo Molnar 
CommitDate: Tue, 14 Mar 2017 08:45:08 +0100

x86/mm: Convert trivial cases of page table walk to 5-level paging

This patch only covers simple cases. Less trivial cases will be
converted with separate patches.

Signed-off-by: Kirill A. Shutemov 
Cc: Andrew Morton 
Cc: Andy Lutomirski 
Cc: Arnd Bergmann 
Cc: Borislav Petkov 
Cc: Brian Gerst 
Cc: Dave Hansen 
Cc: Denys Vlasenko 
Cc: H. Peter Anvin 
Cc: Josh Poimboeuf 
Cc: Linus Torvalds 
Cc: Michal Hocko 
Cc: Peter Zijlstra 
Cc: Thomas Gleixner 
Cc: linux-a...@vger.kernel.org
Cc: linux...@kvack.org
Link: 
http://lkml.kernel.org/r/20170313143309.16020-3-kirill.shute...@linux.intel.com
Signed-off-by: Ingo Molnar 
---
 arch/x86/kernel/tboot.c|  6 +-
 arch/x86/kernel/vm86_32.c  |  6 +-
 arch/x86/mm/fault.c| 39 +--
 arch/x86/mm/init_32.c  | 22 --
 arch/x86/mm/ioremap.c  |  3 ++-
 arch/x86/mm/pgtable.c  |  4 +++-
 arch/x86/mm/pgtable_32.c   |  8 +++-
 arch/x86/platform/efi/efi_64.c | 13 +
 arch/x86/power/hibernate_32.c  |  7 +--
 9 files changed, 85 insertions(+), 23 deletions(-)

diff --git a/arch/x86/kernel/tboot.c b/arch/x86/kernel/tboot.c
index b868fa1..5db0f33 100644
--- a/arch/x86/kernel/tboot.c
+++ b/arch/x86/kernel/tboot.c
@@ -118,12 +118,16 @@ static int map_tboot_page(unsigned long vaddr, unsigned 
long pfn,
  pgprot_t prot)
 {
pgd_t *pgd;
+   p4d_t *p4d;
pud_t *pud;
pmd_t *pmd;
pte_t *pte;
 
pgd = pgd_offset(_mm, vaddr);
-   pud = pud_alloc(_mm, pgd, vaddr);
+   p4d = p4d_alloc(_mm, pgd, vaddr);
+   if (!p4d)
+   return -1;
+   pud = pud_alloc(_mm, p4d, vaddr);
if (!pud)
return -1;
pmd = pmd_alloc(_mm, pud, vaddr);
diff --git a/arch/x86/kernel/vm86_32.c b/arch/x86/kernel/vm86_32.c
index 23ee89c..62597c3 100644
--- a/arch/x86/kernel/vm86_32.c
+++ b/arch/x86/kernel/vm86_32.c
@@ -164,6 +164,7 @@ static void mark_screen_rdonly(struct mm_struct *mm)
struct vm_area_struct *vma;
spinlock_t *ptl;
pgd_t *pgd;
+   p4d_t *p4d;
pud_t *pud;
pmd_t *pmd;
pte_t *pte;
@@ -173,7 +174,10 @@ static void mark_screen_rdonly(struct mm_struct *mm)
pgd = pgd_offset(mm, 0xA);
if (pgd_none_or_clear_bad(pgd))
goto out;
-   pud = pud_offset(pgd, 0xA);
+   p4d = p4d_offset(pgd, 0xA);
+   if (p4d_none_or_clear_bad(p4d))
+   goto out;
+   pud = pud_offset(p4d, 0xA);
if (pud_none_or_clear_bad(pud))
goto out;
pmd = pmd_offset(pud, 0xA);
diff --git a/arch/x86/mm/fault.c b/arch/x86/mm/fault.c
index 428e3176..605fd5e 100644
--- a/arch/x86/mm/fault.c
+++ b/arch/x86/mm/fault.c
@@ -253,6 +253,7 @@ static inline pmd_t *vmalloc_sync_one(pgd_t *pgd, unsigned 
long address)
 {
unsigned index = pgd_index(address);
pgd_t *pgd_k;
+   p4d_t *p4d, *p4d_k;
pud_t *pud, *pud_k;
pmd_t *pmd, *pmd_k;
 
@@ -265,10 +266,15 @@ static inline pmd_t *vmalloc_sync_one(pgd_t *pgd, 
unsigned long address)
/*
 * set_pgd(pgd, *pgd_k); here would be useless on PAE
 * and redundant with the set_pmd() on non-PAE. As would
-* set_pud.
+* set_p4d/set_pud.
 */
-   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))
+   return NULL;
+
+   pud = pud_offset(p4d, address);
+   pud_k = pud_offset(p4d_k, address);
if (!pud_present(*pud_k))
return NULL;
 
@@ -384,6 +390,8 @@ static void dump_pagetable(unsigned long address)
 {
pgd_t *base = __va(read_cr3());
pgd_t *pgd = [pgd_index(address)];
+   p4d_t *p4d;
+   pud_t *pud;
pmd_t *pmd;
pte_t *pte;
 
@@ -392,7 +400,9 @@ static void dump_pagetable(unsigned long address)
if (!low_pfn(pgd_val(*pgd) >> PAGE_SHIFT) || !pgd_present(*pgd))
goto out;
 #endif
-   pmd = pmd_offset(pud_offset(pgd, address), address);
+   p4d = p4d_offset(pgd, address);
+   pud = pud_offset(p4d, address);
+   pmd = pmd_offset(pud, address);

[tip:x86/mm] x86/mm: Convert trivial cases of page table walk to 5-level paging

[tip-bot for Kirill A. Shutemov]

Commit-ID:  e0c4f6750e130541cca7390739d25feb522acfff
Gitweb: http://git.kernel.org/tip/e0c4f6750e130541cca7390739d25feb522acfff
Author: Kirill A. Shutemov 
AuthorDate: Mon, 13 Mar 2017 17:33:05 +0300
Committer:  Ingo Molnar 
CommitDate: Tue, 14 Mar 2017 08:45:08 +0100

x86/mm: Convert trivial cases of page table walk to 5-level paging

This patch only covers simple cases. Less trivial cases will be
converted with separate patches.

Signed-off-by: Kirill A. Shutemov 
Cc: Andrew Morton 
Cc: Andy Lutomirski 
Cc: Arnd Bergmann 
Cc: Borislav Petkov 
Cc: Brian Gerst 
Cc: Dave Hansen 
Cc: Denys Vlasenko 
Cc: H. Peter Anvin 
Cc: Josh Poimboeuf 
Cc: Linus Torvalds 
Cc: Michal Hocko 
Cc: Peter Zijlstra 
Cc: Thomas Gleixner 
Cc: linux-a...@vger.kernel.org
Cc: linux...@kvack.org
Link: 
http://lkml.kernel.org/r/20170313143309.16020-3-kirill.shute...@linux.intel.com
Signed-off-by: Ingo Molnar 
---
 arch/x86/kernel/tboot.c|  6 +-
 arch/x86/kernel/vm86_32.c  |  6 +-
 arch/x86/mm/fault.c| 39 +--
 arch/x86/mm/init_32.c  | 22 --
 arch/x86/mm/ioremap.c  |  3 ++-
 arch/x86/mm/pgtable.c  |  4 +++-
 arch/x86/mm/pgtable_32.c   |  8 +++-
 arch/x86/platform/efi/efi_64.c | 13 +
 arch/x86/power/hibernate_32.c  |  7 +--
 9 files changed, 85 insertions(+), 23 deletions(-)

diff --git a/arch/x86/kernel/tboot.c b/arch/x86/kernel/tboot.c
index b868fa1..5db0f33 100644
--- a/arch/x86/kernel/tboot.c
+++ b/arch/x86/kernel/tboot.c
@@ -118,12 +118,16 @@ static int map_tboot_page(unsigned long vaddr, unsigned 
long pfn,
  pgprot_t prot)
 {
pgd_t *pgd;
+   p4d_t *p4d;
pud_t *pud;
pmd_t *pmd;
pte_t *pte;
 
pgd = pgd_offset(_mm, vaddr);
-   pud = pud_alloc(_mm, pgd, vaddr);
+   p4d = p4d_alloc(_mm, pgd, vaddr);
+   if (!p4d)
+   return -1;
+   pud = pud_alloc(_mm, p4d, vaddr);
if (!pud)
return -1;
pmd = pmd_alloc(_mm, pud, vaddr);
diff --git a/arch/x86/kernel/vm86_32.c b/arch/x86/kernel/vm86_32.c
index 23ee89c..62597c3 100644
--- a/arch/x86/kernel/vm86_32.c
+++ b/arch/x86/kernel/vm86_32.c
@@ -164,6 +164,7 @@ static void mark_screen_rdonly(struct mm_struct *mm)
struct vm_area_struct *vma;
spinlock_t *ptl;
pgd_t *pgd;
+   p4d_t *p4d;
pud_t *pud;
pmd_t *pmd;
pte_t *pte;
@@ -173,7 +174,10 @@ static void mark_screen_rdonly(struct mm_struct *mm)
pgd = pgd_offset(mm, 0xA);
if (pgd_none_or_clear_bad(pgd))
goto out;
-   pud = pud_offset(pgd, 0xA);
+   p4d = p4d_offset(pgd, 0xA);
+   if (p4d_none_or_clear_bad(p4d))
+   goto out;
+   pud = pud_offset(p4d, 0xA);
if (pud_none_or_clear_bad(pud))
goto out;
pmd = pmd_offset(pud, 0xA);
diff --git a/arch/x86/mm/fault.c b/arch/x86/mm/fault.c
index 428e3176..605fd5e 100644
--- a/arch/x86/mm/fault.c
+++ b/arch/x86/mm/fault.c
@@ -253,6 +253,7 @@ static inline pmd_t *vmalloc_sync_one(pgd_t *pgd, unsigned 
long address)
 {
unsigned index = pgd_index(address);
pgd_t *pgd_k;
+   p4d_t *p4d, *p4d_k;
pud_t *pud, *pud_k;
pmd_t *pmd, *pmd_k;
 
@@ -265,10 +266,15 @@ static inline pmd_t *vmalloc_sync_one(pgd_t *pgd, 
unsigned long address)
/*
 * set_pgd(pgd, *pgd_k); here would be useless on PAE
 * and redundant with the set_pmd() on non-PAE. As would
-* set_pud.
+* set_p4d/set_pud.
 */
-   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))
+   return NULL;
+
+   pud = pud_offset(p4d, address);
+   pud_k = pud_offset(p4d_k, address);
if (!pud_present(*pud_k))
return NULL;
 
@@ -384,6 +390,8 @@ static void dump_pagetable(unsigned long address)
 {
pgd_t *base = __va(read_cr3());
pgd_t *pgd = [pgd_index(address)];
+   p4d_t *p4d;
+   pud_t *pud;
pmd_t *pmd;
pte_t *pte;
 
@@ -392,7 +400,9 @@ static void dump_pagetable(unsigned long address)
if (!low_pfn(pgd_val(*pgd) >> PAGE_SHIFT) || !pgd_present(*pgd))
goto out;
 #endif
-   pmd = pmd_offset(pud_offset(pgd, address), address);
+   p4d = p4d_offset(pgd, address);
+   pud = pud_offset(p4d, address);
+   pmd = pmd_offset(pud, address);
printk(KERN_CONT "*pde = %0*Lx ", sizeof(*pmd) * 2, (u64)pmd_val(*pmd));
 
/*
@@ -526,6 +536,7 @@ static void dump_pagetable(unsigned long address)
 {
pgd_t *base = __va(read_cr3() & PHYSICAL_PAGE_MASK);
pgd_t *pgd = base + pgd_index(address);
+   p4d_t *p4d;
pud_t *pud;
pmd_t *pmd;
pte_t *pte;
@@ -538,7 +549,15 @@