diff options
| author | Christophe Leroy <christophe.leroy@csgroup.eu> | 2020-09-27 12:16:30 +0300 |
|---|---|---|
| committer | Michael Ellerman <mpe@ellerman.id.au> | 2020-12-03 17:01:17 +0300 |
| commit | 511157ab641eb6bedd00d62673388e78a4f871cf (patch) | |
| tree | 0567b070b65c428e2f1b61c5c6c095b50ecbdbe4 | |
| parent | c102f07667486dc4a6ae1e3fe7aa67135cb40e3e (diff) | |
| download | linux-511157ab641eb6bedd00d62673388e78a4f871cf.tar.xz | |
powerpc/vdso: Move vdso datapage up front
Move the vdso datapage in front of the VDSO area,
before vdso test.
This will allow to remove the __kernel_datapage_offset symbol
and simplify __get_datapage() in following patches.
Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/b68c99b6e8ee0b1d99bfa4c7e34c359fc1bc1000.1601197618.git.christophe.leroy@csgroup.eu
| -rw-r--r-- | arch/powerpc/include/asm/mmu_context.h | 2 | ||||
| -rw-r--r-- | arch/powerpc/kernel/vdso.c | 14 |
2 files changed, 8 insertions, 8 deletions
diff --git a/arch/powerpc/include/asm/mmu_context.h b/arch/powerpc/include/asm/mmu_context.h index d54358cb5be1..e5a5e3cb7724 100644 --- a/arch/powerpc/include/asm/mmu_context.h +++ b/arch/powerpc/include/asm/mmu_context.h @@ -262,7 +262,7 @@ extern void arch_exit_mmap(struct mm_struct *mm); static inline void arch_unmap(struct mm_struct *mm, unsigned long start, unsigned long end) { - unsigned long vdso_base = (unsigned long)mm->context.vdso; + unsigned long vdso_base = (unsigned long)mm->context.vdso - PAGE_SIZE; if (start <= vdso_base && vdso_base < end) mm->context.vdso = NULL; diff --git a/arch/powerpc/kernel/vdso.c b/arch/powerpc/kernel/vdso.c index 5214cd4909f8..e10bc0d9856c 100644 --- a/arch/powerpc/kernel/vdso.c +++ b/arch/powerpc/kernel/vdso.c @@ -123,7 +123,7 @@ static int vdso_mremap(const struct vm_special_mapping *sm, struct vm_area_struc if (new_size != text_size + PAGE_SIZE) return -EINVAL; - current->mm->context.vdso = (void __user *)new_vma->vm_start; + current->mm->context.vdso = (void __user *)new_vma->vm_start + PAGE_SIZE; return 0; } @@ -198,7 +198,7 @@ static int __arch_setup_additional_pages(struct linux_binprm *bprm, int uses_int * install_special_mapping or the perf counter mmap tracking code * will fail to recognise it as a vDSO. */ - mm->context.vdso = (void __user *)vdso_base; + mm->context.vdso = (void __user *)vdso_base + PAGE_SIZE; /* * our vma flags don't have VM_WRITE so by default, the process isn't @@ -507,7 +507,7 @@ static __init int vdso_fixup_datapage(struct lib32_elfinfo *v32, return -1; } *((int *)(vdso64_kbase + sym64->st_value - VDSO64_LBASE)) = - (vdso64_pages << PAGE_SHIFT) - + -PAGE_SIZE - (sym64->st_value - VDSO64_LBASE); #endif /* CONFIG_PPC64 */ @@ -519,7 +519,7 @@ static __init int vdso_fixup_datapage(struct lib32_elfinfo *v32, return -1; } *((int *)(vdso32_kbase + (sym32->st_value - VDSO32_LBASE))) = - (vdso32_pages << PAGE_SHIFT) - + -PAGE_SIZE - (sym32->st_value - VDSO32_LBASE); #endif @@ -693,10 +693,10 @@ static struct page ** __init vdso_setup_pages(void *start, void *end) if (!pagelist) panic("%s: Cannot allocate page list for VDSO", __func__); - for (i = 0; i < pages; i++) - pagelist[i] = virt_to_page(start + i * PAGE_SIZE); + pagelist[0] = virt_to_page(vdso_data); - pagelist[i] = virt_to_page(vdso_data); + for (i = 0; i < pages; i++) + pagelist[i + 1] = virt_to_page(start + i * PAGE_SIZE); return pagelist; } |