From: Andi Kleen <ak@suse.de>
i386 works with 2 and 3 levels
Signed-off-by: Andi Kleen <ak@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---
25-akpm/arch/i386/kernel/acpi/sleep.c | 6 +++---
25-akpm/arch/i386/kernel/vm86.c | 2 +-
25-akpm/arch/i386/mm/fault.c | 2 +-
25-akpm/arch/i386/mm/hugetlbpage.c | 11 ++++++++---
25-akpm/arch/i386/mm/init.c | 6 +++---
25-akpm/arch/i386/mm/ioremap.c | 2 +-
25-akpm/arch/i386/mm/pageattr.c | 4 ++--
25-akpm/arch/i386/mm/pgtable.c | 14 +++++++-------
25-akpm/include/asm-i386/mmu_context.h | 4 ++--
25-akpm/include/asm-i386/page.h | 2 ++
25-akpm/include/asm-i386/pgalloc.h | 7 ++++---
25-akpm/include/asm-i386/pgtable.h | 16 ++++------------
12 files changed, 38 insertions(+), 38 deletions(-)
diff -puN arch/i386/kernel/acpi/sleep.c~4level-architecture-changes-for-i386 arch/i386/kernel/acpi/sleep.c
--- 25/arch/i386/kernel/acpi/sleep.c~4level-architecture-changes-for-i386 2004-11-03 21:53:19.562094184 -0800
+++ 25-akpm/arch/i386/kernel/acpi/sleep.c 2004-11-03 21:53:19.581091296 -0800
@@ -23,8 +23,8 @@ static void init_low_mapping(pgd_t *pgd,
{
int pgd_ofs = 0;
- while ((pgd_ofs < pgd_limit) && (pgd_ofs + USER_PTRS_PER_PGD < PTRS_PER_PGD)) {
- set_pgd(pgd, *(pgd+USER_PTRS_PER_PGD));
+ while ((pgd_ofs < pgd_limit) && (pgd_ofs + USER_PGDS_IN_LAST_PML4 < PTRS_PER_PGD)) {
+ set_pgd(pgd, *(pgd+USER_PGDS_IN_LAST_PML4));
pgd_ofs++, pgd++;
}
}
@@ -39,7 +39,7 @@ int acpi_save_state_mem (void)
{
if (!acpi_wakeup_address)
return 1;
- init_low_mapping(swapper_pg_dir, USER_PTRS_PER_PGD);
+ init_low_mapping(swapper_pg_dir, USER_PGDS_IN_LAST_PML4);
memcpy((void *) acpi_wakeup_address, &wakeup_start, &wakeup_end - &wakeup_start);
acpi_copy_wakeup_routine(acpi_wakeup_address);
diff -puN arch/i386/kernel/vm86.c~4level-architecture-changes-for-i386 arch/i386/kernel/vm86.c
--- 25/arch/i386/kernel/vm86.c~4level-architecture-changes-for-i386 2004-11-03 21:53:19.563094032 -0800
+++ 25-akpm/arch/i386/kernel/vm86.c 2004-11-03 21:53:19.582091144 -0800
@@ -143,7 +143,7 @@ static void mark_screen_rdonly(struct ta
preempt_disable();
spin_lock(&tsk->mm->page_table_lock);
- pgd = pgd_offset(tsk->mm, 0xA0000);
+ pgd = pml4_pgd_offset(pml4_offset(tsk->mm, 0xa0000), 0xA0000);
if (pgd_none(*pgd))
goto out;
if (pgd_bad(*pgd)) {
diff -puN arch/i386/mm/fault.c~4level-architecture-changes-for-i386 arch/i386/mm/fault.c
--- 25/arch/i386/mm/fault.c~4level-architecture-changes-for-i386 2004-11-03 21:53:19.565093728 -0800
+++ 25-akpm/arch/i386/mm/fault.c 2004-11-03 21:53:19.583090992 -0800
@@ -523,7 +523,7 @@ vmalloc_fault:
asm("movl %%cr3,%0":"=r" (pgd_paddr));
pgd = index + (pgd_t *)__va(pgd_paddr);
- pgd_k = init_mm.pgd + index;
+ pgd_k = ((pgd_t *)(init_mm.pml4)) + index;
if (!pgd_present(*pgd_k))
goto no_context;
diff -puN arch/i386/mm/hugetlbpage.c~4level-architecture-changes-for-i386 arch/i386/mm/hugetlbpage.c
--- 25/arch/i386/mm/hugetlbpage.c~4level-architecture-changes-for-i386 2004-11-03 21:53:19.567093424 -0800
+++ 25-akpm/arch/i386/mm/hugetlbpage.c 2004-11-03 21:53:19.584090840 -0800
@@ -20,20 +20,25 @@
static pte_t *huge_pte_alloc(struct mm_struct *mm, unsigned long addr)
{
+ pml4_t *pml4;
pgd_t *pgd;
pmd_t *pmd = NULL;
- pgd = pgd_offset(mm, addr);
- pmd = pmd_alloc(mm, pgd, addr);
+ pml4 = pml4_offset(mm, addr);
+ pgd = pgd_alloc(mm, pml4, addr);
+ if (pgd)
+ pmd = pmd_alloc(mm, pgd, addr);
return (pte_t *) pmd;
}
static pte_t *huge_pte_offset(struct mm_struct *mm, unsigned long addr)
{
+ pml4_t *pml4;
pgd_t *pgd;
pmd_t *pmd = NULL;
- pgd = pgd_offset(mm, addr);
+ pml4 = pml4_offset(mm, addr);
+ pgd = pml4_pgd_offset(pml4, addr);
pmd = pmd_offset(pgd, addr);
return (pte_t *) pmd;
}
diff -puN arch/i386/mm/init.c~4level-architecture-changes-for-i386 arch/i386/mm/init.c
--- 25/arch/i386/mm/init.c~4level-architecture-changes-for-i386 2004-11-03 21:53:19.568093272 -0800
+++ 25-akpm/arch/i386/mm/init.c 2004-11-03 21:53:19.584090840 -0800
@@ -233,7 +233,7 @@ EXPORT_SYMBOL(kmap_prot);
EXPORT_SYMBOL(kmap_pte);
#define kmap_get_fixmap_pte(vaddr) \
- pte_offset_kernel(pmd_offset(pgd_offset_k(vaddr), (vaddr)), (vaddr))
+ pte_offset_kernel(pmd_offset(pml4_pgd_offset(pml4_offset_k(vaddr), vaddr), (vaddr)), (vaddr))
void __init kmap_init(void)
{
@@ -345,7 +345,7 @@ static void __init pagetable_init (void)
* All user-space mappings are explicitly cleared after
* SMP startup.
*/
- pgd_base[0] = pgd_base[USER_PTRS_PER_PGD];
+ pgd_base[0] = pgd_base[USER_PGDS_IN_LAST_PML4];
#endif
}
@@ -379,7 +379,7 @@ void zap_low_mappings (void)
* Note that "pgd_clear()" doesn't do it for
* us, because pgd_clear() is a no-op on i386.
*/
- for (i = 0; i < USER_PTRS_PER_PGD; i++)
+ for (i = 0; i < USER_PGDS_IN_LAST_PML4; i++)
#ifdef CONFIG_X86_PAE
set_pgd(swapper_pg_dir+i, __pgd(1 + __pa(empty_zero_page)));
#else
diff -puN arch/i386/mm/ioremap.c~4level-architecture-changes-for-i386 arch/i386/mm/ioremap.c
--- 25/arch/i386/mm/ioremap.c~4level-architecture-changes-for-i386 2004-11-03 21:53:19.569093120 -0800
+++ 25-akpm/arch/i386/mm/ioremap.c 2004-11-03 21:53:19.585090688 -0800
@@ -74,7 +74,7 @@ static int remap_area_pages(unsigned lon
unsigned long end = address + size;
phys_addr -= address;
- dir = pgd_offset(&init_mm, address);
+ dir = pml4_pgd_offset(pml4_offset(&init_mm, address), address);
flush_cache_all();
if (address >= end)
BUG();
diff -puN arch/i386/mm/pageattr.c~4level-architecture-changes-for-i386 arch/i386/mm/pageattr.c
--- 25/arch/i386/mm/pageattr.c~4level-architecture-changes-for-i386 2004-11-03 21:53:19.571092816 -0800
+++ 25-akpm/arch/i386/mm/pageattr.c 2004-11-03 21:53:19.585090688 -0800
@@ -19,7 +19,7 @@ static struct list_head df_list = LIST_H
pte_t *lookup_address(unsigned long address)
{
- pgd_t *pgd = pgd_offset_k(address);
+ pgd_t *pgd = pml4_pgd_offset(pml4_offset_k(address), address);
pmd_t *pmd;
if (pgd_none(*pgd))
return NULL;
@@ -92,7 +92,7 @@ static void set_pmd_pte(pte_t *kpte, uns
static inline void revert_page(struct page *kpte_page, unsigned long address)
{
pte_t *linear = (pte_t *)
- pmd_offset(pgd_offset(&init_mm, address), address);
+ pmd_offset(pml4_pgd_offset(pml4_offset_k(address), address), address);
set_pmd_pte(linear, address,
pfn_pte((__pa(address) & LARGE_PAGE_MASK) >> PAGE_SHIFT,
PAGE_KERNEL_LARGE));
diff -puN arch/i386/mm/pgtable.c~4level-architecture-changes-for-i386 arch/i386/mm/pgtable.c
--- 25/arch/i386/mm/pgtable.c~4level-architecture-changes-for-i386 2004-11-03 21:53:19.572092664 -0800
+++ 25-akpm/arch/i386/mm/pgtable.c 2004-11-03 21:53:19.586090536 -0800
@@ -199,16 +199,16 @@ void pgd_ctor(void *pgd, kmem_cache_t *c
if (PTRS_PER_PMD == 1)
spin_lock_irqsave(&pgd_lock, flags);
- memcpy((pgd_t *)pgd + USER_PTRS_PER_PGD,
- swapper_pg_dir + USER_PTRS_PER_PGD,
- (PTRS_PER_PGD - USER_PTRS_PER_PGD) * sizeof(pgd_t));
+ memcpy((pgd_t *)pgd + USER_PGDS_IN_LAST_PML4,
+ swapper_pg_dir + USER_PGDS_IN_LAST_PML4,
+ (PTRS_PER_PGD - USER_PGDS_IN_LAST_PML4) * sizeof(pgd_t));
if (PTRS_PER_PMD > 1)
return;
pgd_list_add(pgd);
spin_unlock_irqrestore(&pgd_lock, flags);
- memset(pgd, 0, USER_PTRS_PER_PGD*sizeof(pgd_t));
+ memset(pgd, 0, USER_PGDS_IN_LAST_PML4*sizeof(pgd_t));
}
/* never called when PTRS_PER_PMD > 1 */
@@ -221,7 +221,7 @@ void pgd_dtor(void *pgd, kmem_cache_t *c
spin_unlock_irqrestore(&pgd_lock, flags);
}
-pgd_t *pgd_alloc(struct mm_struct *mm)
+pgd_t *__pgd_alloc(struct mm_struct *mm, pml4_t *pml4, unsigned long address)
{
int i;
pgd_t *pgd = kmem_cache_alloc(pgd_cache, GFP_KERNEL);
@@ -229,7 +229,7 @@ pgd_t *pgd_alloc(struct mm_struct *mm)
if (PTRS_PER_PMD == 1 || !pgd)
return pgd;
- for (i = 0; i < USER_PTRS_PER_PGD; ++i) {
+ for (i = 0; i < USER_PGDS_IN_LAST_PML4; ++i) {
pmd_t *pmd = kmem_cache_alloc(pmd_cache, GFP_KERNEL);
if (!pmd)
goto out_oom;
@@ -250,7 +250,7 @@ void pgd_free(pgd_t *pgd)
/* in the PAE case user pgd entries are overwritten before usage */
if (PTRS_PER_PMD > 1)
- for (i = 0; i < USER_PTRS_PER_PGD; ++i)
+ for (i = 0; i < USER_PGDS_IN_LAST_PML4; ++i)
kmem_cache_free(pmd_cache, (void *)__va(pgd_val(pgd[i])-1));
/* in the non-PAE case, clear_page_tables() clears user pgd entries */
kmem_cache_free(pgd_cache, pgd);
diff -puN include/asm-i386/mmu_context.h~4level-architecture-changes-for-i386 include/asm-i386/mmu_context.h
--- 25/include/asm-i386/mmu_context.h~4level-architecture-changes-for-i386 2004-11-03 21:53:19.574092360 -0800
+++ 25-akpm/include/asm-i386/mmu_context.h 2004-11-03 21:53:19.587090384 -0800
@@ -39,7 +39,7 @@ static inline void switch_mm(struct mm_s
cpu_set(cpu, next->cpu_vm_mask);
/* Re-load page tables */
- load_cr3(next->pgd);
+ load_cr3(next->pml4);
/*
* load the LDT, if the LDT is different:
@@ -56,7 +56,7 @@ static inline void switch_mm(struct mm_s
/* We were in lazy tlb mode and leave_mm disabled
* tlb flush IPI delivery. We must reload %cr3.
*/
- load_cr3(next->pgd);
+ load_cr3(next->pml4);
load_LDT_nolock(&next->context, cpu);
}
}
diff -puN include/asm-i386/page.h~4level-architecture-changes-for-i386 include/asm-i386/page.h
--- 25/include/asm-i386/page.h~4level-architecture-changes-for-i386 2004-11-03 21:53:19.575092208 -0800
+++ 25-akpm/include/asm-i386/page.h 2004-11-03 21:53:19.587090384 -0800
@@ -147,6 +147,8 @@ extern int sysctl_legacy_va_layout;
((current->personality & READ_IMPLIES_EXEC) ? VM_EXEC : 0 ) | \
VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
+#include <asm-generic/nopml4-page.h>
+
#endif /* __KERNEL__ */
#endif /* _I386_PAGE_H */
diff -puN include/asm-i386/pgalloc.h~4level-architecture-changes-for-i386 include/asm-i386/pgalloc.h
--- 25/include/asm-i386/pgalloc.h~4level-architecture-changes-for-i386 2004-11-03 21:53:19.577091904 -0800
+++ 25-akpm/include/asm-i386/pgalloc.h 2004-11-03 21:53:19.588090232 -0800
@@ -20,9 +20,6 @@ static inline void pmd_populate(struct m
* Allocate and free page tables.
*/
-extern pgd_t *pgd_alloc(struct mm_struct *);
-extern void pgd_free(pgd_t *pgd);
-
extern pte_t *pte_alloc_one_kernel(struct mm_struct *, unsigned long);
extern struct page *pte_alloc_one(struct mm_struct *, unsigned long);
@@ -52,4 +49,8 @@ static inline void pte_free(struct page
#define check_pgt_cache() do { } while (0)
+extern void pgd_free(pgd_t *);
+
+#include <asm-generic/nopml4-pgalloc.h>
+
#endif /* _I386_PGALLOC_H */
diff -puN include/asm-i386/pgtable.h~4level-architecture-changes-for-i386 include/asm-i386/pgtable.h
--- 25/include/asm-i386/pgtable.h~4level-architecture-changes-for-i386 2004-11-03 21:53:19.578091752 -0800
+++ 25-akpm/include/asm-i386/pgtable.h 2004-11-03 21:53:19.588090232 -0800
@@ -59,7 +59,7 @@ 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 USER_PGDS_IN_LAST_PML4 (TASK_SIZE/PGDIR_SIZE)
#define FIRST_USER_PGD_NR 0
#define USER_PGD_PTRS (PAGE_OFFSET >> PGDIR_SHIFT)
@@ -311,17 +311,7 @@ static inline pte_t pte_modify(pte_t pte
*/
#define pgd_index(address) (((address) >> PGDIR_SHIFT) & (PTRS_PER_PGD-1))
-/*
- * pgd_offset() returns a (pgd_t *)
- * pgd_index() is used get the offset into the pgd page's array of pgd_t's;
- */
-#define pgd_offset(mm, address) ((mm)->pgd+pgd_index(address))
-
-/*
- * a shortcut which implies the use of the kernel's pgd, instead
- * of a process's
- */
-#define pgd_offset_k(address) pgd_offset(&init_mm, address)
+#define pgd_index_k(addr) pgd_index(addr)
/*
* the pmd page can be thought of an array like this: pmd_t[PTRS_PER_PMD]
@@ -415,4 +405,6 @@ extern pte_t *lookup_address(unsigned lo
#define __HAVE_ARCH_PTE_SAME
#include <asm-generic/pgtable.h>
+#include <asm-generic/nopml4-pgtable.h>
+
#endif /* _I386_PGTABLE_H */
_