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

Commit 6c386655 authored by Jeremy Fitzhardinge's avatar Jeremy Fitzhardinge Committed by Ingo Molnar
Browse files

x86: move all asm/pgtable constants into one place 



32 and 64-bit use the same flags for pagetable entries, so make them all common.

[ mingo@elte.hu: fixes ]

Signed-off-by: default avatarJeremy Fitzhardinge <jeremy@xensource.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent 82bc03fc

include/asm-x86/pgtable.h

+119 −0
Original line number Diff line number Diff line 
#ifndef _ASM_X86_PGTABLE_H

#define _ASM_X86_PGTABLE_H



#define USER_PTRS_PER_PGD	((TASK_SIZE-1)/PGDIR_SIZE+1)

#define FIRST_USER_ADDRESS	0



#define _PAGE_BIT_PRESENT	0

#define _PAGE_BIT_RW		1

#define _PAGE_BIT_USER		2

#define _PAGE_BIT_PWT		3

#define _PAGE_BIT_PCD		4

#define _PAGE_BIT_ACCESSED	5

#define _PAGE_BIT_DIRTY		6

#define _PAGE_BIT_FILE		6

#define _PAGE_BIT_PSE		7	/* 4 MB (or 2MB) page */

#define _PAGE_BIT_GLOBAL	8	/* Global TLB entry PPro+ */

#define _PAGE_BIT_UNUSED1	9	/* available for programmer */

#define _PAGE_BIT_UNUSED2	10

#define _PAGE_BIT_UNUSED3	11

#define _PAGE_BIT_NX           63       /* No execute: only valid after cpuid check */



#define _PAGE_PRESENT	(_AC(1, UL)<<_PAGE_BIT_PRESENT)

#define _PAGE_RW	(_AC(1, UL)<<_PAGE_BIT_RW)

#define _PAGE_USER	(_AC(1, UL)<<_PAGE_BIT_USER)

#define _PAGE_PWT	(_AC(1, UL)<<_PAGE_BIT_PWT)

#define _PAGE_PCD	(_AC(1, UL)<<_PAGE_BIT_PCD)

#define _PAGE_ACCESSED	(_AC(1, UL)<<_PAGE_BIT_ACCESSED)

#define _PAGE_DIRTY	(_AC(1, UL)<<_PAGE_BIT_DIRTY)

#define _PAGE_PSE	(_AC(1, UL)<<_PAGE_BIT_PSE)	/* 2MB page */

#define _PAGE_GLOBAL	(_AC(1, UL)<<_PAGE_BIT_GLOBAL)	/* Global TLB entry */

#define _PAGE_UNUSED1	(_AC(1, UL)<<_PAGE_BIT_UNUSED1)

#define _PAGE_UNUSED2	(_AC(1, UL)<<_PAGE_BIT_UNUSED2)

#define _PAGE_UNUSED3	(_AC(1, UL)<<_PAGE_BIT_UNUSED3)



#if defined(CONFIG_X86_64) || defined(CONFIG_X86_PAE)

#define _PAGE_NX	(_AC(1, ULL) << _PAGE_BIT_NX)

#else

#define _PAGE_NX	0

#endif



/* If _PAGE_PRESENT is clear, we use these: */

#define _PAGE_FILE	_PAGE_DIRTY	/* nonlinear file mapping, saved PTE; unset:swap */

#define _PAGE_PROTNONE	_PAGE_PSE	/* if the user mapped it with PROT_NONE;

					   pte_present gives true */



#define _PAGE_TABLE	(_PAGE_PRESENT | _PAGE_RW | _PAGE_USER | _PAGE_ACCESSED | _PAGE_DIRTY)

#define _KERNPG_TABLE	(_PAGE_PRESENT | _PAGE_RW | _PAGE_ACCESSED | _PAGE_DIRTY)



#define _PAGE_CHG_MASK	(PTE_MASK | _PAGE_ACCESSED | _PAGE_DIRTY)



#define PAGE_NONE	__pgprot(_PAGE_PROTNONE | _PAGE_ACCESSED)

#define PAGE_SHARED	__pgprot(_PAGE_PRESENT | _PAGE_RW | _PAGE_USER | _PAGE_ACCESSED | _PAGE_NX)



#define PAGE_SHARED_EXEC	__pgprot(_PAGE_PRESENT | _PAGE_RW | _PAGE_USER | _PAGE_ACCESSED)

#define PAGE_COPY_NOEXEC	__pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_ACCESSED | _PAGE_NX)

#define PAGE_COPY_EXEC		__pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_ACCESSED)

#define PAGE_COPY		PAGE_COPY_NOEXEC

#define PAGE_READONLY		__pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_ACCESSED | _PAGE_NX)

#define PAGE_READONLY_EXEC	__pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_ACCESSED)



#ifdef CONFIG_X86_32

#define _PAGE_KERNEL_EXEC \

	(_PAGE_PRESENT | _PAGE_RW | _PAGE_DIRTY | _PAGE_ACCESSED)

#define _PAGE_KERNEL (_PAGE_KERNEL_EXEC | _PAGE_NX)



#ifndef __ASSEMBLY__

extern unsigned long long __PAGE_KERNEL, __PAGE_KERNEL_EXEC;

#endif	/* __ASSEMBLY__ */

#else

#define __PAGE_KERNEL_EXEC						\

	(_PAGE_PRESENT | _PAGE_RW | _PAGE_DIRTY | _PAGE_ACCESSED)

#define __PAGE_KERNEL		(__PAGE_KERNEL_EXEC | _PAGE_NX)

#endif



#define __PAGE_KERNEL_RO		(__PAGE_KERNEL & ~_PAGE_RW)

#define __PAGE_KERNEL_RX		(__PAGE_KERNEL_EXEC & ~_PAGE_RW)

#define __PAGE_KERNEL_NOCACHE		(__PAGE_KERNEL | _PAGE_PCD | _PAGE_PWT)

#define __PAGE_KERNEL_VSYSCALL		(__PAGE_KERNEL_RX | _PAGE_USER)

#define __PAGE_KERNEL_VSYSCALL_NOCACHE	(__PAGE_KERNEL_VSYSCALL | _PAGE_PCD | _PAGE_PWT)

#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_NOCACHE		MAKE_GLOBAL(__PAGE_KERNEL_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)



/*         xwr */

#define __P000	PAGE_NONE

#define __P001	PAGE_READONLY

#define __P010	PAGE_COPY

#define __P011	PAGE_COPY

#define __P100	PAGE_READONLY_EXEC

#define __P101	PAGE_READONLY_EXEC

#define __P110	PAGE_COPY_EXEC

#define __P111	PAGE_COPY_EXEC



#define __S000	PAGE_NONE

#define __S001	PAGE_READONLY

#define __S010	PAGE_SHARED

#define __S011	PAGE_SHARED

#define __S100	PAGE_READONLY_EXEC

#define __S101	PAGE_READONLY_EXEC

#define __S110	PAGE_SHARED_EXEC

#define __S111	PAGE_SHARED_EXEC



#ifdef CONFIG_X86_32

# include "pgtable_32.h"

#else

# include "pgtable_64.h"

#endif



#endif	/* _ASM_X86_PGTABLE_H */

include/asm-x86/pgtable_32.h

+0 −110
Original line number Diff line number Diff line
@@ -58,9 +58,6 @@ void paging_init(void); 
#define PGDIR_SIZE	(1UL << PGDIR_SHIFT)

#define PGDIR_MASK	(~(PGDIR_SIZE-1))



#define USER_PTRS_PER_PGD	(TASK_SIZE/PGDIR_SIZE)

#define FIRST_USER_ADDRESS	0



#define USER_PGD_PTRS (PAGE_OFFSET >> PGDIR_SHIFT)

#define KERNEL_PGD_PTRS (PTRS_PER_PGD-USER_PGD_PTRS)
@@ -84,113 +81,6 @@ void paging_init(void); 
# define VMALLOC_END	(FIXADDR_START-2*PAGE_SIZE)

#endif



/*

 * _PAGE_PSE set in the page directory entry just means that

 * the page directory entry points directly to a 4MB-aligned block of

 * memory. 

 */

#define _PAGE_BIT_PRESENT	0

#define _PAGE_BIT_RW		1

#define _PAGE_BIT_USER		2

#define _PAGE_BIT_PWT		3

#define _PAGE_BIT_PCD		4

#define _PAGE_BIT_ACCESSED	5

#define _PAGE_BIT_DIRTY		6

#define _PAGE_BIT_PSE		7	/* 4 MB (or 2MB) page, Pentium+, if present.. */

#define _PAGE_BIT_GLOBAL	8	/* Global TLB entry PPro+ */

#define _PAGE_BIT_UNUSED1	9	/* available for programmer */

#define _PAGE_BIT_UNUSED2	10

#define _PAGE_BIT_UNUSED3	11

#define _PAGE_BIT_NX		63



#define _PAGE_PRESENT	0x001

#define _PAGE_RW	0x002

#define _PAGE_USER	0x004

#define _PAGE_PWT	0x008

#define _PAGE_PCD	0x010

#define _PAGE_ACCESSED	0x020

#define _PAGE_DIRTY	0x040

#define _PAGE_PSE	0x080	/* 4 MB (or 2MB) page, Pentium+, if present.. */

#define _PAGE_GLOBAL	0x100	/* Global TLB entry PPro+ */

#define _PAGE_UNUSED1	0x200	/* available for programmer */

#define _PAGE_UNUSED2	0x400

#define _PAGE_UNUSED3	0x800



/* If _PAGE_PRESENT is clear, we use these: */

#define _PAGE_FILE	0x040	/* nonlinear file mapping, saved PTE; unset:swap */

#define _PAGE_PROTNONE	0x080	/* if the user mapped it with PROT_NONE;

				   pte_present gives true */

#ifdef CONFIG_X86_PAE

#define _PAGE_NX	(1ULL<<_PAGE_BIT_NX)

#else

#define _PAGE_NX	0

#endif



#define _PAGE_TABLE	(_PAGE_PRESENT | _PAGE_RW | _PAGE_USER | _PAGE_ACCESSED | _PAGE_DIRTY)

#define _KERNPG_TABLE	(_PAGE_PRESENT | _PAGE_RW | _PAGE_ACCESSED | _PAGE_DIRTY)

#define _PAGE_CHG_MASK	(PTE_MASK | _PAGE_ACCESSED | _PAGE_DIRTY)



#define PAGE_NONE \

	__pgprot(_PAGE_PROTNONE | _PAGE_ACCESSED)

#define PAGE_SHARED \

	__pgprot(_PAGE_PRESENT | _PAGE_RW | _PAGE_USER | _PAGE_ACCESSED)



#define PAGE_SHARED_EXEC \

	__pgprot(_PAGE_PRESENT | _PAGE_RW | _PAGE_USER | _PAGE_ACCESSED)

#define PAGE_COPY_NOEXEC \

	__pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_ACCESSED | _PAGE_NX)

#define PAGE_COPY_EXEC \

	__pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_ACCESSED)

#define PAGE_COPY \

	PAGE_COPY_NOEXEC

#define PAGE_READONLY \

	__pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_ACCESSED | _PAGE_NX)

#define PAGE_READONLY_EXEC \

	__pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_ACCESSED)



#define _PAGE_KERNEL \

	(_PAGE_PRESENT | _PAGE_RW | _PAGE_DIRTY | _PAGE_ACCESSED | _PAGE_NX)

#define _PAGE_KERNEL_EXEC \

	(_PAGE_PRESENT | _PAGE_RW | _PAGE_DIRTY | _PAGE_ACCESSED)



extern unsigned long long __PAGE_KERNEL, __PAGE_KERNEL_EXEC;

#define __PAGE_KERNEL_RO		(__PAGE_KERNEL & ~_PAGE_RW)

#define __PAGE_KERNEL_RX		(__PAGE_KERNEL_EXEC & ~_PAGE_RW)

#define __PAGE_KERNEL_NOCACHE		(__PAGE_KERNEL | _PAGE_PCD | _PAGE_PWT)

#define __PAGE_KERNEL_LARGE		(__PAGE_KERNEL | _PAGE_PSE)

#define __PAGE_KERNEL_LARGE_EXEC	(__PAGE_KERNEL_EXEC | _PAGE_PSE)



#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_NOCACHE	__pgprot(__PAGE_KERNEL_NOCACHE)

#define PAGE_KERNEL_LARGE	__pgprot(__PAGE_KERNEL_LARGE)

#define PAGE_KERNEL_LARGE_EXEC	__pgprot(__PAGE_KERNEL_LARGE_EXEC)



/*

 * The i386 can't do page protection for execute, and considers that

 * the same are read. Also, write permissions imply read permissions.

 * This is the closest we can get..

 */

#define __P000	PAGE_NONE

#define __P001	PAGE_READONLY

#define __P010	PAGE_COPY

#define __P011	PAGE_COPY

#define __P100	PAGE_READONLY_EXEC

#define __P101	PAGE_READONLY_EXEC

#define __P110	PAGE_COPY_EXEC

#define __P111	PAGE_COPY_EXEC



#define __S000	PAGE_NONE

#define __S001	PAGE_READONLY

#define __S010	PAGE_SHARED

#define __S011	PAGE_SHARED

#define __S100	PAGE_READONLY_EXEC

#define __S101	PAGE_READONLY_EXEC

#define __S110	PAGE_SHARED_EXEC

#define __S111	PAGE_SHARED_EXEC



/*

 * Define this if things work differently on an i386 and an i486:

 * it will (on an i486) warn about kernel memory accesses that are

include/asm-x86/pgtable_64.h

+0 −91
Original line number Diff line number Diff line
@@ -131,8 +131,6 @@ static inline pte_t ptep_get_and_clear_full(struct mm_struct *mm, unsigned long 
#define PGDIR_SIZE	(_AC(1,UL) << PGDIR_SHIFT)

#define PGDIR_MASK	(~(PGDIR_SIZE-1))



#define USER_PTRS_PER_PGD	((TASK_SIZE-1)/PGDIR_SIZE+1)

#define FIRST_USER_ADDRESS	0



#define MAXMEM		 _AC(0x3fffffffffff, UL)

#define VMALLOC_START    _AC(0xffffc20000000000, UL)
@@ -142,95 +140,6 @@ static inline pte_t ptep_get_and_clear_full(struct mm_struct *mm, unsigned long 
#define MODULES_END      _AC(0xfffffffffff00000, UL)

#define MODULES_LEN   (MODULES_END - MODULES_VADDR)



#define _PAGE_BIT_PRESENT	0

#define _PAGE_BIT_RW		1

#define _PAGE_BIT_USER		2

#define _PAGE_BIT_PWT		3

#define _PAGE_BIT_PCD		4

#define _PAGE_BIT_ACCESSED	5

#define _PAGE_BIT_DIRTY		6

#define _PAGE_BIT_PSE		7	/* 4 MB (or 2MB) page */

#define _PAGE_BIT_FILE		6

#define _PAGE_BIT_GLOBAL	8	/* Global TLB entry PPro+ */

#define _PAGE_BIT_NX           63       /* No execute: only valid after cpuid check */



#define _PAGE_PRESENT	(_AC(1, UL)<<_PAGE_BIT_PRESENT)

#define _PAGE_RW	(_AC(1, UL)<<_PAGE_BIT_RW)

#define _PAGE_USER	(_AC(1, UL)<<_PAGE_BIT_USER)

#define _PAGE_PWT	(_AC(1, UL)<<_PAGE_BIT_PWT)

#define _PAGE_PCD	(_AC(1, UL)<<_PAGE_BIT_PCD)

#define _PAGE_ACCESSED	(_AC(1, UL)<<_PAGE_BIT_ACCESSED)

#define _PAGE_DIRTY	(_AC(1, UL)<<_PAGE_BIT_DIRTY)

/* 2MB page */

#define _PAGE_PSE	(_AC(1, UL)<<_PAGE_BIT_PSE)

/* nonlinear file mapping, saved PTE; unset:swap */

#define _PAGE_FILE	(_AC(1, UL)<<_PAGE_BIT_FILE)

/* Global TLB entry */

#define _PAGE_GLOBAL	(_AC(1, UL)<<_PAGE_BIT_GLOBAL)



#define _PAGE_PROTNONE	0x080	/* If not present */

#define _PAGE_NX        (_AC(1, UL)<<_PAGE_BIT_NX)



#define _PAGE_TABLE	(_PAGE_PRESENT | _PAGE_RW | _PAGE_USER | _PAGE_ACCESSED | _PAGE_DIRTY)

#define _KERNPG_TABLE	(_PAGE_PRESENT | _PAGE_RW | _PAGE_ACCESSED | _PAGE_DIRTY)



#define _PAGE_CHG_MASK	(PTE_MASK | _PAGE_ACCESSED | _PAGE_DIRTY)



#define PAGE_NONE	__pgprot(_PAGE_PROTNONE | _PAGE_ACCESSED)

#define PAGE_SHARED	__pgprot(_PAGE_PRESENT | _PAGE_RW | _PAGE_USER | _PAGE_ACCESSED | _PAGE_NX)

#define PAGE_SHARED_EXEC __pgprot(_PAGE_PRESENT | _PAGE_RW | _PAGE_USER | _PAGE_ACCESSED)

#define PAGE_COPY_NOEXEC __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_ACCESSED | _PAGE_NX)

#define PAGE_COPY PAGE_COPY_NOEXEC

#define PAGE_COPY_EXEC __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_ACCESSED)

#define PAGE_READONLY	__pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_ACCESSED | _PAGE_NX)

#define PAGE_READONLY_EXEC __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_ACCESSED)

#define __PAGE_KERNEL \

	(_PAGE_PRESENT | _PAGE_RW | _PAGE_DIRTY | _PAGE_ACCESSED | _PAGE_NX)

#define __PAGE_KERNEL_EXEC \

	(_PAGE_PRESENT | _PAGE_RW | _PAGE_DIRTY | _PAGE_ACCESSED)

#define __PAGE_KERNEL_NOCACHE \

	(_PAGE_PRESENT | _PAGE_RW | _PAGE_DIRTY | _PAGE_PCD | _PAGE_PWT | _PAGE_ACCESSED | _PAGE_NX)

#define __PAGE_KERNEL_RO \

	(_PAGE_PRESENT | _PAGE_DIRTY | _PAGE_ACCESSED | _PAGE_NX)

#define __PAGE_KERNEL_VSYSCALL \

	(_PAGE_PRESENT | _PAGE_USER | _PAGE_ACCESSED)

#define __PAGE_KERNEL_VSYSCALL_NOCACHE \

	(_PAGE_PRESENT | _PAGE_USER | _PAGE_ACCESSED | _PAGE_PCD | _PAGE_PWT)

#define __PAGE_KERNEL_LARGE \

	(__PAGE_KERNEL | _PAGE_PSE)

#define __PAGE_KERNEL_LARGE_EXEC \

	(__PAGE_KERNEL_EXEC | _PAGE_PSE)



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



#define PAGE_KERNEL MAKE_GLOBAL(__PAGE_KERNEL)

#define PAGE_KERNEL_EXEC MAKE_GLOBAL(__PAGE_KERNEL_EXEC)

#define PAGE_KERNEL_RO MAKE_GLOBAL(__PAGE_KERNEL_RO)

#define PAGE_KERNEL_NOCACHE MAKE_GLOBAL(__PAGE_KERNEL_NOCACHE)

#define PAGE_KERNEL_VSYSCALL32 __pgprot(__PAGE_KERNEL_VSYSCALL)

#define PAGE_KERNEL_VSYSCALL MAKE_GLOBAL(__PAGE_KERNEL_VSYSCALL)

#define PAGE_KERNEL_LARGE MAKE_GLOBAL(__PAGE_KERNEL_LARGE)

#define PAGE_KERNEL_VSYSCALL_NOCACHE MAKE_GLOBAL(__PAGE_KERNEL_VSYSCALL_NOCACHE)



/*         xwr */

#define __P000	PAGE_NONE

#define __P001	PAGE_READONLY

#define __P010	PAGE_COPY

#define __P011	PAGE_COPY

#define __P100	PAGE_READONLY_EXEC

#define __P101	PAGE_READONLY_EXEC

#define __P110	PAGE_COPY_EXEC

#define __P111	PAGE_COPY_EXEC



#define __S000	PAGE_NONE

#define __S001	PAGE_READONLY

#define __S010	PAGE_SHARED

#define __S011	PAGE_SHARED

#define __S100	PAGE_READONLY_EXEC

#define __S101	PAGE_READONLY_EXEC

#define __S110	PAGE_SHARED_EXEC

#define __S111	PAGE_SHARED_EXEC



#ifndef __ASSEMBLY__



static inline unsigned long pgd_bad(pgd_t pgd)