Commit 4fef0c10 authored by Gennady Sharapov's avatar Gennady Sharapov Committed by Linus Torvalds
Browse files

[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: default avatarGennady Sharapov <Gennady.V.Sharapov@intel.com>
Signed-off-by: default avatarJeff Dike <jdike@addtoit.com>
Cc: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 12919aa6
...@@ -11,6 +11,7 @@ ...@@ -11,6 +11,7 @@
#include "user.h" #include "user.h"
#include "user_util.h" #include "user_util.h"
#include "chan_user.h" #include "chan_user.h"
#include "os.h"
struct fd_chan { struct fd_chan {
int fd; int fd;
......
...@@ -195,6 +195,8 @@ extern unsigned long long os_usecs(void); ...@@ -195,6 +195,8 @@ extern unsigned long long os_usecs(void);
/* tt.c /* tt.c
* for tt mode only (will be deleted in future...) * 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, extern int protect_memory(unsigned long addr, unsigned long len,
int r, int w, int x, int must_succeed); int r, int w, int x, int must_succeed);
extern void forward_pending_sigio(int target); extern void forward_pending_sigio(int target);
...@@ -235,4 +237,12 @@ extern int set_signals(int enable); ...@@ -235,4 +237,12 @@ extern int set_signals(int enable);
extern void os_fill_handlinfo(struct kern_handlers h); extern void os_fill_handlinfo(struct kern_handlers h);
extern void do_longjmp(void *p, int val); 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 #endif
...@@ -44,10 +44,6 @@ extern unsigned long brk_start; ...@@ -44,10 +44,6 @@ extern unsigned long brk_start;
extern int pty_output_sigio; extern int pty_output_sigio;
extern int pty_close_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 void *add_signal_handler(int sig, void (*handler)(int));
extern int linux_main(int argc, char **argv); extern int linux_main(int argc, char **argv);
extern void set_cmdline(char *cmd); extern void set_cmdline(char *cmd);
...@@ -55,8 +51,6 @@ extern void input_cb(void (*proc)(void *), void *arg, int arg_len); ...@@ -55,8 +51,6 @@ extern void input_cb(void (*proc)(void *), void *arg, int arg_len);
extern int get_pty(void); extern int get_pty(void);
extern void *um_kmalloc(int size); extern void *um_kmalloc(int size);
extern int switcheroo(int fd, int prot, void *from, void *to, 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 do_exec(int old_pid, int new_pid);
extern void tracer_panic(char *msg, ...); extern void tracer_panic(char *msg, ...);
extern int detach(int pid, int sig); extern int detach(int pid, int sig);
...@@ -70,18 +64,6 @@ extern int cpu_feature(char *what, char *buf, int len); ...@@ -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_handle_signal(int sig, union uml_pt_regs *regs);
extern int arch_fixup(unsigned long address, void *sc_ptr); extern int arch_fixup(unsigned long address, void *sc_ptr);
extern void arch_init_thread(void); extern void arch_init_thread(void);
extern int setjmp_wrapper(void (*proc)(void *, void *), ...);
extern int raw(int fd); extern int raw(int fd);
#endif #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:
*/
...@@ -10,8 +10,7 @@ obj-y = config.o exec_kern.o exitcode.o \ ...@@ -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 \ 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 \ 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 \ 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 \ time_kern.o tlb.o trap_kern.o uaccess.o um_arch.o umid.o
user_util.o
obj-$(CONFIG_BLK_DEV_INITRD) += initrd.o obj-$(CONFIG_BLK_DEV_INITRD) += initrd.o
obj-$(CONFIG_GPROF) += gprof_syms.o obj-$(CONFIG_GPROF) += gprof_syms.o
...@@ -24,7 +23,7 @@ obj-$(CONFIG_MODE_SKAS) += skas/ ...@@ -24,7 +23,7 @@ obj-$(CONFIG_MODE_SKAS) += skas/
user-objs-$(CONFIG_TTY_LOG) += tty_log.o 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 include arch/um/scripts/Makefile.rules
......
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
#include "asm/pgtable.h" #include "asm/pgtable.h"
#include "asm/uaccess.h" #include "asm/uaccess.h"
#include "kern_util.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, extern void *um_virt_to_phys(struct task_struct *task, unsigned long addr,
pte_t *pte_out); pte_t *pte_out);
......
...@@ -20,6 +20,7 @@ ...@@ -20,6 +20,7 @@
#include "user_util.h" #include "user_util.h"
#include "tt.h" #include "tt.h"
#include "sysdep/thread.h" #include "sysdep/thread.h"
#include "os.h"
extern int debugger_pid; extern int debugger_pid;
extern int debugger_fd; extern int debugger_fd;
......
...@@ -20,6 +20,7 @@ Jeff Dike (jdike@karaya.com) : Modified for integration into uml ...@@ -20,6 +20,7 @@ Jeff Dike (jdike@karaya.com) : Modified for integration into uml
#include "kern_util.h" #include "kern_util.h"
#include "ptrace_user.h" #include "ptrace_user.h"
#include "tt.h" #include "tt.h"
#include "os.h"
long proxy_ptrace(struct debugger *debugger, int arg1, pid_t arg2, long proxy_ptrace(struct debugger *debugger, int arg1, pid_t arg2,
long arg3, long arg4, pid_t child, int *ret) long arg3, long arg4, pid_t child, int *ret)
......
...@@ -15,6 +15,7 @@ terms and conditions. ...@@ -15,6 +15,7 @@ terms and conditions.
#include "ptrace_user.h" #include "ptrace_user.h"
#include "user_util.h" #include "user_util.h"
#include "user.h" #include "user.h"
#include "os.h"
int get_syscall(pid_t pid, long *arg1, long *arg2, long *arg3, long *arg4, int get_syscall(pid_t pid, long *arg1, long *arg2, long *arg3, long *arg4,
long *arg5) long *arg5)
......
...@@ -5,12 +5,12 @@ ...@@ -5,12 +5,12 @@
obj-y = aio.o elf_aux.o file.o helper.o main.o mem.o process.o signal.o \ 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 \ 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/ obj-$(CONFIG_MODE_SKAS) += skas/
USER_OBJS := aio.o elf_aux.o file.o helper.o main.o mem.o process.o signal.o \ 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 elf_aux.o: $(ARCH_DIR)/kernel-offsets.h
CFLAGS_elf_aux.o += -I$(objtree)/arch/um CFLAGS_elf_aux.o += -I$(objtree)/arch/um
......
...@@ -63,6 +63,54 @@ void kill_child_dead(int pid) ...@@ -63,6 +63,54 @@ void kill_child_dead(int pid)
} while(1); } 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...) * only for tt mode (will be deleted in future...)
......
/* /*
* Copyright (C) 2000, 2001, 2002 Jeff Dike (jdike@karaya.com) * Copyright (C) 2000, 2001, 2002 Jeff Dike (jdike@karaya.com)
* Licensed under the GPL * Licensed under the GPL
*/ */
...@@ -29,17 +29,13 @@ ...@@ -29,17 +29,13 @@
#include "init.h" #include "init.h"
#include "ptrace_user.h" #include "ptrace_user.h"
#include "uml-config.h" #include "uml-config.h"
#include "os.h"
void stop(void)
{
while(1) sleep(1000000);
}
void stack_protections(unsigned long address) void stack_protections(unsigned long address)
{ {
int prot = PROT_READ | PROT_WRITE | PROT_EXEC; 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); panic("protecting stack failed, errno = %d", errno);
} }
...@@ -59,49 +55,6 @@ void task_protections(unsigned long address) ...@@ -59,49 +55,6 @@ void task_protections(unsigned long address)
panic("protecting stack failed, errno = %d", errno); 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) int raw(int fd)
{ {
struct termios tt; struct termios tt;
...@@ -113,7 +66,7 @@ int raw(int fd) ...@@ -113,7 +66,7 @@ int raw(int fd)
cfmakeraw(&tt); cfmakeraw(&tt);
CATCH_EINTR(err = tcsetattr(fd, TCSADRAIN, &tt)); CATCH_EINTR(err = tcsetattr(fd, TCSADRAIN, &tt));
if(err < 0) if(err < 0)
return -errno; return -errno;
...@@ -149,7 +102,7 @@ void setup_hostinfo(void) ...@@ -149,7 +102,7 @@ void setup_hostinfo(void)
int setjmp_wrapper(void (*proc)(void *, void *), ...) int setjmp_wrapper(void (*proc)(void *, void *), ...)
{ {
va_list args; va_list args;
sigjmp_buf buf; sigjmp_buf buf;
int n; int n;
...@@ -161,14 +114,3 @@ int setjmp_wrapper(void (*proc)(void *, void *), ...) ...@@ -161,14 +114,3 @@ int setjmp_wrapper(void (*proc)(void *, void *), ...)
va_end(args); va_end(args);
return(n); 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:
*/
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment