547ee84cea
This patch reworks the way the ppc64 is mapped in user memory by the kernel to make it more robust against possible collisions with executable segments. Instead of just whacking a VMA at 1Mb, I now use get_unmapped_area() with a hint, and I moved the mapping of the vDSO to after the mapping of the various ELF segments and of the interpreter, so that conflicts get caught properly (it still has to be before create_elf_tables since the later will fill the AT_SYSINFO_EHDR with the proper address). While I was at it, I also changed the 32 and 64 bits vDSO's to link at their "natural" address of 1Mb instead of 0. This is the address where they are normally mapped in absence of conflict. By doing so, it should be possible to properly prelink one it's been verified to work on glibc. Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
83 lines
1.6 KiB
C
83 lines
1.6 KiB
C
#ifndef __PPC64_VDSO_H__
|
|
#define __PPC64_VDSO_H__
|
|
|
|
#ifdef __KERNEL__
|
|
|
|
/* Default link addresses for the vDSOs */
|
|
#define VDSO32_LBASE 0x100000
|
|
#define VDSO64_LBASE 0x100000
|
|
|
|
/* Default map addresses */
|
|
#define VDSO32_MBASE VDSO32_LBASE
|
|
#define VDSO64_MBASE VDSO64_LBASE
|
|
|
|
#define VDSO_VERSION_STRING LINUX_2.6.12
|
|
|
|
/* Define if 64 bits VDSO has procedure descriptors */
|
|
#undef VDS64_HAS_DESCRIPTORS
|
|
|
|
#ifndef __ASSEMBLY__
|
|
|
|
extern unsigned int vdso64_pages;
|
|
extern unsigned int vdso32_pages;
|
|
|
|
/* Offsets relative to thread->vdso_base */
|
|
extern unsigned long vdso64_rt_sigtramp;
|
|
extern unsigned long vdso32_sigtramp;
|
|
extern unsigned long vdso32_rt_sigtramp;
|
|
|
|
extern void vdso_init(void);
|
|
|
|
#else /* __ASSEMBLY__ */
|
|
|
|
#ifdef __VDSO64__
|
|
#ifdef VDS64_HAS_DESCRIPTORS
|
|
#define V_FUNCTION_BEGIN(name) \
|
|
.globl name; \
|
|
.section ".opd","a"; \
|
|
.align 3; \
|
|
name: \
|
|
.quad .name,.TOC.@tocbase,0; \
|
|
.previous; \
|
|
.globl .name; \
|
|
.type .name,@function; \
|
|
.name: \
|
|
|
|
#define V_FUNCTION_END(name) \
|
|
.size .name,.-.name;
|
|
|
|
#define V_LOCAL_FUNC(name) (.name)
|
|
|
|
#else /* VDS64_HAS_DESCRIPTORS */
|
|
|
|
#define V_FUNCTION_BEGIN(name) \
|
|
.globl name; \
|
|
name: \
|
|
|
|
#define V_FUNCTION_END(name) \
|
|
.size name,.-name;
|
|
|
|
#define V_LOCAL_FUNC(name) (name)
|
|
|
|
#endif /* VDS64_HAS_DESCRIPTORS */
|
|
#endif /* __VDSO64__ */
|
|
|
|
#ifdef __VDSO32__
|
|
|
|
#define V_FUNCTION_BEGIN(name) \
|
|
.globl name; \
|
|
.type name,@function; \
|
|
name: \
|
|
|
|
#define V_FUNCTION_END(name) \
|
|
.size name,.-name;
|
|
|
|
#define V_LOCAL_FUNC(name) (name)
|
|
|
|
#endif /* __VDSO32__ */
|
|
|
|
#endif /* __ASSEMBLY__ */
|
|
|
|
#endif /* __KERNEL__ */
|
|
|
|
#endif /* __PPC64_VDSO_H__ */
|