UML - pml4 support
PATCH 1/1 UML - pml4 support
This patch adds stub pml4 support to UML.
Signed-off-by Jeff Dike <[email protected]>
arch/um/kernel/mem.c +8 -6
@@ -140,7 +140,8 @@pgprot_t kmap_prot;#define kmap_get_fixmap_pte (vaddr) \ - pte_offset(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 ) {
@@ -285,15 +286,16 @@* Allocate and free page tables. */ -pgd_t *pgd_alloc (struct mm_struct *mm) +pgd_t *__pgd_alloc (struct mm_struct *mm,pml4_t *pml4,unsigned long address) {pgd_t *pgd = (pgd_t *)__get_free_page (GFP_KERNEL );if (pgd) { -memset (pgd,0 ,USER_PTRS_PER_PGD *sizeof (pgd_t)); -memcpy (pgd +USER_PTRS_PER_PGD , - swapper_pg_dir +USER_PTRS_PER_PGD , - (PTRS_PER_PGD -USER_PTRS_PER_PGD ) *sizeof (pgd_t)); +memset (pgd,0 ,USER_PGDS_IN_LAST_PML4 *sizeof (pgd_t)); +memcpy (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)); }return pgd; }
arch/um/kernel/process_kern.c +1 -1
@@ -239,7 +239,7 @@if (task->mm ==NULL )return (ERR_PTR (-EINVAL )); - pgd =pgd_offset (task->mm, addr); + pgd =pml4_pgd_offset (pml4_offset (task->mm, addr), addr); pmd =pmd_offset (pgd, addr);if (!pmd_present (*pmd))return (ERR_PTR (-EINVAL ));
arch/um/kernel/skas/tlb.c +2 -2
@@ -26,7 +26,7 @@if (mm ==NULL )return ; fd = mm->context.skas.mm_fd;for (addr = start_addr; addr < end_addr;){ - npgd =pgd_offset (mm, addr); + npgd =pml4_pgd_offset (pml4_offset (mm, addr), addr); npmd =pmd_offset (npgd, addr);if (pmd_present (*npmd)){ npte =pte_offset_kernel (npmd, addr);
@@ -78,7 +78,7 @@ mm = &init_mm;for (addr = start; addr < end;){ - pgd =pgd_offset (mm, addr); + pgd =pml4_pgd_offset (pml4_offset (mm, addr), addr); pmd =pmd_offset (pgd, addr);if (pmd_present (*pmd)){ pte =pte_offset_kernel (pmd, addr);
arch/um/kernel/tlb.c +3 -3
@@ -56,7 +56,7 @@pgd_t *pgd_offset_proc (struct mm_struct *mm,unsigned long address) { -return (pgd_offset (mm, address)); +return (pml4_pgd_offset (pml4_offset (mm, address), address)); }pmd_t *pmd_offset_proc (pgd_t *pgd,unsigned long address)
@@ -71,8 +71,8 @@pte_t *addr_pte (struct task_struct *task,unsigned long addr) { -return (pte_offset_kernel (pmd_offset (pgd_offset (task->mm, addr), addr), - addr)); +return (pte_offset_kernel (pmd_offset (pgd_offset_proc (task->mm, addr), + addr), addr)); }/*
arch/um/kernel/trap_kern.c +1 -1
@@ -57,7 +57,7 @@if (is_write && !(vma->vm_flags &VM_WRITE )) goto out; page = address &PAGE_MASK ; - pgd =pgd_offset (mm, page); + pgd =pml4_pgd_offset (pml4_offset (mm, page), page); pmd =pmd_offset (pgd, page); do { survive:
arch/um/kernel/tt/tlb.c +3 -3
@@ -41,7 +41,7 @@ addr =STACK_TOP -ABOVE_KMEM ;continue ; } - npgd =pgd_offset (mm, addr); + npgd =pml4_pgd_offset (pml4_offset (mm, addr), addr); npmd =pmd_offset (npgd, addr);if (pmd_present (*npmd)){ npte =pte_offset_kernel (npmd, addr);
@@ -97,7 +97,7 @@ mm = &init_mm;for (addr = start; addr < end;){ - pgd =pgd_offset (mm, addr); + pgd =pml4_pgd_offset (pml4_offset (mm, addr), addr); pmd =pmd_offset (pgd, addr);if (pmd_present (*pmd)){ pte =pte_offset_kernel (pmd, addr);
@@ -161,7 +161,7 @@ mm = &init_mm;for (addr = start_vm; addr < end_vm;){ - pgd =pgd_offset (mm, addr); + pgd =pml4_pgd_offset (pml4_offset (mm, addr), addr); pmd =pmd_offset (pgd, addr);if (pmd_present (*pmd)){ pte =pte_offset_kernel (pmd, addr);
include/asm-um/page.h +2 -0
@@ -50,4 +50,6 @@extern void arch_free_page (struct page *page,int order);#define HAVE_ARCH_FREE_PAGE +#include <asm-generic/nopml4-page.h> +#endif
include/asm-um/pgalloc.h +4 -3
@@ -19,9 +19,6 @@set_pmd (pmd,__pmd (_PAGE_TABLE +page_to_phys (pte))); } -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 );
@@ -49,6 +46,10 @@#define check_pgt_cache () do { } while (0) +extern void pgd_free (pgd_t *pgd); + +#include <asm-generic/nopml4-pgalloc.h> +#endif /*
include/asm-um/pgtable.h +4 -14
@@ -37,7 +37,7 @@#define PTRS_PER_PTE 1024#define PTRS_PER_PMD 1#define PTRS_PER_PGD 1024 -#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 pte_ERROR (e) \
@@ -372,19 +372,7 @@*/ #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 + ((address) >> PGDIR_SHIFT)) - - -/* -* 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)#define pmd_index (address) \ (((address) >> PMD_SHIFT) & (PTRS_PER_PMD-1))
@@ -427,6 +415,8 @@#include <asm-generic/pgtable.h> +#include <asm-generic/nopml4-pgtable.h> +#endif #endif