2008-10-22 23:26:29 -06:00
|
|
|
#ifndef _ASM_X86_ELF_H
|
|
|
|
#define _ASM_X86_ELF_H
|
2007-10-23 14:37:23 -06:00
|
|
|
|
|
|
|
/*
|
|
|
|
* ELF register definitions..
|
|
|
|
*/
|
2011-08-05 07:15:08 -06:00
|
|
|
#include <linux/thread_info.h>
|
2007-10-23 14:37:23 -06:00
|
|
|
|
|
|
|
#include <asm/ptrace.h>
|
|
|
|
#include <asm/user.h>
|
|
|
|
#include <asm/auxvec.h>
|
|
|
|
|
|
|
|
typedef unsigned long elf_greg_t;
|
|
|
|
|
2008-03-23 02:02:08 -06:00
|
|
|
#define ELF_NGREG (sizeof(struct user_regs_struct) / sizeof(elf_greg_t))
|
2007-10-23 14:37:23 -06:00
|
|
|
typedef elf_greg_t elf_gregset_t[ELF_NGREG];
|
|
|
|
|
|
|
|
typedef struct user_i387_struct elf_fpregset_t;
|
|
|
|
|
|
|
|
#ifdef __i386__
|
|
|
|
|
|
|
|
typedef struct user_fxsr_struct elf_fpxregset_t;
|
|
|
|
|
|
|
|
#define R_386_NONE 0
|
|
|
|
#define R_386_32 1
|
|
|
|
#define R_386_PC32 2
|
|
|
|
#define R_386_GOT32 3
|
|
|
|
#define R_386_PLT32 4
|
|
|
|
#define R_386_COPY 5
|
|
|
|
#define R_386_GLOB_DAT 6
|
|
|
|
#define R_386_JMP_SLOT 7
|
|
|
|
#define R_386_RELATIVE 8
|
|
|
|
#define R_386_GOTOFF 9
|
|
|
|
#define R_386_GOTPC 10
|
|
|
|
#define R_386_NUM 11
|
|
|
|
|
|
|
|
/*
|
|
|
|
* These are used to set parameters in the core dumps.
|
|
|
|
*/
|
|
|
|
#define ELF_CLASS ELFCLASS32
|
|
|
|
#define ELF_DATA ELFDATA2LSB
|
|
|
|
#define ELF_ARCH EM_386
|
|
|
|
|
2007-10-11 03:20:03 -06:00
|
|
|
#else
|
2007-10-23 14:37:23 -06:00
|
|
|
|
|
|
|
/* x86-64 relocation types */
|
|
|
|
#define R_X86_64_NONE 0 /* No reloc */
|
|
|
|
#define R_X86_64_64 1 /* Direct 64 bit */
|
|
|
|
#define R_X86_64_PC32 2 /* PC relative 32 bit signed */
|
|
|
|
#define R_X86_64_GOT32 3 /* 32 bit GOT entry */
|
|
|
|
#define R_X86_64_PLT32 4 /* 32 bit PLT address */
|
|
|
|
#define R_X86_64_COPY 5 /* Copy symbol at runtime */
|
|
|
|
#define R_X86_64_GLOB_DAT 6 /* Create GOT entry */
|
|
|
|
#define R_X86_64_JUMP_SLOT 7 /* Create PLT entry */
|
|
|
|
#define R_X86_64_RELATIVE 8 /* Adjust by program base */
|
|
|
|
#define R_X86_64_GOTPCREL 9 /* 32 bit signed pc relative
|
|
|
|
offset to GOT */
|
|
|
|
#define R_X86_64_32 10 /* Direct 32 bit zero extended */
|
|
|
|
#define R_X86_64_32S 11 /* Direct 32 bit sign extended */
|
|
|
|
#define R_X86_64_16 12 /* Direct 16 bit zero extended */
|
|
|
|
#define R_X86_64_PC16 13 /* 16 bit sign extended pc relative */
|
|
|
|
#define R_X86_64_8 14 /* Direct 8 bit sign extended */
|
|
|
|
#define R_X86_64_PC8 15 /* 8 bit sign extended pc relative */
|
|
|
|
|
|
|
|
#define R_X86_64_NUM 16
|
|
|
|
|
|
|
|
/*
|
|
|
|
* These are used to set parameters in the core dumps.
|
|
|
|
*/
|
|
|
|
#define ELF_CLASS ELFCLASS64
|
|
|
|
#define ELF_DATA ELFDATA2LSB
|
|
|
|
#define ELF_ARCH EM_X86_64
|
|
|
|
|
|
|
|
#endif
|
|
|
|
|
2008-01-30 05:31:55 -07:00
|
|
|
#include <asm/vdso.h>
|
|
|
|
|
2014-05-05 13:19:32 -06:00
|
|
|
#ifdef CONFIG_X86_64
|
|
|
|
extern unsigned int vdso64_enabled;
|
|
|
|
#endif
|
|
|
|
#if defined(CONFIG_X86_32) || defined(CONFIG_COMPAT)
|
|
|
|
extern unsigned int vdso32_enabled;
|
|
|
|
#endif
|
2007-10-23 14:37:23 -06:00
|
|
|
|
2008-01-30 05:30:43 -07:00
|
|
|
/*
|
|
|
|
* This is used to ensure we don't load something for the wrong architecture.
|
|
|
|
*/
|
|
|
|
#define elf_check_arch_ia32(x) \
|
|
|
|
(((x)->e_machine == EM_386) || ((x)->e_machine == EM_486))
|
|
|
|
|
2007-10-23 14:37:23 -06:00
|
|
|
#include <asm/processor.h>
|
2008-03-09 13:35:00 -06:00
|
|
|
|
|
|
|
#ifdef CONFIG_X86_32
|
2007-10-23 14:37:23 -06:00
|
|
|
#include <asm/desc.h>
|
|
|
|
|
2008-01-30 05:30:43 -07:00
|
|
|
#define elf_check_arch(x) elf_check_arch_ia32(x)
|
2007-10-23 14:37:23 -06:00
|
|
|
|
|
|
|
/* SVR4/i386 ABI (pages 3-31, 3-32) says that when the program starts %edx
|
|
|
|
contains a pointer to a function which might be registered using `atexit'.
|
|
|
|
This provides a mean for the dynamic linker to call DT_FINI functions for
|
|
|
|
shared libraries that have been loaded before the code runs.
|
|
|
|
|
|
|
|
A value of 0 tells we have no such handler.
|
|
|
|
|
|
|
|
We might as well make sure everything else is cleared too (except for %esp),
|
|
|
|
just to make things more deterministic.
|
|
|
|
*/
|
2008-03-23 02:02:08 -06:00
|
|
|
#define ELF_PLAT_INIT(_r, load_addr) \
|
|
|
|
do { \
|
|
|
|
_r->bx = 0; _r->cx = 0; _r->dx = 0; \
|
|
|
|
_r->si = 0; _r->di = 0; _r->bp = 0; \
|
|
|
|
_r->ax = 0; \
|
2007-10-23 14:37:23 -06:00
|
|
|
} while (0)
|
|
|
|
|
2008-01-30 05:33:16 -07:00
|
|
|
/*
|
|
|
|
* regs is struct pt_regs, pr_reg is elf_gregset_t (which is
|
|
|
|
* now struct_user_regs, they are different)
|
|
|
|
*/
|
|
|
|
|
2009-02-09 06:17:40 -07:00
|
|
|
#define ELF_CORE_COPY_REGS_COMMON(pr_reg, regs) \
|
2008-03-23 02:02:08 -06:00
|
|
|
do { \
|
|
|
|
pr_reg[0] = regs->bx; \
|
|
|
|
pr_reg[1] = regs->cx; \
|
|
|
|
pr_reg[2] = regs->dx; \
|
|
|
|
pr_reg[3] = regs->si; \
|
|
|
|
pr_reg[4] = regs->di; \
|
|
|
|
pr_reg[5] = regs->bp; \
|
|
|
|
pr_reg[6] = regs->ax; \
|
|
|
|
pr_reg[7] = regs->ds & 0xffff; \
|
|
|
|
pr_reg[8] = regs->es & 0xffff; \
|
|
|
|
pr_reg[9] = regs->fs & 0xffff; \
|
|
|
|
pr_reg[11] = regs->orig_ax; \
|
|
|
|
pr_reg[12] = regs->ip; \
|
|
|
|
pr_reg[13] = regs->cs & 0xffff; \
|
|
|
|
pr_reg[14] = regs->flags; \
|
|
|
|
pr_reg[15] = regs->sp; \
|
|
|
|
pr_reg[16] = regs->ss & 0xffff; \
|
2008-01-30 05:33:16 -07:00
|
|
|
} while (0);
|
|
|
|
|
2009-02-09 06:17:40 -07:00
|
|
|
#define ELF_CORE_COPY_REGS(pr_reg, regs) \
|
|
|
|
do { \
|
|
|
|
ELF_CORE_COPY_REGS_COMMON(pr_reg, regs);\
|
|
|
|
pr_reg[10] = get_user_gs(regs); \
|
|
|
|
} while (0);
|
|
|
|
|
|
|
|
#define ELF_CORE_COPY_KERNEL_REGS(pr_reg, regs) \
|
|
|
|
do { \
|
|
|
|
ELF_CORE_COPY_REGS_COMMON(pr_reg, regs);\
|
|
|
|
savesegment(gs, pr_reg[10]); \
|
|
|
|
} while (0);
|
|
|
|
|
2007-10-23 14:37:23 -06:00
|
|
|
#define ELF_PLATFORM (utsname()->machine)
|
|
|
|
#define set_personality_64bit() do { } while (0)
|
|
|
|
|
|
|
|
#else /* CONFIG_X86_32 */
|
|
|
|
|
|
|
|
/*
|
|
|
|
* This is used to ensure we don't load something for the wrong architecture.
|
|
|
|
*/
|
2008-03-23 02:02:08 -06:00
|
|
|
#define elf_check_arch(x) \
|
2007-10-23 14:37:23 -06:00
|
|
|
((x)->e_machine == EM_X86_64)
|
|
|
|
|
2014-09-07 14:05:05 -06:00
|
|
|
#define compat_elf_check_arch(x) \
|
|
|
|
(elf_check_arch_ia32(x) || \
|
|
|
|
(IS_ENABLED(CONFIG_X86_X32_ABI) && (x)->e_machine == EM_X86_64))
|
2012-02-19 11:06:34 -07:00
|
|
|
|
|
|
|
#if __USER32_DS != __USER_DS
|
|
|
|
# error "The following code assumes __USER32_DS == __USER_DS"
|
|
|
|
#endif
|
2008-01-30 05:31:55 -07:00
|
|
|
|
|
|
|
static inline void elf_common_init(struct thread_struct *t,
|
|
|
|
struct pt_regs *regs, const u16 ds)
|
|
|
|
{
|
2015-04-04 12:55:19 -06:00
|
|
|
/* Commented-out registers are cleared in stub_execve */
|
|
|
|
/*regs->ax = regs->bx =*/ regs->cx = regs->dx = 0;
|
|
|
|
regs->si = regs->di /*= regs->bp*/ = 0;
|
2008-01-30 05:31:55 -07:00
|
|
|
regs->r8 = regs->r9 = regs->r10 = regs->r11 = 0;
|
2015-04-04 12:55:19 -06:00
|
|
|
/*regs->r12 = regs->r13 = regs->r14 = regs->r15 = 0;*/
|
2008-01-30 05:31:55 -07:00
|
|
|
t->fs = t->gs = 0;
|
|
|
|
t->fsindex = t->gsindex = 0;
|
|
|
|
t->ds = t->es = ds;
|
|
|
|
}
|
|
|
|
|
2008-03-23 02:02:08 -06:00
|
|
|
#define ELF_PLAT_INIT(_r, load_addr) \
|
2010-02-16 07:24:01 -07:00
|
|
|
elf_common_init(¤t->thread, _r, 0)
|
2007-10-23 14:37:23 -06:00
|
|
|
|
2008-03-23 02:02:08 -06:00
|
|
|
#define COMPAT_ELF_PLAT_INIT(regs, load_addr) \
|
2008-01-30 05:31:55 -07:00
|
|
|
elf_common_init(¤t->thread, regs, __USER_DS)
|
2008-03-23 02:02:08 -06:00
|
|
|
|
2015-06-22 05:55:13 -06:00
|
|
|
void compat_start_thread(struct pt_regs *regs, u32 new_ip, u32 new_sp);
|
|
|
|
#define compat_start_thread compat_start_thread
|
2008-03-23 02:02:08 -06:00
|
|
|
|
2012-02-19 11:06:34 -07:00
|
|
|
void set_personality_ia32(bool);
|
|
|
|
#define COMPAT_SET_PERSONALITY(ex) \
|
|
|
|
set_personality_ia32((ex).e_machine == EM_X86_64)
|
2008-03-23 02:02:08 -06:00
|
|
|
|
2008-01-30 05:31:55 -07:00
|
|
|
#define COMPAT_ELF_PLATFORM ("i686")
|
|
|
|
|
2008-01-30 05:33:16 -07:00
|
|
|
/*
|
|
|
|
* regs is struct pt_regs, pr_reg is elf_gregset_t (which is
|
|
|
|
* now struct_user_regs, they are different). Assumes current is the process
|
|
|
|
* getting dumped.
|
|
|
|
*/
|
|
|
|
|
2008-03-23 02:02:08 -06:00
|
|
|
#define ELF_CORE_COPY_REGS(pr_reg, regs) \
|
|
|
|
do { \
|
2008-01-30 05:33:16 -07:00
|
|
|
unsigned v; \
|
|
|
|
(pr_reg)[0] = (regs)->r15; \
|
|
|
|
(pr_reg)[1] = (regs)->r14; \
|
|
|
|
(pr_reg)[2] = (regs)->r13; \
|
|
|
|
(pr_reg)[3] = (regs)->r12; \
|
|
|
|
(pr_reg)[4] = (regs)->bp; \
|
|
|
|
(pr_reg)[5] = (regs)->bx; \
|
|
|
|
(pr_reg)[6] = (regs)->r11; \
|
|
|
|
(pr_reg)[7] = (regs)->r10; \
|
|
|
|
(pr_reg)[8] = (regs)->r9; \
|
|
|
|
(pr_reg)[9] = (regs)->r8; \
|
|
|
|
(pr_reg)[10] = (regs)->ax; \
|
|
|
|
(pr_reg)[11] = (regs)->cx; \
|
|
|
|
(pr_reg)[12] = (regs)->dx; \
|
|
|
|
(pr_reg)[13] = (regs)->si; \
|
|
|
|
(pr_reg)[14] = (regs)->di; \
|
|
|
|
(pr_reg)[15] = (regs)->orig_ax; \
|
|
|
|
(pr_reg)[16] = (regs)->ip; \
|
|
|
|
(pr_reg)[17] = (regs)->cs; \
|
|
|
|
(pr_reg)[18] = (regs)->flags; \
|
|
|
|
(pr_reg)[19] = (regs)->sp; \
|
|
|
|
(pr_reg)[20] = (regs)->ss; \
|
|
|
|
(pr_reg)[21] = current->thread.fs; \
|
|
|
|
(pr_reg)[22] = current->thread.gs; \
|
|
|
|
asm("movl %%ds,%0" : "=r" (v)); (pr_reg)[23] = v; \
|
|
|
|
asm("movl %%es,%0" : "=r" (v)); (pr_reg)[24] = v; \
|
|
|
|
asm("movl %%fs,%0" : "=r" (v)); (pr_reg)[25] = v; \
|
|
|
|
asm("movl %%gs,%0" : "=r" (v)); (pr_reg)[26] = v; \
|
|
|
|
} while (0);
|
|
|
|
|
2007-10-23 14:37:23 -06:00
|
|
|
/* I'm not sure if we can use '-' here */
|
|
|
|
#define ELF_PLATFORM ("x86_64")
|
|
|
|
extern void set_personality_64bit(void);
|
2008-01-30 05:31:55 -07:00
|
|
|
extern unsigned int sysctl_vsyscall32;
|
|
|
|
extern int force_personality32;
|
2007-10-23 14:37:23 -06:00
|
|
|
|
|
|
|
#endif /* !CONFIG_X86_32 */
|
|
|
|
|
2008-01-30 05:31:54 -07:00
|
|
|
#define CORE_DUMP_USE_REGSET
|
2007-10-23 14:37:23 -06:00
|
|
|
#define ELF_EXEC_PAGESIZE 4096
|
|
|
|
|
|
|
|
/* This is the location that an ET_DYN program is loaded if exec'ed. Typical
|
|
|
|
use of this is to invoke "./ld.so someprog" to test out a new version of
|
|
|
|
the loader. We need to make sure that it is out of the way of the program
|
|
|
|
that it will "exec", and that there is sufficient room for the brk. */
|
|
|
|
|
|
|
|
#define ELF_ET_DYN_BASE (TASK_SIZE / 3 * 2)
|
|
|
|
|
|
|
|
/* This yields a mask that user programs can use to figure out what
|
|
|
|
instruction set this CPU supports. This could be done in user space,
|
|
|
|
but it's not easy, and we've already done it here. */
|
|
|
|
|
|
|
|
#define ELF_HWCAP (boot_cpu_data.x86_capability[0])
|
|
|
|
|
|
|
|
/* This yields a string that ld.so will use to load implementation
|
|
|
|
specific libraries for optimization. This is more specific in
|
|
|
|
intent than poking at uname or /proc/cpuinfo.
|
|
|
|
|
|
|
|
For the moment, we have only optimizations for the Intel generations,
|
|
|
|
but that could change... */
|
|
|
|
|
2008-10-16 07:39:57 -06:00
|
|
|
#define SET_PERSONALITY(ex) set_personality_64bit()
|
2007-10-23 14:37:23 -06:00
|
|
|
|
|
|
|
/*
|
|
|
|
* An executable for which elf_read_implies_exec() returns TRUE will
|
|
|
|
* have the READ_IMPLIES_EXEC personality flag set automatically.
|
|
|
|
*/
|
|
|
|
#define elf_read_implies_exec(ex, executable_stack) \
|
|
|
|
(executable_stack != EXSTACK_DISABLE_X)
|
|
|
|
|
|
|
|
struct task_struct;
|
|
|
|
|
2014-05-05 13:19:32 -06:00
|
|
|
#define ARCH_DLINFO_IA32 \
|
2008-03-23 02:02:08 -06:00
|
|
|
do { \
|
2014-05-05 13:19:32 -06:00
|
|
|
if (vdso32_enabled) { \
|
2008-01-30 05:31:55 -07:00
|
|
|
NEW_AUX_ENT(AT_SYSINFO, VDSO_ENTRY); \
|
|
|
|
NEW_AUX_ENT(AT_SYSINFO_EHDR, VDSO_CURRENT_BASE); \
|
2008-03-23 02:02:08 -06:00
|
|
|
} \
|
2008-01-30 05:31:55 -07:00
|
|
|
} while (0)
|
|
|
|
|
2007-10-23 14:37:23 -06:00
|
|
|
#ifdef CONFIG_X86_32
|
|
|
|
|
2009-09-08 03:01:55 -06:00
|
|
|
#define STACK_RND_MASK (0x7ff)
|
|
|
|
|
2014-05-05 13:19:32 -06:00
|
|
|
#define ARCH_DLINFO ARCH_DLINFO_IA32
|
2007-10-23 14:37:23 -06:00
|
|
|
|
2008-01-30 05:31:55 -07:00
|
|
|
/* update AT_VECTOR_SIZE_ARCH if the number of NEW_AUX_ENT entries changes */
|
2007-10-23 14:37:23 -06:00
|
|
|
|
|
|
|
#else /* CONFIG_X86_32 */
|
|
|
|
|
|
|
|
/* 1GB for 64bit, 8MB for 32bit */
|
2012-02-06 14:03:09 -07:00
|
|
|
#define STACK_RND_MASK (test_thread_flag(TIF_ADDR32) ? 0x7ff : 0x3fffff)
|
2007-10-23 14:37:23 -06:00
|
|
|
|
2008-03-23 02:02:08 -06:00
|
|
|
#define ARCH_DLINFO \
|
|
|
|
do { \
|
2014-05-05 13:19:32 -06:00
|
|
|
if (vdso64_enabled) \
|
2008-03-23 02:02:08 -06:00
|
|
|
NEW_AUX_ENT(AT_SYSINFO_EHDR, \
|
x86, vdso: Reimplement vdso.so preparation in build-time C
Currently, vdso.so files are prepared and analyzed by a combination
of objcopy, nm, some linker script tricks, and some simple ELF
parsers in the kernel. Replace all of that with plain C code that
runs at build time.
All five vdso images now generate .c files that are compiled and
linked in to the kernel image.
This should cause only one userspace-visible change: the loaded vDSO
images are stripped more heavily than they used to be. Everything
outside the loadable segment is dropped. In particular, this causes
the section table and section name strings to be missing. This
should be fine: real dynamic loaders don't load or inspect these
tables anyway. The result is roughly equivalent to eu-strip's
--strip-sections option.
The purpose of this change is to enable the vvar and hpet mappings
to be moved to the page following the vDSO load segment. Currently,
it is possible for the section table to extend into the page after
the load segment, so, if we map it, it risks overlapping the vvar or
hpet page. This happens whenever the load segment is just under a
multiple of PAGE_SIZE.
The only real subtlety here is that the old code had a C file with
inline assembler that did 'call VDSO32_vsyscall' and a linker script
that defined 'VDSO32_vsyscall = __kernel_vsyscall'. This most
likely worked by accident: the linker script entry defines a symbol
associated with an address as opposed to an alias for the real
dynamic symbol __kernel_vsyscall. That caused ld to relocate the
reference at link time instead of leaving an interposable dynamic
relocation. Since the VDSO32_vsyscall hack is no longer needed, I
now use 'call __kernel_vsyscall', and I added -Bsymbolic to make it
work. vdso2c will generate an error and abort the build if the
resulting image contains any dynamic relocations, so we won't
silently generate bad vdso images.
(Dynamic relocations are a problem because nothing will even attempt
to relocate the vdso.)
Signed-off-by: Andy Lutomirski <luto@amacapital.net>
Link: http://lkml.kernel.org/r/2c4fcf45524162a34d87fdda1eb046b2a5cecee7.1399317206.git.luto@amacapital.net
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
2014-05-05 13:19:34 -06:00
|
|
|
(unsigned long __force)current->mm->context.vdso); \
|
2007-10-23 14:37:23 -06:00
|
|
|
} while (0)
|
|
|
|
|
2014-05-05 13:19:32 -06:00
|
|
|
/* As a historical oddity, the x32 and x86_64 vDSOs are controlled together. */
|
2012-02-19 11:06:34 -07:00
|
|
|
#define ARCH_DLINFO_X32 \
|
|
|
|
do { \
|
2014-05-05 13:19:32 -06:00
|
|
|
if (vdso64_enabled) \
|
2012-02-19 11:06:34 -07:00
|
|
|
NEW_AUX_ENT(AT_SYSINFO_EHDR, \
|
x86, vdso: Reimplement vdso.so preparation in build-time C
Currently, vdso.so files are prepared and analyzed by a combination
of objcopy, nm, some linker script tricks, and some simple ELF
parsers in the kernel. Replace all of that with plain C code that
runs at build time.
All five vdso images now generate .c files that are compiled and
linked in to the kernel image.
This should cause only one userspace-visible change: the loaded vDSO
images are stripped more heavily than they used to be. Everything
outside the loadable segment is dropped. In particular, this causes
the section table and section name strings to be missing. This
should be fine: real dynamic loaders don't load or inspect these
tables anyway. The result is roughly equivalent to eu-strip's
--strip-sections option.
The purpose of this change is to enable the vvar and hpet mappings
to be moved to the page following the vDSO load segment. Currently,
it is possible for the section table to extend into the page after
the load segment, so, if we map it, it risks overlapping the vvar or
hpet page. This happens whenever the load segment is just under a
multiple of PAGE_SIZE.
The only real subtlety here is that the old code had a C file with
inline assembler that did 'call VDSO32_vsyscall' and a linker script
that defined 'VDSO32_vsyscall = __kernel_vsyscall'. This most
likely worked by accident: the linker script entry defines a symbol
associated with an address as opposed to an alias for the real
dynamic symbol __kernel_vsyscall. That caused ld to relocate the
reference at link time instead of leaving an interposable dynamic
relocation. Since the VDSO32_vsyscall hack is no longer needed, I
now use 'call __kernel_vsyscall', and I added -Bsymbolic to make it
work. vdso2c will generate an error and abort the build if the
resulting image contains any dynamic relocations, so we won't
silently generate bad vdso images.
(Dynamic relocations are a problem because nothing will even attempt
to relocate the vdso.)
Signed-off-by: Andy Lutomirski <luto@amacapital.net>
Link: http://lkml.kernel.org/r/2c4fcf45524162a34d87fdda1eb046b2a5cecee7.1399317206.git.luto@amacapital.net
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
2014-05-05 13:19:34 -06:00
|
|
|
(unsigned long __force)current->mm->context.vdso); \
|
2012-02-19 11:06:34 -07:00
|
|
|
} while (0)
|
|
|
|
|
2008-01-30 05:31:55 -07:00
|
|
|
#define AT_SYSINFO 32
|
|
|
|
|
2012-02-19 11:06:34 -07:00
|
|
|
#define COMPAT_ARCH_DLINFO \
|
|
|
|
if (test_thread_flag(TIF_X32)) \
|
|
|
|
ARCH_DLINFO_X32; \
|
|
|
|
else \
|
2014-05-05 13:19:32 -06:00
|
|
|
ARCH_DLINFO_IA32
|
2008-01-30 05:31:55 -07:00
|
|
|
|
|
|
|
#define COMPAT_ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE + 0x1000000)
|
|
|
|
|
2007-10-23 14:37:23 -06:00
|
|
|
#endif /* !CONFIG_X86_32 */
|
|
|
|
|
2008-01-30 05:30:43 -07:00
|
|
|
#define VDSO_CURRENT_BASE ((unsigned long)current->mm->context.vdso)
|
|
|
|
|
2008-03-23 02:02:08 -06:00
|
|
|
#define VDSO_ENTRY \
|
x86, vdso: Reimplement vdso.so preparation in build-time C
Currently, vdso.so files are prepared and analyzed by a combination
of objcopy, nm, some linker script tricks, and some simple ELF
parsers in the kernel. Replace all of that with plain C code that
runs at build time.
All five vdso images now generate .c files that are compiled and
linked in to the kernel image.
This should cause only one userspace-visible change: the loaded vDSO
images are stripped more heavily than they used to be. Everything
outside the loadable segment is dropped. In particular, this causes
the section table and section name strings to be missing. This
should be fine: real dynamic loaders don't load or inspect these
tables anyway. The result is roughly equivalent to eu-strip's
--strip-sections option.
The purpose of this change is to enable the vvar and hpet mappings
to be moved to the page following the vDSO load segment. Currently,
it is possible for the section table to extend into the page after
the load segment, so, if we map it, it risks overlapping the vvar or
hpet page. This happens whenever the load segment is just under a
multiple of PAGE_SIZE.
The only real subtlety here is that the old code had a C file with
inline assembler that did 'call VDSO32_vsyscall' and a linker script
that defined 'VDSO32_vsyscall = __kernel_vsyscall'. This most
likely worked by accident: the linker script entry defines a symbol
associated with an address as opposed to an alias for the real
dynamic symbol __kernel_vsyscall. That caused ld to relocate the
reference at link time instead of leaving an interposable dynamic
relocation. Since the VDSO32_vsyscall hack is no longer needed, I
now use 'call __kernel_vsyscall', and I added -Bsymbolic to make it
work. vdso2c will generate an error and abort the build if the
resulting image contains any dynamic relocations, so we won't
silently generate bad vdso images.
(Dynamic relocations are a problem because nothing will even attempt
to relocate the vdso.)
Signed-off-by: Andy Lutomirski <luto@amacapital.net>
Link: http://lkml.kernel.org/r/2c4fcf45524162a34d87fdda1eb046b2a5cecee7.1399317206.git.luto@amacapital.net
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
2014-05-05 13:19:34 -06:00
|
|
|
((unsigned long)current->mm->context.vdso + \
|
|
|
|
selected_vdso32->sym___kernel_vsyscall)
|
2008-01-30 05:30:43 -07:00
|
|
|
|
2007-10-23 14:37:23 -06:00
|
|
|
struct linux_binprm;
|
|
|
|
|
|
|
|
#define ARCH_HAS_SETUP_ADDITIONAL_PAGES 1
|
|
|
|
extern int arch_setup_additional_pages(struct linux_binprm *bprm,
|
2008-12-25 05:38:35 -07:00
|
|
|
int uses_interp);
|
2014-05-05 13:19:35 -06:00
|
|
|
extern int compat_arch_setup_additional_pages(struct linux_binprm *bprm,
|
|
|
|
int uses_interp);
|
|
|
|
#define compat_arch_setup_additional_pages compat_arch_setup_additional_pages
|
2008-01-30 05:31:55 -07:00
|
|
|
|
2011-08-05 07:15:08 -06:00
|
|
|
/*
|
|
|
|
* True on X86_32 or when emulating IA32 on X86_64
|
|
|
|
*/
|
|
|
|
static inline int mmap_is_ia32(void)
|
|
|
|
{
|
2015-06-22 05:55:11 -06:00
|
|
|
return config_enabled(CONFIG_X86_32) ||
|
|
|
|
(config_enabled(CONFIG_COMPAT) &&
|
|
|
|
test_thread_flag(TIF_ADDR32));
|
2011-08-05 07:15:08 -06:00
|
|
|
}
|
|
|
|
|
2012-12-11 17:01:52 -07:00
|
|
|
/* Do not change the values. See get_align_mask() */
|
2011-08-05 07:15:08 -06:00
|
|
|
enum align_flags {
|
|
|
|
ALIGN_VA_32 = BIT(0),
|
|
|
|
ALIGN_VA_64 = BIT(1),
|
|
|
|
};
|
|
|
|
|
|
|
|
struct va_alignment {
|
|
|
|
int flags;
|
|
|
|
unsigned long mask;
|
2015-03-27 05:38:21 -06:00
|
|
|
unsigned long bits;
|
2011-08-05 07:15:08 -06:00
|
|
|
} ____cacheline_aligned;
|
|
|
|
|
|
|
|
extern struct va_alignment va_align;
|
2012-12-11 17:01:52 -07:00
|
|
|
extern unsigned long align_vdso_addr(unsigned long);
|
2008-10-22 23:26:29 -06:00
|
|
|
#endif /* _ASM_X86_ELF_H */
|