Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1f40a46c authored by Joerg Roedel's avatar Joerg Roedel Committed by Thomas Gleixner
Browse files

x86/mm/legacy: Populate the user page-table with user pgd's 



Also populate the user-spage pgd's in the user page-table.

Signed-off-by: default avatarJoerg Roedel <jroedel@suse.de>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Tested-by: default avatarPavel Machek <pavel@ucw.cz>
Cc: "H . Peter Anvin" <hpa@zytor.com>
Cc: linux-mm@kvack.org
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Andy Lutomirski <luto@kernel.org>
Cc: Dave Hansen <dave.hansen@intel.com>
Cc: Josh Poimboeuf <jpoimboe@redhat.com>
Cc: Juergen Gross <jgross@suse.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Jiri Kosina <jkosina@suse.cz>
Cc: Boris Ostrovsky <boris.ostrovsky@oracle.com>
Cc: Brian Gerst <brgerst@gmail.com>
Cc: David Laight <David.Laight@aculab.com>
Cc: Denys Vlasenko <dvlasenk@redhat.com>
Cc: Eduardo Valentin <eduval@amazon.com>
Cc: Greg KH <gregkh@linuxfoundation.org>
Cc: Will Deacon <will.deacon@arm.com>
Cc: aliguori@amazon.com
Cc: daniel.gruss@iaik.tugraz.at
Cc: hughd@google.com
Cc: keescook@google.com
Cc: Andrea Arcangeli <aarcange@redhat.com>
Cc: Waiman Long <llong@redhat.com>
Cc: "David H . Gutteridge" <dhgutteridge@sympatico.ca>
Cc: joro@8bytes.org
Link: https://lkml.kernel.org/r/1531906876-13451-24-git-send-email-joro@8bytes.org
parent 9b7b8bbd

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

+9 −0
Original line number Diff line number Diff line
@@ -19,6 +19,9 @@ static inline void native_set_pte(pte_t *ptep , pte_t pte) 


static inline void native_set_pmd(pmd_t *pmdp, pmd_t pmd)

{

#ifdef CONFIG_PAGE_TABLE_ISOLATION

	pmd.pud.p4d.pgd = pti_set_user_pgtbl(&pmdp->pud.p4d.pgd, pmd.pud.p4d.pgd);

#endif

	*pmdp = pmd;

}
@@ -58,6 +61,9 @@ static inline pte_t native_ptep_get_and_clear(pte_t *xp) 
#ifdef CONFIG_SMP

static inline pmd_t native_pmdp_get_and_clear(pmd_t *xp)

{

#ifdef CONFIG_PAGE_TABLE_ISOLATION

	pti_set_user_pgtbl(&xp->pud.p4d.pgd, __pgd(0));

#endif

	return __pmd(xchg((pmdval_t *)xp, 0));

}

#else
@@ -67,6 +73,9 @@ static inline pmd_t native_pmdp_get_and_clear(pmd_t *xp) 
#ifdef CONFIG_SMP

static inline pud_t native_pudp_get_and_clear(pud_t *xp)

{

#ifdef CONFIG_PAGE_TABLE_ISOLATION

	pti_set_user_pgtbl(&xp->p4d.pgd, __pgd(0));

#endif

	return __pud(xchg((pudval_t *)xp, 0));

}

#else