UML - move libc code out of mem_user.c and tempfile.c
PATCH 7/10 UML - move libc code out of mem_user.c and tempfile.c
The serial UML OS-abstraction layer patch (um/kernel dir).
This moves all system calls from mem_user.c and tempfile.c files under os-Linux dir.
arch/um/include/mem_user.h +0 -15
@@ -51,7 +51,6 @@extern void check_devanon (void );extern int init_mem_user (void ); -extern int create_mem_file (unsigned long len);extern void setup_memory (void *entry);extern unsigned long find_iomem (char *driver,unsigned long *len_out); extern int init_maps(unsigned long physmem, unsigned long iomem,
@@ -64,20 +63,6 @@extern void unmap_physmem (void );extern void map_memory (unsigned long virt,unsigned long phys,unsigned long len,int r,int w,int x); -extern int protect_memory (unsigned long addr,unsigned long len, -int r,int w,int x,int must_succeed);extern unsigned long get_kmem_end (void ); -extern void check_tmpexec (void );#endif - -/* -* Overrides for Emacs so that we follow Linus's tabbing style. -* Emacs will notice this stuff at the end of the file and automatically -* adjust the settings for this buffer only. This must remain at the end -* of the file. -* --------------------------------------------------------------------------- -* Local variables: -* c-file-style: "linux" -* End: -*/
arch/um/include/os.h +5 -0
@@ -157,6 +157,9 @@extern void os_early_checks (void );extern int can_do_skas (void ); +/* mem.c */ +extern int create_mem_file (unsigned long len); +/* process.c */ extern unsigned long os_process_pc (int pid);extern int os_process_parent (int pid);
@@ -181,6 +184,8 @@/* tt.c * for tt mode only (will be deleted in future...) */ +extern int protect_memory (unsigned long addr,unsigned long len, +int r,int w,int x,int must_succeed);extern void forward_pending_sigio (int target);extern int start_fork_tramp (void *arg,unsigned long temp_stack,int clone_flags,int (*tramp)(void *));
arch/um/kernel/Makefile +3 -3
@@ -10,7 +10,7 @@ helper.o init_task.o irq.o irq_user.o ksyms.o main.o mem.o mem_user.o \ physmem.o process_kern.o ptrace.o reboot.o resource.o sigio_user.o \ sigio_kern.o signal_kern.o signal_user.o smp.o syscall_kern.o sysrq.o \ - tempfile.o time.o time_kern.o tlb.o trap_kern.o trap_user.o \ + time.o time_kern.o tlb.o trap_kern.o trap_user.o \ uaccess_user.o um_arch.o umid.o user_util.o obj-$(CONFIG_BLK_DEV_INITRD) += initrd.o
@@ -24,8 +24,8 @@ user-objs-$(CONFIG_TTY_LOG) += tty_log.o -USER_OBJS := $(user-objs-y) config.o helper.o main.o tempfile.o time.o \ - tty_log.o umid.o user_util.o +USER_OBJS := $(user-objs-y) config.o helper.o main.o time.o tty_log.o umid.o \ + user_util.o include arch/um/scripts/Makefile.rules
arch/um/kernel/init_task.c +3 -2
@@ -13,6 +13,7 @@#include "asm/pgtable.h" #include "user_util.h" #include "mem_user.h" +#include "os.h" static struct fs_struct init_fs =INIT_FS ;struct mm_struct init_mm =INIT_MM (init_mm);
@@ -45,8 +46,8 @@void unprotect_stack (unsigned long stack) { -protect_memory (stack, (1 <<CONFIG_KERNEL_STACK_ORDER ) *PAGE_SIZE , -1 ,1 ,0 ,1 ); +os_protect_memory ((void *) stack, (1 <<CONFIG_KERNEL_STACK_ORDER ) *PAGE_SIZE , +1 ,1 ,0 ); }/*
arch/um/kernel/mem_user.c +1 -204
220 lines not on this page · raw message
arch/um/kernel/tempfile.c +0 -82
82 lines not on this page · raw message
arch/um/kernel/tlb.c +1 -1
@@ -307,7 +307,7 @@ }else if (pte_newprot (*pte)){ updated =1 ; -protect_memory (addr,PAGE_SIZE ,1 ,1 ,1 ,1 ); +os_protect_memory ((void *) addr,PAGE_SIZE ,1 ,1 ,1 ); } addr +=PAGE_SIZE ; }
arch/um/kernel/tt/mem_user.c +1 -0
@@ -12,6 +12,7 @@#include "tt.h" #include "mem_user.h" #include "user_util.h" +#include "os.h" void remap_data (void *segment_start,void *segment_end,int w) {
arch/um/kernel/um_arch.c +0 -5
@@ -361,11 +361,6 @@ uml_start =CHOOSE_MODE_PROC (set_task_sizes_tt, set_task_sizes_skas,0 , &host_task_size, &task_size); -/* Need to check this early because mmapping happens before the -* kernel is running. -*/ -check_tmpexec (); - brk_start = (unsigned long )sbrk (0 );CHOOSE_MODE_PROC (before_mem_tt, before_mem_skas, brk_start);/* Increase physical memory size for exec-shield users
arch/um/os-Linux/Makefile +4 -4
@@ -3,11 +3,11 @@ # Licensed under the GPL # -obj-y = aio.o elf_aux.o file.o process.o signal.o start_up.o time.o tt.o \ - tty.o user_syms.o drivers/ sys-$(SUBARCH)/ +obj-y = aio.o elf_aux.o file.o mem.o process.o signal.o start_up.o time.o \ + tt.o tty.o user_syms.o drivers/ sys-$(SUBARCH)/ -USER_OBJS := aio.o elf_aux.o file.o process.o signal.o start_up.o time.o tt.o \ - tty.o +USER_OBJS := aio.o elf_aux.o file.o mem.o process.o signal.o start_up.o \ + time.o tt.o tty.o elf_aux.o: $(ARCH_DIR)/kernel-offsets.h CFLAGS_elf_aux.o += -I$(objtree)/arch/um
arch/um/os-Linux/mem.c +161 -0
161 lines not on this page · raw message
arch/um/os-Linux/start_up.c +107 -2
149 lines not on this page · raw message
arch/um/os-Linux/tt.c +14 -0
@@ -36,6 +36,20 @@#include "mode.h" #include "tempfile.h" +int protect_memory (unsigned long addr,unsigned long len,int r,int w,int x, +int must_succeed) +{ +int err; + + err =os_protect_memory ((void *) addr, len, r, w, x); +if (err <0 ){ +if (must_succeed) +panic ("protect failed, err = %d" , -err); +else return (err); + } +return (0 ); +} +/* *------------------------- * only for tt mode (will be deleted in future...)
-------------------------------------------------------
SF.Net email is sponsored by:
Tame your development challenges with Apache's Geronimo App Server. Download it for free - -and be entered to win a 42" plasma tv or your very own Sony(tm)PSP. Click here to play: http://sourceforge.net/geronimo.php
_______________________________________________
User-mode-linux-devel mailing list [email protected]
https://lists.sourceforge.net/lists/listinfo/user-mode-linux-devel