Commit 8490638c authored by Jeremy Fitzhardinge's avatar Jeremy Fitzhardinge Committed by Ingo Molnar
Browse files

x86: always set _PAGE_GLOBAL in _PAGE_KERNEL* flags 



Consistently set _PAGE_GLOBAL in _PAGE_KERNEL flags.  This makes 32-
and 64-bit code consistent, and removes some special cases where
__PAGE_KERNEL* did not have _PAGE_GLOBAL set, causing confusion as a
result of the inconsistencies.

This patch only affects x86-64, which generally always supports PGD.
The x86-32 patch is next.

Signed-off-by: default avatarJeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
Cc: Stephen Tweedie <sct@redhat.com>
Cc: Eduardo Habkost <ehabkost@redhat.com>
Cc: Mark McLoughlin <markmc@redhat.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 574977a2

arch/x86/kernel/head_64.S

+2 −2
Original line number Diff line number Diff line
@@ -374,7 +374,7 @@ NEXT_PAGE(level2_ident_pgt) 
	/* Since I easily can, map the first 1G.

	 * Don't set NX because code runs from these pages.

	 */

	PMDS(0, __PAGE_KERNEL_LARGE_EXEC | _PAGE_GLOBAL, PTRS_PER_PMD)

	PMDS(0, __PAGE_KERNEL_LARGE_EXEC, PTRS_PER_PMD)



NEXT_PAGE(level2_kernel_pgt)

	/*
@@ -387,7 +387,7 @@ NEXT_PAGE(level2_kernel_pgt) 
	 *  If you want to increase this then increase MODULES_VADDR

	 *  too.)

	 */

	PMDS(0, __PAGE_KERNEL_LARGE_EXEC|_PAGE_GLOBAL,

	PMDS(0, __PAGE_KERNEL_LARGE_EXEC,

		KERNEL_IMAGE_SIZE/PMD_SIZE)



NEXT_PAGE(level2_spare_pgt)

include/asm-x86/pgtable.h

+13 −19
Original line number Diff line number Diff line
@@ -88,7 +88,7 @@ extern pteval_t __PAGE_KERNEL, __PAGE_KERNEL_EXEC; 
#endif	/* __ASSEMBLY__ */

#else

#define __PAGE_KERNEL_EXEC						\

	(_PAGE_PRESENT | _PAGE_RW | _PAGE_DIRTY | _PAGE_ACCESSED)

	(_PAGE_PRESENT | _PAGE_RW | _PAGE_DIRTY | _PAGE_ACCESSED | _PAGE_GLOBAL)

#define __PAGE_KERNEL		(__PAGE_KERNEL_EXEC | _PAGE_NX)

#endif
@@ -103,24 +103,18 @@ extern pteval_t __PAGE_KERNEL, __PAGE_KERNEL_EXEC; 
#define __PAGE_KERNEL_LARGE		(__PAGE_KERNEL | _PAGE_PSE)

#define __PAGE_KERNEL_LARGE_EXEC	(__PAGE_KERNEL_EXEC | _PAGE_PSE)



#ifdef CONFIG_X86_32

# define MAKE_GLOBAL(x)			__pgprot((x))

#else

# define MAKE_GLOBAL(x)			__pgprot((x) | _PAGE_GLOBAL)

#endif



#define PAGE_KERNEL			MAKE_GLOBAL(__PAGE_KERNEL)

#define PAGE_KERNEL_RO			MAKE_GLOBAL(__PAGE_KERNEL_RO)

#define PAGE_KERNEL_EXEC		MAKE_GLOBAL(__PAGE_KERNEL_EXEC)

#define PAGE_KERNEL_RX			MAKE_GLOBAL(__PAGE_KERNEL_RX)

#define PAGE_KERNEL_WC			MAKE_GLOBAL(__PAGE_KERNEL_WC)

#define PAGE_KERNEL_NOCACHE		MAKE_GLOBAL(__PAGE_KERNEL_NOCACHE)

#define PAGE_KERNEL_UC_MINUS		MAKE_GLOBAL(__PAGE_KERNEL_UC_MINUS)

#define PAGE_KERNEL_EXEC_NOCACHE	MAKE_GLOBAL(__PAGE_KERNEL_EXEC_NOCACHE)

#define PAGE_KERNEL_LARGE		MAKE_GLOBAL(__PAGE_KERNEL_LARGE)

#define PAGE_KERNEL_LARGE_EXEC		MAKE_GLOBAL(__PAGE_KERNEL_LARGE_EXEC)

#define PAGE_KERNEL_VSYSCALL		MAKE_GLOBAL(__PAGE_KERNEL_VSYSCALL)

#define PAGE_KERNEL_VSYSCALL_NOCACHE	MAKE_GLOBAL(__PAGE_KERNEL_VSYSCALL_NOCACHE)

#define PAGE_KERNEL			__pgprot(__PAGE_KERNEL)

#define PAGE_KERNEL_RO			__pgprot(__PAGE_KERNEL_RO)

#define PAGE_KERNEL_EXEC		__pgprot(__PAGE_KERNEL_EXEC)

#define PAGE_KERNEL_RX			__pgprot(__PAGE_KERNEL_RX)

#define PAGE_KERNEL_WC			__pgprot(__PAGE_KERNEL_WC)

#define PAGE_KERNEL_NOCACHE		__pgprot(__PAGE_KERNEL_NOCACHE)

#define PAGE_KERNEL_UC_MINUS		__pgprot(__PAGE_KERNEL_UC_MINUS)

#define PAGE_KERNEL_EXEC_NOCACHE	__pgprot(__PAGE_KERNEL_EXEC_NOCACHE)

#define PAGE_KERNEL_LARGE		__pgprot(__PAGE_KERNEL_LARGE)

#define PAGE_KERNEL_LARGE_EXEC		__pgprot(__PAGE_KERNEL_LARGE_EXEC)

#define PAGE_KERNEL_VSYSCALL		__pgprot(__PAGE_KERNEL_VSYSCALL)

#define PAGE_KERNEL_VSYSCALL_NOCACHE	__pgprot(__PAGE_KERNEL_VSYSCALL_NOCACHE)



/*         xwr */

#define __P000	PAGE_NONE

CRA Git | Maintained and supported by SUSTech CRA and CCSE