| 
									
										
										
										
											2005-05-05 16:15:35 -07:00
										 |  |  | /*
 | 
					
						
							| 
									
										
										
										
											2008-02-04 22:30:53 -08:00
										 |  |  |  * Copyright (C) 2000 - 2007 Jeff Dike (jdike@{addtoit,linux.intel}.com) | 
					
						
							| 
									
										
										
										
											2005-05-05 16:15:35 -07:00
										 |  |  |  * Licensed under the GPL | 
					
						
							|  |  |  |  */ | 
					
						
							|  |  |  | #ifndef __UM_ELF_I386_H
 | 
					
						
							|  |  |  | #define __UM_ELF_I386_H
 | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
											  
											
												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-04 22:30:53 -08:00
										 |  |  | #include <asm/user.h>
 | 
					
						
							| 
									
										
										
										
											2007-10-16 01:27:17 -07:00
										 |  |  | #include "skas.h"
 | 
					
						
							| 
									
										
										
										
											2005-05-05 16:15:35 -07:00
										 |  |  | 
 | 
					
						
							|  |  |  | #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
 | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | 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; | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | /*
 | 
					
						
							|  |  |  |  * 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 { \
 | 
					
						
							|  |  |  | 	PT_REGS_EBX(regs) = 0; \ | 
					
						
							|  |  |  | 	PT_REGS_ECX(regs) = 0; \ | 
					
						
							|  |  |  | 	PT_REGS_EDX(regs) = 0; \ | 
					
						
							|  |  |  | 	PT_REGS_ESI(regs) = 0; \ | 
					
						
							|  |  |  | 	PT_REGS_EDI(regs) = 0; \ | 
					
						
							|  |  |  | 	PT_REGS_EBP(regs) = 0; \ | 
					
						
							|  |  |  | 	PT_REGS_EAX(regs) = 0; \ | 
					
						
							| 
									
										
										
										
											2008-02-04 22:30:53 -08:00
										 |  |  | } while (0) | 
					
						
							| 
									
										
										
										
											2005-05-05 16:15:35 -07:00
										 |  |  | 
 | 
					
						
							|  |  |  | #define USE_ELF_CORE_DUMP
 | 
					
						
							|  |  |  | #define ELF_EXEC_PAGESIZE 4096
 | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | #define ELF_ET_DYN_BASE (2 * TASK_SIZE / 3)
 | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | /* Shamelessly stolen from include/asm-i386/elf.h */ | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | #define ELF_CORE_COPY_REGS(pr_reg, regs) do {	\
 | 
					
						
							|  |  |  | 	pr_reg[0] = PT_REGS_EBX(regs);		\ | 
					
						
							|  |  |  | 	pr_reg[1] = PT_REGS_ECX(regs);		\ | 
					
						
							|  |  |  | 	pr_reg[2] = PT_REGS_EDX(regs);		\ | 
					
						
							|  |  |  | 	pr_reg[3] = PT_REGS_ESI(regs);		\ | 
					
						
							|  |  |  | 	pr_reg[4] = PT_REGS_EDI(regs);		\ | 
					
						
							|  |  |  | 	pr_reg[5] = PT_REGS_EBP(regs);		\ | 
					
						
							|  |  |  | 	pr_reg[6] = PT_REGS_EAX(regs);		\ | 
					
						
							|  |  |  | 	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);		\ | 
					
						
							| 
									
										
										
										
											2008-02-04 22:30:53 -08:00
										 |  |  | } while (0); | 
					
						
							| 
									
										
										
										
											2005-05-05 16:15:35 -07:00
										 |  |  | 
 | 
					
						
							| 
									
										
											  
											
												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-04 22:30:53 -08:00
										 |  |  | extern int elf_core_copy_fpregs(struct task_struct *t, elf_fpregset_t *fpu); | 
					
						
							| 
									
										
										
										
											2007-10-16 01:27:17 -07:00
										 |  |  | 
 | 
					
						
							|  |  |  | #define ELF_CORE_COPY_FPREGS(t, fpu) elf_core_copy_fpregs(t, fpu)
 | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2005-05-05 16:15:35 -07:00
										 |  |  | extern long elf_aux_hwcap; | 
					
						
							|  |  |  | #define ELF_HWCAP (elf_aux_hwcap)
 | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | extern char * elf_aux_platform; | 
					
						
							|  |  |  | #define ELF_PLATFORM (elf_aux_platform)
 | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2008-02-04 22:30:53 -08:00
										 |  |  | #define SET_PERSONALITY(ex, ibcs2) do { } while (0)
 | 
					
						
							| 
									
										
										
										
											2005-05-05 16:15:35 -07:00
										 |  |  | 
 | 
					
						
							|  |  |  | extern unsigned long vsyscall_ehdr; | 
					
						
							|  |  |  | extern unsigned long vsyscall_end; | 
					
						
							|  |  |  | extern unsigned long __kernel_vsyscall; | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | #define VSYSCALL_BASE vsyscall_ehdr
 | 
					
						
							|  |  |  | #define VSYSCALL_END vsyscall_end
 | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | /*
 | 
					
						
							|  |  |  |  * 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_BASE
 | 
					
						
							|  |  |  | #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) | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | /*
 | 
					
						
							|  |  |  |  * These macros parameterize elf_core_dump in fs/binfmt_elf.c to write out | 
					
						
							|  |  |  |  * extra segments containing the vsyscall DSO contents.  Dumping its | 
					
						
							|  |  |  |  * contents makes post-mortem fully interpretable later without matching up | 
					
						
							|  |  |  |  * the same kernel and hardware config to see what PC values meant. | 
					
						
							|  |  |  |  * Dumping its extra ELF program headers includes all the other information | 
					
						
							|  |  |  |  * a debugger needs to easily find how the vsyscall DSO was being used. | 
					
						
							|  |  |  |  */ | 
					
						
							|  |  |  | #define ELF_CORE_EXTRA_PHDRS						      \
 | 
					
						
							|  |  |  | 	(vsyscall_ehdr ? (((struct elfhdr *)vsyscall_ehdr)->e_phnum) : 0 ) | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | #define ELF_CORE_WRITE_EXTRA_PHDRS					      \
 | 
					
						
							|  |  |  | if ( vsyscall_ehdr ) {							      \ | 
					
						
							|  |  |  | 	const struct elfhdr *const ehdrp = (struct elfhdr *)vsyscall_ehdr;    \ | 
					
						
							|  |  |  | 	const struct elf_phdr *const phdrp =				      \ | 
					
						
							|  |  |  | 		(const struct elf_phdr *) (vsyscall_ehdr + ehdrp->e_phoff);   \ | 
					
						
							|  |  |  | 	int i;								      \ | 
					
						
							|  |  |  | 	Elf32_Off ofs = 0;						      \ | 
					
						
							|  |  |  | 	for (i = 0; i < ehdrp->e_phnum; ++i) {				      \ | 
					
						
							|  |  |  | 		struct elf_phdr phdr = phdrp[i];			      \ | 
					
						
							|  |  |  | 		if (phdr.p_type == PT_LOAD) {				      \ | 
					
						
							|  |  |  | 			ofs = phdr.p_offset = offset;			      \ | 
					
						
							|  |  |  | 			offset += phdr.p_filesz;			      \ | 
					
						
							|  |  |  | 		}							      \ | 
					
						
							|  |  |  | 		else							      \ | 
					
						
							|  |  |  | 			phdr.p_offset += ofs;				      \ | 
					
						
							|  |  |  | 		phdr.p_paddr = 0; /* match other core phdrs */		      \ | 
					
						
							|  |  |  | 		DUMP_WRITE(&phdr, sizeof(phdr));			      \ | 
					
						
							|  |  |  | 	}								      \ | 
					
						
							|  |  |  | } | 
					
						
							|  |  |  | #define ELF_CORE_WRITE_EXTRA_DATA					      \
 | 
					
						
							|  |  |  | if ( vsyscall_ehdr ) {							      \ | 
					
						
							|  |  |  | 	const struct elfhdr *const ehdrp = (struct elfhdr *)vsyscall_ehdr;    \ | 
					
						
							|  |  |  | 	const struct elf_phdr *const phdrp =				      \ | 
					
						
							|  |  |  | 		(const struct elf_phdr *) (vsyscall_ehdr + ehdrp->e_phoff);   \ | 
					
						
							|  |  |  | 	int i;								      \ | 
					
						
							|  |  |  | 	for (i = 0; i < ehdrp->e_phnum; ++i) {				      \ | 
					
						
							|  |  |  | 		if (phdrp[i].p_type == PT_LOAD)				      \ | 
					
						
							|  |  |  | 			DUMP_WRITE((void *) phdrp[i].p_vaddr,		      \ | 
					
						
							|  |  |  | 				   phdrp[i].p_filesz);			      \ | 
					
						
							|  |  |  | 	}								      \ | 
					
						
							|  |  |  | } | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | #endif
 |