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

Commit f7b6eb3f authored by Peter Zijlstra's avatar Peter Zijlstra Committed by Ingo Molnar
Browse files

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: default avatarPeter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
LKML-Reference: <new-submission>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent cf1f4574

arch/x86/vdso/vdso32-setup.c

+5 −1
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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;