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

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

x86/pgtable: Move pti_set_user_pgtbl() to pgtable.h 



There it is also usable from 32 bit code.

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-20-git-send-email-joro@8bytes.org
parent 8372d668

arch/x86/include/asm/pgtable.h

+23 −0
Original line number Diff line number Diff line
@@ -640,8 +640,31 @@ static inline int is_new_memtype_allowed(u64 paddr, unsigned long size, 


pmd_t *populate_extra_pmd(unsigned long vaddr);

pte_t *populate_extra_pte(unsigned long vaddr);



#ifdef CONFIG_PAGE_TABLE_ISOLATION

pgd_t __pti_set_user_pgtbl(pgd_t *pgdp, pgd_t pgd);



/*

 * Take a PGD location (pgdp) and a pgd value that needs to be set there.

 * Populates the user and returns the resulting PGD that must be set in

 * the kernel copy of the page tables.

 */

static inline pgd_t pti_set_user_pgtbl(pgd_t *pgdp, pgd_t pgd)

{

	if (!static_cpu_has(X86_FEATURE_PTI))

		return pgd;

	return __pti_set_user_pgtbl(pgdp, pgd);

}

#else   /* CONFIG_PAGE_TABLE_ISOLATION */

static inline pgd_t pti_set_user_pgtbl(pgd_t *pgdp, pgd_t pgd)

{

	return pgd;

}

#endif  /* CONFIG_PAGE_TABLE_ISOLATION */



#endif	/* __ASSEMBLY__ */





#ifdef CONFIG_X86_32

# include <asm/pgtable_32.h>

#else