x86/mm: Fix {pmd,pud}_{set,clear}_flags()

jbeulich · Ingo Molnar · commit 842cef9113c2 · 2018-02-20T09:33:39.000+01:00
Just like pte_{set,clear}_flags() their PMD and PUD counterparts should not do any address translation. This was outright wrong under Xen (causing a dead boot with no useful output on "suitable" systems), and produced needlessly more complicated code (even if just slightly) when paravirt was enabled. Signed-off-by: Jan Beulich <jbeulich@suse.com> Reviewed-by: Juergen Gross <jgross@suse.com> Acked-by: Thomas Gleixner <tglx@linutronix.de> Cc: Andy Lutomirski <luto@kernel.org> Cc: Boris Ostrovsky <boris.ostrovsky@oracle.com> Cc: Borislav Petkov <bp@alien8.de> Cc: Brian Gerst <brgerst@gmail.com> Cc: Denys Vlasenko <dvlasenk@redhat.com> Cc: H. Peter Anvin <hpa@zytor.com> Cc: Josh Poimboeuf <jpoimboe@redhat.com> Cc: Linus Torvalds <torvalds@linux-foundation.org> Cc: Peter Zijlstra <peterz@infradead.org> Cc: stable@vger.kernel.org Link: http://lkml.kernel.org/r/5A8AF1BB02000078001A91C3@prv-mh.provo.novell.com Signed-off-by: Ingo Molnar <mingo@kernel.org>
diff --git a/arch/x86/include/asm/pgtable.h b/arch/x86/include/asm/pgtable.h
@@ -350,14 +350,14 @@ static inline pmd_t pmd_set_flags(pmd_t pmd, pmdval_t set)
 {
 	pmdval_t v = native_pmd_val(pmd);
 
-	return __pmd(v | set);
+	return native_make_pmd(v | set);
 }
 
 static inline pmd_t pmd_clear_flags(pmd_t pmd, pmdval_t clear)
 {
 	pmdval_t v = native_pmd_val(pmd);
 
-	return __pmd(v & ~clear);
+	return native_make_pmd(v & ~clear);
 }
 
 static inline pmd_t pmd_mkold(pmd_t pmd)
@@ -409,14 +409,14 @@ static inline pud_t pud_set_flags(pud_t pud, pudval_t set)
 {
 	pudval_t v = native_pud_val(pud);
 
-	return __pud(v | set);
+	return native_make_pud(v | set);
 }
 
 static inline pud_t pud_clear_flags(pud_t pud, pudval_t clear)
 {
 	pudval_t v = native_pud_val(pud);
 
-	return __pud(v & ~clear);
+	return native_make_pud(v & ~clear);
 }
 
 static inline pud_t pud_mkold(pud_t pud)
diff --git a/arch/x86/include/asm/pgtable_types.h b/arch/x86/include/asm/pgtable_types.h
@@ -323,6 +323,11 @@ static inline pudval_t native_pud_val(pud_t pud)
 #else
 #include <asm-generic/pgtable-nopud.h>
 
+static inline pud_t native_make_pud(pudval_t val)
+{
+	return (pud_t) { .p4d.pgd = native_make_pgd(val) };
+}
+
 static inline pudval_t native_pud_val(pud_t pud)
 {
 	return native_pgd_val(pud.p4d.pgd);
@@ -344,6 +349,11 @@ static inline pmdval_t native_pmd_val(pmd_t pmd)
 #else
 #include <asm-generic/pgtable-nopmd.h>
 
+static inline pmd_t native_make_pmd(pmdval_t val)
+{
+	return (pmd_t) { .pud.p4d.pgd = native_make_pgd(val) };
+}
+
 static inline pmdval_t native_pmd_val(pmd_t pmd)
 {
 	return native_pgd_val(pmd.pud.p4d.pgd);

Original file line number	Diff line number	Diff line change
`@@ -350,14 +350,14 @@ static inline pmd_t pmd_set_flags(pmd_t pmd, pmdval_t set)`
`350`	`350`	`{`
`351`	`351`	`pmdval_t v = native_pmd_val(pmd);`
`352`	`352`
`353`		`- return __pmd(v \| set);`
	`353`	`+ return native_make_pmd(v \| set);`
`354`	`354`	`}`
`355`	`355`
`356`	`356`	`static inline pmd_t pmd_clear_flags(pmd_t pmd, pmdval_t clear)`
`357`	`357`	`{`
`358`	`358`	`pmdval_t v = native_pmd_val(pmd);`
`359`	`359`
`360`		`- return __pmd(v & ~clear);`
	`360`	`+ return native_make_pmd(v & ~clear);`
`361`	`361`	`}`
`362`	`362`
`363`	`363`	`static inline pmd_t pmd_mkold(pmd_t pmd)`
`@@ -409,14 +409,14 @@ static inline pud_t pud_set_flags(pud_t pud, pudval_t set)`
`409`	`409`	`{`
`410`	`410`	`pudval_t v = native_pud_val(pud);`
`411`	`411`
`412`		`- return __pud(v \| set);`
	`412`	`+ return native_make_pud(v \| set);`
`413`	`413`	`}`
`414`	`414`
`415`	`415`	`static inline pud_t pud_clear_flags(pud_t pud, pudval_t clear)`
`416`	`416`	`{`
`417`	`417`	`pudval_t v = native_pud_val(pud);`
`418`	`418`
`419`		`- return __pud(v & ~clear);`
	`419`	`+ return native_make_pud(v & ~clear);`
`420`	`420`	`}`
`421`	`421`
`422`	`422`	`static inline pud_t pud_mkold(pud_t pud)`