Patch "x86/mm: Simplify p[g4um]d_page() macros" has been added to the 4.9-stable tree

Commit Message

Greg Kroah-Hartman Aug. 21, 2018, 5:28 a.m. UTC

This is a note to let you know that I've just added the patch titled

    x86/mm: Simplify p[g4um]d_page() macros

to the 4.9-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     x86-mm-simplify-pd_page-macros.patch
and it can be found in the queue-4.9 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <[e-mail]> know about it.


From fd7e315988b784509ba3f1b42f539bd0b1fca9bb Mon Sep 17 00:00:00 2001
From: Tom Lendacky <[e-mail]>
Date: Mon, 17 Jul 2017 16:10:06 -0500
Subject: x86/mm: Simplify p[g4um]d_page() macros
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

From: Tom Lendacky <[e-mail]>

commit fd7e315988b784509ba3f1b42f539bd0b1fca9bb upstream.

Create a pgd_pfn() macro similar to the p[4um]d_pfn() macros and then
use the p[g4um]d_pfn() macros in the p[g4um]d_page() macros instead of
duplicating the code.

Signed-off-by: Tom Lendacky <[e-mail]>
Reviewed-by: Thomas Gleixner <[e-mail]>
Reviewed-by: Borislav Petkov <[e-mail]>
Cc: Alexander Potapenko <[e-mail]>
Cc: Andrey Ryabinin <[e-mail]>
Cc: Andy Lutomirski <[e-mail]>
Cc: Arnd Bergmann <[e-mail]>
Cc: Borislav Petkov <[e-mail]>
Cc: Brijesh Singh <[e-mail]>
Cc: Dave Young <[e-mail]>
Cc: Dmitry Vyukov <[e-mail]>
Cc: Jonathan Corbet <[e-mail]>
Cc: Konrad Rzeszutek Wilk <[e-mail]>
Cc: Larry Woodman <[e-mail]>
Cc: Linus Torvalds <[e-mail]>
Cc: Matt Fleming <[e-mail]>
Cc: Michael S. Tsirkin <[e-mail]>
Cc: Paolo Bonzini <[e-mail]>
Cc: Peter Zijlstra <[e-mail]>
Cc: Radim Krčmář <[e-mail]>
Cc: Rik van Riel <[e-mail]>
Cc: Toshimitsu Kani <[e-mail]>
Cc: [e-mail]
Cc: [e-mail]
Cc: [e-mail]
Cc: [e-mail]
Cc: [e-mail]
Cc: [e-mail]
Link: http://lkml.kernel.org/r/e61eb53[e-mail]
Signed-off-by: Ingo Molnar <[e-mail]>
[Backported to 4.9 stable by AK, suggested by Michael Hocko]
Signed-off-by: Andi Kleen <[e-mail]>
Signed-off-by: Greg Kroah-Hartman <[e-mail]>
---
 arch/x86/include/asm/pgtable.h |   13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)



Patches currently in stable-queue which might be from [e-mail] are

queue-4.9/x86-mm-simplify-pd_page-macros.patch

Patch

--- a/arch/x86/include/asm/pgtable.h
+++ b/arch/x86/include/asm/pgtable.h
@@ -190,6 +190,11 @@  static inline unsigned long pud_pfn(pud_
 	return (pfn & pud_pfn_mask(pud)) >> PAGE_SHIFT;
 }
 
+static inline unsigned long pgd_pfn(pgd_t pgd)
+{
+	return (pgd_val(pgd) & PTE_PFN_MASK) >> PAGE_SHIFT;
+}
+
 #define pte_page(pte)	pfn_to_page(pte_pfn(pte))
 
 static inline int pmd_large(pmd_t pte)
@@ -621,8 +626,7 @@  static inline unsigned long pmd_page_vad
  * Currently stuck as a macro due to indirect forward reference to
  * linux/mmzone.h's __section_mem_map_addr() definition:
  */
-#define pmd_page(pmd)		\
-	pfn_to_page((pmd_val(pmd) & pmd_pfn_mask(pmd)) >> PAGE_SHIFT)
+#define pmd_page(pmd)	pfn_to_page(pmd_pfn(pmd))
 
 /*
  * the pmd page can be thought of an array like this: pmd_t[PTRS_PER_PMD]
@@ -690,8 +694,7 @@  static inline unsigned long pud_page_vad
  * Currently stuck as a macro due to indirect forward reference to
  * linux/mmzone.h's __section_mem_map_addr() definition:
  */
-#define pud_page(pud)		\
-	pfn_to_page((pud_val(pud) & pud_pfn_mask(pud)) >> PAGE_SHIFT)
+#define pud_page(pud)	pfn_to_page(pud_pfn(pud))
 
 /* Find an entry in the second-level page table.. */
 static inline pmd_t *pmd_offset(pud_t *pud, unsigned long address)
@@ -731,7 +734,7 @@  static inline unsigned long pgd_page_vad
  * Currently stuck as a macro due to indirect forward reference to
  * linux/mmzone.h's __section_mem_map_addr() definition:
  */
-#define pgd_page(pgd)		pfn_to_page(pgd_val(pgd) >> PAGE_SHIFT)
+#define pgd_page(pgd)		pfn_to_page(pgd_pfn(pgd))
 
 /* to find an entry in a page-table-directory. */
 static inline unsigned long pud_index(unsigned long address)