x86: Set context.vdso before installing the mapping
Commit-ID: f7b6eb3fa07269da20dbbde8ba37a0273fdbd9c9 Gitweb: http://git.kernel.org/tip/f7b6eb3fa07269da20dbbde8ba37a0273fdbd9c9 Author: Peter Zijlstra <[email protected]> AuthorDate: Fri, 5 Jun 2009 14:04:51 +0200 Committer: Ingo Molnar <[email protected]> CommitDate: Fri, 5 Jun 2009 14:46:40 +0200
x86: Set context.vdso before installing the mapping
In order to make arch_vma_name() work from inside install_special_mapping() we need to set the context.vdso before calling it.
( This is needed for performance counters to be able to track
this special executable area. )
Signed-off-by Peter Zijlstra <[email protected]>
Cc Mike Galbraith <[email protected]>
Cc Paul Mackerras <[email protected]>
Cc Arnaldo Carvalho de Melo <[email protected]>
LKML-Reference: <new-submission>
Signed-off-by Ingo Molnar <[email protected]>
--- arch/x86/vdso/vdso32-setup.c | 6 +++++- arch/x86/vdso/vma.c | 7 +++++-- 2 files changed, 10 insertions(+), 3 deletions(-)
arch/x86/vdso/vdso32-setup.c +5 -1
@@ -338,6 +338,8 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp) } } + current->mm->context.vdso = (void *)addr; +if (compat_uses_vma || !compat) {/* * MAYWRITE to allow gdb to COW and set breakpoints
@@ -358,11 +360,13 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp) goto up_fail; } - current->mm->context.vdso = (void *)addr;current_thread_info ()->sysenter_return =VDSO32_SYMBOL (addr,SYSENTER_RETURN ); up_fail: +if (ret) + current->mm->context.vdso =NULL ; +up_write (&mm->mmap_sem);return ret;
arch/x86/vdso/vma.c +5 -2
@@ -115,15 +115,18 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp) goto up_fail; } + current->mm->context.vdso = (void *)addr; + ret =install_special_mapping (mm, addr, vdso_size,VM_READ |VM_EXEC |VM_MAYREAD |VM_MAYWRITE |VM_MAYEXEC |VM_ALWAYSDUMP , vdso_pages); -if (ret) +if (ret) { + current->mm->context.vdso =NULL ; goto up_fail; + } - current->mm->context.vdso = (void *)addr; up_fail:up_write (&mm->mmap_sem);return ret;