2005-05-06 01:15:35 +02:00
|
|
|
/*
|
2011-08-18 21:02:59 +02:00
|
|
|
* Copyright (C) 2000 - 2007 Jeff Dike (jdike@{addtoit,linux.intel}.com)
|
2005-05-06 01:15:35 +02:00
|
|
|
* Licensed under the GPL
|
|
|
|
|
*/
|
2011-08-18 21:02:59 +02:00
|
|
|
#ifndef __UM_ELF_X86_H
|
|
|
|
|
#define __UM_ELF_X86_H
|
2005-05-06 01:15:35 +02:00
|
|
|
|
|
|
|
|
#include <asm/user.h>
|
2012-10-08 04:27:32 +02:00
|
|
|
#include <skas.h>
|
2005-05-06 01:15:35 +02:00
|
|
|
|
2011-08-18 21:02:59 +02:00
|
|
|
#ifdef CONFIG_X86_32
|
|
|
|
|
|
|
|
|
|
#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
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* This is used to ensure we don't load something for the wrong architecture.
|
|
|
|
|
*/
|
|
|
|
|
#define elf_check_arch(x) \
|
|
|
|
|
(((x)->e_machine == EM_386) || ((x)->e_machine == EM_486))
|
|
|
|
|
|
|
|
|
|
#define ELF_CLASS ELFCLASS32
|
|
|
|
|
#define ELF_DATA ELFDATA2LSB
|
|
|
|
|
#define ELF_ARCH EM_386
|
|
|
|
|
|
|
|
|
|
#define ELF_PLAT_INIT(regs, load_addr) do { \
|
2012-05-20 06:05:58 +02:00
|
|
|
PT_REGS_BX(regs) = 0; \
|
|
|
|
|
PT_REGS_CX(regs) = 0; \
|
|
|
|
|
PT_REGS_DX(regs) = 0; \
|
|
|
|
|
PT_REGS_SI(regs) = 0; \
|
|
|
|
|
PT_REGS_DI(regs) = 0; \
|
|
|
|
|
PT_REGS_BP(regs) = 0; \
|
|
|
|
|
PT_REGS_AX(regs) = 0; \
|
2011-08-18 21:02:59 +02:00
|
|
|
} while (0)
|
|
|
|
|
|
|
|
|
|
/* Shamelessly stolen from include/asm-i386/elf.h */
|
|
|
|
|
|
|
|
|
|
#define ELF_CORE_COPY_REGS(pr_reg, regs) do { \
|
2012-05-20 06:05:58 +02:00
|
|
|
pr_reg[0] = PT_REGS_BX(regs); \
|
|
|
|
|
pr_reg[1] = PT_REGS_CX(regs); \
|
|
|
|
|
pr_reg[2] = PT_REGS_DX(regs); \
|
|
|
|
|
pr_reg[3] = PT_REGS_SI(regs); \
|
|
|
|
|
pr_reg[4] = PT_REGS_DI(regs); \
|
|
|
|
|
pr_reg[5] = PT_REGS_BP(regs); \
|
|
|
|
|
pr_reg[6] = PT_REGS_AX(regs); \
|
2011-08-18 21:02:59 +02:00
|
|
|
pr_reg[7] = PT_REGS_DS(regs); \
|
|
|
|
|
pr_reg[8] = PT_REGS_ES(regs); \
|
|
|
|
|
/* fake once used fs and gs selectors? */ \
|
|
|
|
|
pr_reg[9] = PT_REGS_DS(regs); \
|
|
|
|
|
pr_reg[10] = PT_REGS_DS(regs); \
|
|
|
|
|
pr_reg[11] = PT_REGS_SYSCALL_NR(regs); \
|
|
|
|
|
pr_reg[12] = PT_REGS_IP(regs); \
|
|
|
|
|
pr_reg[13] = PT_REGS_CS(regs); \
|
|
|
|
|
pr_reg[14] = PT_REGS_EFLAGS(regs); \
|
|
|
|
|
pr_reg[15] = PT_REGS_SP(regs); \
|
|
|
|
|
pr_reg[16] = PT_REGS_SS(regs); \
|
|
|
|
|
} while (0);
|
|
|
|
|
|
|
|
|
|
extern char * elf_aux_platform;
|
|
|
|
|
#define ELF_PLATFORM (elf_aux_platform)
|
|
|
|
|
|
|
|
|
|
extern unsigned long vsyscall_ehdr;
|
|
|
|
|
extern unsigned long vsyscall_end;
|
|
|
|
|
extern unsigned long __kernel_vsyscall;
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* This is the range that is readable by user mode, and things
|
|
|
|
|
* acting like user mode such as get_user_pages.
|
|
|
|
|
*/
|
|
|
|
|
#define FIXADDR_USER_START vsyscall_ehdr
|
|
|
|
|
#define FIXADDR_USER_END vsyscall_end
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* Architecture-neutral AT_ values in 0-17, leave some room
|
|
|
|
|
* for more of them, start the x86-specific ones at 32.
|
|
|
|
|
*/
|
|
|
|
|
#define AT_SYSINFO 32
|
|
|
|
|
#define AT_SYSINFO_EHDR 33
|
|
|
|
|
|
|
|
|
|
#define ARCH_DLINFO \
|
|
|
|
|
do { \
|
|
|
|
|
if ( vsyscall_ehdr ) { \
|
|
|
|
|
NEW_AUX_ENT(AT_SYSINFO, __kernel_vsyscall); \
|
|
|
|
|
NEW_AUX_ENT(AT_SYSINFO_EHDR, vsyscall_ehdr); \
|
|
|
|
|
} \
|
|
|
|
|
} while (0)
|
|
|
|
|
|
|
|
|
|
#else
|
|
|
|
|
|
2005-05-20 22:59:07 +02:00
|
|
|
/* x86-64 relocation types, taken from asm-x86_64/elf.h */
|
|
|
|
|
#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
|
|
|
|
|
|
2005-05-06 01:15:35 +02:00
|
|
|
/*
|
|
|
|
|
* This is used to ensure we don't load something for the wrong architecture.
|
|
|
|
|
*/
|
|
|
|
|
#define elf_check_arch(x) \
|
|
|
|
|
((x)->e_machine == EM_X86_64)
|
|
|
|
|
|
|
|
|
|
#define ELF_CLASS ELFCLASS64
|
|
|
|
|
#define ELF_DATA ELFDATA2LSB
|
|
|
|
|
#define ELF_ARCH EM_X86_64
|
|
|
|
|
|
|
|
|
|
#define ELF_PLAT_INIT(regs, load_addr) do { \
|
2012-05-20 06:05:58 +02:00
|
|
|
PT_REGS_BX(regs) = 0; \
|
|
|
|
|
PT_REGS_CX(regs) = 0; \
|
|
|
|
|
PT_REGS_DX(regs) = 0; \
|
|
|
|
|
PT_REGS_SI(regs) = 0; \
|
|
|
|
|
PT_REGS_DI(regs) = 0; \
|
|
|
|
|
PT_REGS_BP(regs) = 0; \
|
|
|
|
|
PT_REGS_AX(regs) = 0; \
|
2005-05-06 01:15:35 +02:00
|
|
|
PT_REGS_R8(regs) = 0; \
|
|
|
|
|
PT_REGS_R9(regs) = 0; \
|
|
|
|
|
PT_REGS_R10(regs) = 0; \
|
|
|
|
|
PT_REGS_R11(regs) = 0; \
|
|
|
|
|
PT_REGS_R12(regs) = 0; \
|
|
|
|
|
PT_REGS_R13(regs) = 0; \
|
|
|
|
|
PT_REGS_R14(regs) = 0; \
|
|
|
|
|
PT_REGS_R15(regs) = 0; \
|
|
|
|
|
} while (0)
|
|
|
|
|
|
2009-06-17 00:33:32 +02:00
|
|
|
#define ELF_CORE_COPY_REGS(pr_reg, _regs) \
|
|
|
|
|
(pr_reg)[0] = (_regs)->regs.gp[0]; \
|
|
|
|
|
(pr_reg)[1] = (_regs)->regs.gp[1]; \
|
|
|
|
|
(pr_reg)[2] = (_regs)->regs.gp[2]; \
|
|
|
|
|
(pr_reg)[3] = (_regs)->regs.gp[3]; \
|
|
|
|
|
(pr_reg)[4] = (_regs)->regs.gp[4]; \
|
|
|
|
|
(pr_reg)[5] = (_regs)->regs.gp[5]; \
|
|
|
|
|
(pr_reg)[6] = (_regs)->regs.gp[6]; \
|
|
|
|
|
(pr_reg)[7] = (_regs)->regs.gp[7]; \
|
|
|
|
|
(pr_reg)[8] = (_regs)->regs.gp[8]; \
|
|
|
|
|
(pr_reg)[9] = (_regs)->regs.gp[9]; \
|
|
|
|
|
(pr_reg)[10] = (_regs)->regs.gp[10]; \
|
|
|
|
|
(pr_reg)[11] = (_regs)->regs.gp[11]; \
|
|
|
|
|
(pr_reg)[12] = (_regs)->regs.gp[12]; \
|
|
|
|
|
(pr_reg)[13] = (_regs)->regs.gp[13]; \
|
|
|
|
|
(pr_reg)[14] = (_regs)->regs.gp[14]; \
|
|
|
|
|
(pr_reg)[15] = (_regs)->regs.gp[15]; \
|
|
|
|
|
(pr_reg)[16] = (_regs)->regs.gp[16]; \
|
|
|
|
|
(pr_reg)[17] = (_regs)->regs.gp[17]; \
|
|
|
|
|
(pr_reg)[18] = (_regs)->regs.gp[18]; \
|
|
|
|
|
(pr_reg)[19] = (_regs)->regs.gp[19]; \
|
|
|
|
|
(pr_reg)[20] = (_regs)->regs.gp[20]; \
|
2007-08-31 08:56:20 +02:00
|
|
|
(pr_reg)[21] = current->thread.arch.fs; \
|
|
|
|
|
(pr_reg)[22] = 0; \
|
|
|
|
|
(pr_reg)[23] = 0; \
|
|
|
|
|
(pr_reg)[24] = 0; \
|
|
|
|
|
(pr_reg)[25] = 0; \
|
|
|
|
|
(pr_reg)[26] = 0;
|
|
|
|
|
|
2011-08-18 21:02:59 +02:00
|
|
|
#define ELF_PLATFORM "x86_64"
|
|
|
|
|
|
|
|
|
|
/* No user-accessible fixmap addresses, i.e. vsyscall */
|
|
|
|
|
#define FIXADDR_USER_START 0
|
|
|
|
|
#define FIXADDR_USER_END 0
|
|
|
|
|
|
|
|
|
|
#define ARCH_HAS_SETUP_ADDITIONAL_PAGES 1
|
|
|
|
|
struct linux_binprm;
|
|
|
|
|
extern int arch_setup_additional_pages(struct linux_binprm *bprm,
|
|
|
|
|
int uses_interp);
|
|
|
|
|
|
|
|
|
|
extern unsigned long um_vdso_addr;
|
|
|
|
|
#define AT_SYSINFO_EHDR 33
|
|
|
|
|
#define ARCH_DLINFO NEW_AUX_ENT(AT_SYSINFO_EHDR, um_vdso_addr)
|
|
|
|
|
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
typedef unsigned long elf_greg_t;
|
|
|
|
|
|
|
|
|
|
#define ELF_NGREG (sizeof (struct user_regs_struct) / sizeof(elf_greg_t))
|
|
|
|
|
typedef elf_greg_t elf_gregset_t[ELF_NGREG];
|
|
|
|
|
|
|
|
|
|
typedef struct user_i387_struct elf_fpregset_t;
|
|
|
|
|
|
uml: kernels on {i386,x86_64} produce bad coredumps
One of our users reported that when a user-level program SIGSEGVs under
UML kernel, the resulting core dump is not very usable.
I have reproduced that with the latest kernel:
make ARCH=um defconfig; make ARCH=um
Run the resulting kernel, then "inside" run this program:
#include <pthread.h>
void *fn(void *p)
{
abort();
}
int main()
{
pthread_t tid;
pthread_create(&tid, 0, fn, 0);
pthread_join(tid, 0);
return 0;
}
Analyze the coredump with GDB. Here is what you'll see:
sudo gdb -q -ex 'set solib-absolute-prefix ../root_fs' -ex 'file ../root_fs/var/tmp/mt-abort' -ex 'core ../root_fs/var/tmp/core.762'
Reading symbols from /usr/local/google/root_fs/var/tmp/mt-abort...done.
[New Thread 763]
[New Thread 762]
Core was generated by `./mt-abort'.
Program terminated with signal 6, Aborted.
#0 0x0000000040255250 in raise () from ../root_fs/lib64/libc.so.6
(gdb) info thread
2 Thread 762 0x0000000000000000 in ?? ()
* 1 Thread 763 0x0000000040255250 in raise () from ../root_fs/lib64/libc.so.6
Note that thread#2 looks funny.
(gdb) thread 2
[Switching to thread 2 (Thread 762)]#0 0x0000000000000000 in ?? ()
(gdb) info reg
rax 0x0 0
rbx 0x0 0
rcx 0x0 0
rdx 0x0 0
rsi 0x0 0
rdi 0x0 0
rbp 0x0 0x0
rsp 0x0 0x0
r8 0x0 0
r9 0x0 0
r10 0x0 0
r11 0x0 0
r12 0x0 0
r13 0x0 0
r14 0x0 0
r15 0x0 0
rip 0x0 0
eflags 0x0 [ ]
cs 0x0 0
ss 0x0 0
ds 0x0 0
es 0x0 0
fs 0x0 0
gs 0x0 0
Examining the core shows that NT_PRSTATUS notes for all threads other than
the one that crashed are zeroed out.
I believe this is happening because neither ELF_CORE_COPY_TASK_REGS nor
task_pt_regs are defined under ARCH=um, and so elf_core_copy_task_regs()
becomes a no-op.
Attached patch fixes this for SUBARCH={x86_64,i386}.
Signed-off-by: Paul Pluzhnikov <ppluzhnikov@google.com>
Cc: Jeff Dike <jdike@addtoit.com>
Acked-by: WANG Cong <xiyou.wangcong@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2011-03-23 00:33:46 +01:00
|
|
|
#define task_pt_regs(t) (&(t)->thread.regs)
|
|
|
|
|
|
2010-04-19 23:53:06 +02:00
|
|
|
struct task_struct;
|
|
|
|
|
|
uml: header untangling
Untangle UML headers somewhat and add some includes where they were
needed explicitly, but gotten accidentally via some other header.
arch/um/include/um_uaccess.h loses asm/fixmap.h because it uses no
fixmap stuff and gains elf.h, because it needs FIXADDR_USER_*, and
archsetjmp.h, because it needs jmp_buf.
pmd_alloc_one is uninlined because it needs mm_struct, and that's
inconvenient to provide in asm-um/pgtable-3level.h.
elf_core_copy_fpregs is also uninlined from elf-i386.h and
elf-x86_64.h, which duplicated the code anyway, to
arch/um/kernel/process.c, so that the reference to current_thread
doesn't pull sched.h or anything related into asm/elf.h.
arch/um/sys-i386/ldt.c, arch/um/kernel/tlb.c and
arch/um/kernel/skas/uaccess.c got sched.h because they dereference
task_structs. Its includes of linux and asm headers got turned from
"" to <>.
arch/um/sys-i386/bug.c gets asm/errno.h because it needs errno
constants.
asm/elf-i386 gets asm/user.h because it needs user_regs_struct.
asm/fixmap.h gets page.h because it needs PAGE_SIZE and PAGE_MASK and
system.h for BUG_ON.
asm/pgtable doesn't need sched.h.
asm/processor-generic.h defined mm_segment_t, but didn't use it. So,
that definition is moved to uaccess.h, which defines a bunch of
mm_segment_t-related stuff. thread_info.h uses mm_segment_t, and
includes uaccess.h, which causes a recursion. So, the definition is
placed above the include of thread_info. in uaccess.h. thread_info.h
also gets page.h because it needs PAGE_SIZE.
ObCheckpatchViolationJustification - I'm not adding a typedef; I'm
moving mm_segment_t from one place to another.
Signed-off-by: Jeff Dike <jdike@linux.intel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2008-02-05 07:30:53 +01:00
|
|
|
extern int elf_core_copy_fpregs(struct task_struct *t, elf_fpregset_t *fpu);
|
2007-08-31 08:56:20 +02:00
|
|
|
|
|
|
|
|
#define ELF_CORE_COPY_FPREGS(t, fpu) elf_core_copy_fpregs(t, fpu)
|
|
|
|
|
|
2005-05-06 01:15:35 +02:00
|
|
|
#define ELF_EXEC_PAGESIZE 4096
|
|
|
|
|
|
|
|
|
|
#define ELF_ET_DYN_BASE (2 * TASK_SIZE / 3)
|
|
|
|
|
|
|
|
|
|
extern long elf_aux_hwcap;
|
|
|
|
|
#define ELF_HWCAP (elf_aux_hwcap)
|
|
|
|
|
|
2008-10-16 15:39:57 +02:00
|
|
|
#define SET_PERSONALITY(ex) do ; while(0)
|
2011-07-26 02:12:54 +02:00
|
|
|
#define __HAVE_ARCH_GATE_AREA 1
|
|
|
|
|
|
2005-05-06 01:15:35 +02:00
|
|
|
#endif
|