UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

[PATCH] uml: move libc-dependent utility procedures 

The serial UML OS-abstraction layer patch (um/kernel dir).

This moves all systemcalls from user_util.c file under os-Linux dir

Signed-off-by: Gennady Sharapov <Gennady.V.Sharapov@intel.com>
Signed-off-by: Jeff Dike <jdike@addtoit.com>
Cc: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Gennady Sharapov 2006-01-18 17:42:41 -08:00 committed by Linus Torvalds
parent 12919aa6e0
commit 4fef0c10fa
11 changed files with 72 additions and 87 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
arch/um/drivers/fd.c
View File

@ -11,6 +11,7 @@
#include "user.h"
#include "user_util.h"
#include "chan_user.h"
#include "os.h"
struct fd_chan {
int fd;

10
arch/um/include/os.h
View File

@ -195,6 +195,8 @@ extern unsigned long long os_usecs(void);
/* tt.c
* for tt mode only (will be deleted in future...)
*/
extern void stop(void);
extern int wait_for_stop(int pid, int sig, int cont_type, void *relay);
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);
@ -235,4 +237,12 @@ extern int set_signals(int enable);
extern void os_fill_handlinfo(struct kern_handlers h);
extern void do_longjmp(void *p, int val);
/* util.c */
extern void stack_protections(unsigned long address);
extern void task_protections(unsigned long address);
extern int raw(int fd);
extern void setup_machinename(char *machine_out);
extern void setup_hostinfo(void);
extern int setjmp_wrapper(void (*proc)(void *, void *), ...);
#endif

18
arch/um/include/user_util.h
View File

@ -44,10 +44,6 @@ extern unsigned long brk_start;
extern int pty_output_sigio;
extern int pty_close_sigio;
extern void stop(void);
extern void stack_protections(unsigned long address);
extern void task_protections(unsigned long address);
extern int wait_for_stop(int pid, int sig, int cont_type, void *relay);
extern void *add_signal_handler(int sig, void (*handler)(int));
extern int linux_main(int argc, char **argv);
extern void set_cmdline(char *cmd);
@ -55,8 +51,6 @@ extern void input_cb(void (*proc)(void *), void *arg, int arg_len);
extern int get_pty(void);
extern void *um_kmalloc(int size);
extern int switcheroo(int fd, int prot, void *from, void *to, int size);
extern void setup_machinename(char *machine_out);
extern void setup_hostinfo(void);
extern void do_exec(int old_pid, int new_pid);
extern void tracer_panic(char *msg, ...);
extern int detach(int pid, int sig);
@ -70,18 +64,6 @@ extern int cpu_feature(char *what, char *buf, int len);
extern int arch_handle_signal(int sig, union uml_pt_regs *regs);
extern int arch_fixup(unsigned long address, void *sc_ptr);
extern void arch_init_thread(void);
extern int setjmp_wrapper(void (*proc)(void *, void *), ...);
extern int raw(int fd);
#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:
*/

5
arch/um/kernel/Makefile
View File

@ -10,8 +10,7 @@ obj-y = config.o exec_kern.o exitcode.o \
init_task.o irq.o irq_user.o ksyms.o mem.o physmem.o \
process_kern.o ptrace.o reboot.o resource.o sigio_user.o sigio_kern.o \
signal_kern.o smp.o syscall_kern.o sysrq.o time.o \
time_kern.o tlb.o trap_kern.o uaccess.o um_arch.o umid.o \
user_util.o
time_kern.o tlb.o trap_kern.o uaccess.o um_arch.o umid.o
obj-$(CONFIG_BLK_DEV_INITRD) += initrd.o
obj-$(CONFIG_GPROF) += gprof_syms.o
@ -24,7 +23,7 @@ obj-$(CONFIG_MODE_SKAS) += skas/
user-objs-$(CONFIG_TTY_LOG) += tty_log.o
USER_OBJS := $(user-objs-y) config.o time.o tty_log.o user_util.o
USER_OBJS := $(user-objs-y) config.o time.o tty_log.o
include arch/um/scripts/Makefile.rules

2
arch/um/kernel/skas/uaccess.c
View File

@ -13,7 +13,7 @@
#include "asm/pgtable.h"
#include "asm/uaccess.h"
#include "kern_util.h"
#include "user_util.h"
#include "os.h"
extern void *um_virt_to_phys(struct task_struct *task, unsigned long addr,
pte_t *pte_out);

1
arch/um/kernel/tt/gdb.c
View File

@ -20,6 +20,7 @@
#include "user_util.h"
#include "tt.h"
#include "sysdep/thread.h"
#include "os.h"
extern int debugger_pid;
extern int debugger_fd;

1
arch/um/kernel/tt/ptproxy/ptrace.c
View File

@ -20,6 +20,7 @@ Jeff Dike (jdike@karaya.com) : Modified for integration into uml
#include "kern_util.h"
#include "ptrace_user.h"
#include "tt.h"
#include "os.h"
long proxy_ptrace(struct debugger *debugger, int arg1, pid_t arg2,
long arg3, long arg4, pid_t child, int *ret)

1
arch/um/kernel/tt/ptproxy/sysdep.c
View File

@ -15,6 +15,7 @@ terms and conditions.
#include "ptrace_user.h"
#include "user_util.h"
#include "user.h"
#include "os.h"
int get_syscall(pid_t pid, long *arg1, long *arg2, long *arg3, long *arg4,
long *arg5)

4
arch/um/os-Linux/Makefile
View File

@ -5,12 +5,12 @@
obj-y = aio.o elf_aux.o file.o helper.o main.o mem.o process.o signal.o \
start_up.o time.o trap.o tt.o tty.o uaccess.o umid.o user_syms.o \
drivers/ sys-$(SUBARCH)/
util.o drivers/ sys-$(SUBARCH)/
obj-$(CONFIG_MODE_SKAS) += skas/
USER_OBJS := aio.o elf_aux.o file.o helper.o main.o mem.o process.o signal.o \
start_up.o time.o trap.o tt.o tty.o uaccess.o umid.o
start_up.o time.o trap.o tt.o tty.o uaccess.o umid.o util.o
elf_aux.o: $(ARCH_DIR)/kernel-offsets.h
CFLAGS_elf_aux.o += -I$(objtree)/arch/um

48
arch/um/os-Linux/tt.c
View File

@ -63,6 +63,54 @@ void kill_child_dead(int pid)
} while(1);
}
void stop(void)
{
while(1) sleep(1000000);
}
int wait_for_stop(int pid, int sig, int cont_type, void *relay)
{
sigset_t *relay_signals = relay;
int status, ret;
while(1){
CATCH_EINTR(ret = waitpid(pid, &status, WUNTRACED));
if((ret < 0) ||
!WIFSTOPPED(status) || (WSTOPSIG(status) != sig)){
if(ret < 0){
printk("wait failed, errno = %d\n",
errno);
}
else if(WIFEXITED(status))
printk("process %d exited with status %d\n",
pid, WEXITSTATUS(status));
else if(WIFSIGNALED(status))
printk("process %d exited with signal %d\n",
pid, WTERMSIG(status));
else if((WSTOPSIG(status) == SIGVTALRM) ||
(WSTOPSIG(status) == SIGALRM) ||
(WSTOPSIG(status) == SIGIO) ||
(WSTOPSIG(status) == SIGPROF) ||
(WSTOPSIG(status) == SIGCHLD) ||
(WSTOPSIG(status) == SIGWINCH) ||
(WSTOPSIG(status) == SIGINT)){
ptrace(cont_type, pid, 0, WSTOPSIG(status));
continue;
}
else if((relay_signals != NULL) &&
sigismember(relay_signals, WSTOPSIG(status))){
ptrace(cont_type, pid, 0, WSTOPSIG(status));
continue;
}
else printk("process %d stopped with signal %d\n",
pid, WSTOPSIG(status));
panic("wait_for_stop failed to wait for %d to stop "
"with %d\n", pid, sig);
}
return(status);
}
}
/*
*-------------------------
* only for tt mode (will be deleted in future...)

68
arch/um/kernel/user_util.c → arch/um/os-Linux/util.c
View File

@ -1,4 +1,4 @@
/*
/*
* Copyright (C) 2000, 2001, 2002 Jeff Dike (jdike@karaya.com)
* Licensed under the GPL
*/
@ -29,17 +29,13 @@
#include "init.h"
#include "ptrace_user.h"
#include "uml-config.h"
void stop(void)
{
while(1) sleep(1000000);
}
#include "os.h"
void stack_protections(unsigned long address)
{
int prot = PROT_READ | PROT_WRITE | PROT_EXEC;
if(mprotect((void *) address, page_size(), prot) < 0)
if(mprotect((void *) address, page_size(), prot) < 0)
panic("protecting stack failed, errno = %d", errno);
}
@ -59,49 +55,6 @@ void task_protections(unsigned long address)
panic("protecting stack failed, errno = %d", errno);
}
int wait_for_stop(int pid, int sig, int cont_type, void *relay)
{
sigset_t *relay_signals = relay;
int status, ret;
while(1){
CATCH_EINTR(ret = waitpid(pid, &status, WUNTRACED));
if((ret < 0) ||
!WIFSTOPPED(status) || (WSTOPSIG(status) != sig)){
if(ret < 0){
printk("wait failed, errno = %d\n",
errno);
}
else if(WIFEXITED(status))
printk("process %d exited with status %d\n",
pid, WEXITSTATUS(status));
else if(WIFSIGNALED(status))
printk("process %d exited with signal %d\n",
pid, WTERMSIG(status));
else if((WSTOPSIG(status) == SIGVTALRM) ||
(WSTOPSIG(status) == SIGALRM) ||
(WSTOPSIG(status) == SIGIO) ||
(WSTOPSIG(status) == SIGPROF) ||
(WSTOPSIG(status) == SIGCHLD) ||
(WSTOPSIG(status) == SIGWINCH) ||
(WSTOPSIG(status) == SIGINT)){
ptrace(cont_type, pid, 0, WSTOPSIG(status));
continue;
}
else if((relay_signals != NULL) &&
sigismember(relay_signals, WSTOPSIG(status))){
ptrace(cont_type, pid, 0, WSTOPSIG(status));
continue;
}
else printk("process %d stopped with signal %d\n",
pid, WSTOPSIG(status));
panic("wait_for_stop failed to wait for %d to stop "
"with %d\n", pid, sig);
}
return(status);
}
}
int raw(int fd)
{
struct termios tt;
@ -113,7 +66,7 @@ int raw(int fd)
cfmakeraw(&tt);
CATCH_EINTR(err = tcsetattr(fd, TCSADRAIN, &tt));
CATCH_EINTR(err = tcsetattr(fd, TCSADRAIN, &tt));
if(err < 0)
return -errno;
@ -149,7 +102,7 @@ void setup_hostinfo(void)
int setjmp_wrapper(void (*proc)(void *, void *), ...)
{
va_list args;
va_list args;
sigjmp_buf buf;
int n;
@ -161,14 +114,3 @@ int setjmp_wrapper(void (*proc)(void *, void *), ...)
va_end(args);
return(n);
}
/*
* 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:
*/