提交 ff5c6ff5 编写于 作者: J Jeff Dike 提交者: Linus Torvalds

[PATCH] uml: separate libc-dependent helper code

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

This moves all systemcalls from helper.c file under os-Linux dir
Signed-off-by: NGennady Sharapov <Gennady.V.Sharapov@intel.com>
Signed-off-by: NJeff Dike <jdike@addtoit.com>
Cc: Paolo Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: NAndrew Morton <akpm@osdl.org>
Signed-off-by: NLinus Torvalds <torvalds@osdl.org>
上级 52c653b3
...@@ -16,7 +16,6 @@ ...@@ -16,7 +16,6 @@
#include "user_util.h" #include "user_util.h"
#include "chan_user.h" #include "chan_user.h"
#include "user.h" #include "user.h"
#include "helper.h"
#include "os.h" #include "os.h"
#include "choose-mode.h" #include "choose-mode.h"
#include "mode.h" #include "mode.h"
......
...@@ -46,7 +46,6 @@ ...@@ -46,7 +46,6 @@
#include <linux/smp_lock.h> #include <linux/smp_lock.h>
#include <linux/init.h> #include <linux/init.h>
#include <asm/uaccess.h> #include <asm/uaccess.h>
#include "helper.h"
#include "mconsole.h" #include "mconsole.h"
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
......
...@@ -8,7 +8,6 @@ ...@@ -8,7 +8,6 @@
#include <errno.h> #include <errno.h>
#include "user_util.h" #include "user_util.h"
#include "user.h" #include "user.h"
#include "helper.h"
#include "mconsole.h" #include "mconsole.h"
#include "os.h" #include "os.h"
#include "choose-mode.h" #include "choose-mode.h"
......
...@@ -16,7 +16,6 @@ ...@@ -16,7 +16,6 @@
#include "user_util.h" #include "user_util.h"
#include "kern_util.h" #include "kern_util.h"
#include "net_user.h" #include "net_user.h"
#include "helper.h"
#include "os.h" #include "os.h"
int tap_open_common(void *dev, char *gate_addr) int tap_open_common(void *dev, char *gate_addr)
......
...@@ -18,7 +18,6 @@ ...@@ -18,7 +18,6 @@
#include "user.h" #include "user.h"
#include "chan_user.h" #include "chan_user.h"
#include "port.h" #include "port.h"
#include "helper.h"
#include "os.h" #include "os.h"
struct port_chan { struct port_chan {
......
...@@ -14,7 +14,6 @@ ...@@ -14,7 +14,6 @@
#include "net_user.h" #include "net_user.h"
#include "slip.h" #include "slip.h"
#include "slip_common.h" #include "slip_common.h"
#include "helper.h"
#include "os.h" #include "os.h"
void slip_user_init(void *data, void *dev) void slip_user_init(void *data, void *dev)
......
...@@ -13,7 +13,6 @@ ...@@ -13,7 +13,6 @@
#include "net_user.h" #include "net_user.h"
#include "slirp.h" #include "slirp.h"
#include "slip_common.h" #include "slip_common.h"
#include "helper.h"
#include "os.h" #include "os.h"
void slirp_user_init(void *data, void *dev) void slirp_user_init(void *data, void *dev)
......
...@@ -14,7 +14,6 @@ ...@@ -14,7 +14,6 @@
#include <sys/socket.h> #include <sys/socket.h>
#include "kern_util.h" #include "kern_util.h"
#include "chan_user.h" #include "chan_user.h"
#include "helper.h"
#include "user_util.h" #include "user_util.h"
#include "user.h" #include "user.h"
#include "os.h" #include "os.h"
......
/*
* Copyright (C) 2002 Jeff Dike (jdike@karaya.com)
* Licensed under the GPL
*/
#ifndef __HELPER_H__
#define __HELPER_H__
extern int run_helper(void (*pre_exec)(void *), void *pre_data, char **argv,
unsigned long *stack_out);
extern int run_helper_thread(int (*proc)(void *), void *arg,
unsigned int flags, unsigned long *stack_out,
int stack_order);
extern int helper_wait(int pid);
#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:
*/
...@@ -205,6 +205,14 @@ extern unsigned long __do_user_copy(void *to, const void *from, int n, ...@@ -205,6 +205,14 @@ extern unsigned long __do_user_copy(void *to, const void *from, int n,
void (*op)(void *to, const void *from, void (*op)(void *to, const void *from,
int n), int *faulted_out); int n), int *faulted_out);
/* helper.c */
extern int run_helper(void (*pre_exec)(void *), void *pre_data, char **argv,
unsigned long *stack_out);
extern int run_helper_thread(int (*proc)(void *), void *arg,
unsigned int flags, unsigned long *stack_out,
int stack_order);
extern int helper_wait(int pid);
#endif #endif
/* /*
......
...@@ -7,7 +7,7 @@ extra-y := vmlinux.lds ...@@ -7,7 +7,7 @@ extra-y := vmlinux.lds
clean-files := clean-files :=
obj-y = config.o exec_kern.o exitcode.o \ obj-y = config.o exec_kern.o exitcode.o \
helper.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 signal_user.o smp.o syscall_kern.o sysrq.o time.o \ signal_kern.o signal_user.o smp.o syscall_kern.o sysrq.o time.o \
time_kern.o tlb.o trap_kern.o trap_user.o uaccess.o um_arch.o \ time_kern.o tlb.o trap_kern.o trap_user.o uaccess.o um_arch.o \
...@@ -24,8 +24,7 @@ obj-$(CONFIG_MODE_SKAS) += skas/ ...@@ -24,8 +24,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 helper.o time.o tty_log.o umid.o \ USER_OBJS := $(user-objs-y) config.o time.o tty_log.o umid.o user_util.o
user_util.o
include arch/um/scripts/Makefile.rules include arch/um/scripts/Makefile.rules
......
...@@ -20,7 +20,6 @@ ...@@ -20,7 +20,6 @@
#include "user_util.h" #include "user_util.h"
#include "mem_user.h" #include "mem_user.h"
#include "os.h" #include "os.h"
#include "helper.h"
EXPORT_SYMBOL(stop); EXPORT_SYMBOL(stop);
EXPORT_SYMBOL(uml_physmem); EXPORT_SYMBOL(uml_physmem);
......
...@@ -18,7 +18,6 @@ ...@@ -18,7 +18,6 @@
#include "kern_util.h" #include "kern_util.h"
#include "user_util.h" #include "user_util.h"
#include "sigio.h" #include "sigio.h"
#include "helper.h"
#include "os.h" #include "os.h"
/* Changed during early boot */ /* Changed during early boot */
......
...@@ -27,7 +27,6 @@ ...@@ -27,7 +27,6 @@
#include "user.h" #include "user.h"
#include "mem_user.h" #include "mem_user.h"
#include "init.h" #include "init.h"
#include "helper.h"
#include "ptrace_user.h" #include "ptrace_user.h"
#include "uml-config.h" #include "uml-config.h"
......
...@@ -3,10 +3,11 @@ ...@@ -3,10 +3,11 @@
# Licensed under the GPL # Licensed under the GPL
# #
obj-y = aio.o elf_aux.o file.o main.o mem.o process.o signal.o start_up.o \ obj-y = aio.o elf_aux.o file.o helper.o main.o mem.o process.o signal.o \
time.o tt.o tty.o uaccess.o user_syms.o drivers/ sys-$(SUBARCH)/ start_up.o time.o tt.o tty.o uaccess.o user_syms.o drivers/ \
sys-$(SUBARCH)/
USER_OBJS := aio.o elf_aux.o file.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 tt.o tty.o uaccess.o start_up.o time.o tt.o tty.o uaccess.o
elf_aux.o: $(ARCH_DIR)/kernel-offsets.h elf_aux.o: $(ARCH_DIR)/kernel-offsets.h
......
...@@ -10,7 +10,6 @@ ...@@ -10,7 +10,6 @@
#include <sched.h> #include <sched.h>
#include <sys/syscall.h> #include <sys/syscall.h>
#include "os.h" #include "os.h"
#include "helper.h"
#include "aio.h" #include "aio.h"
#include "init.h" #include "init.h"
#include "user.h" #include "user.h"
......
...@@ -19,7 +19,6 @@ ...@@ -19,7 +19,6 @@
#include "user_util.h" #include "user_util.h"
#include "net_user.h" #include "net_user.h"
#include "etap.h" #include "etap.h"
#include "helper.h"
#include "os.h" #include "os.h"
#define MAX_PACKET ETH_MAX_PACKET #define MAX_PACKET ETH_MAX_PACKET
......
...@@ -20,7 +20,6 @@ ...@@ -20,7 +20,6 @@
#include "kern_util.h" #include "kern_util.h"
#include "user_util.h" #include "user_util.h"
#include "user.h" #include "user.h"
#include "helper.h"
#include "os.h" #include "os.h"
#define MAX_PACKET ETH_MAX_PACKET #define MAX_PACKET ETH_MAX_PACKET
......
/* /*
* Copyright (C) 2002 Jeff Dike (jdike@karaya.com) * Copyright (C) 2002 Jeff Dike (jdike@karaya.com)
* Licensed under the GPL * Licensed under the GPL
*/ */
...@@ -13,7 +13,6 @@ ...@@ -13,7 +13,6 @@
#include "user.h" #include "user.h"
#include "kern_util.h" #include "kern_util.h"
#include "user_util.h" #include "user_util.h"
#include "helper.h"
#include "os.h" #include "os.h"
struct helper_data { struct helper_data {
...@@ -46,7 +45,7 @@ static int helper_child(void *arg) ...@@ -46,7 +45,7 @@ static int helper_child(void *arg)
errval = errno; errval = errno;
printk("execvp of '%s' failed - errno = %d\n", argv[0], errno); printk("execvp of '%s' failed - errno = %d\n", argv[0], errno);
os_write_file(data->fd, &errval, sizeof(errval)); os_write_file(data->fd, &errval, sizeof(errval));
os_kill_process(os_getpid(), 0); kill(os_getpid(), SIGKILL);
return(0); return(0);
} }
...@@ -90,7 +89,7 @@ int run_helper(void (*pre_exec)(void *), void *pre_data, char **argv, ...@@ -90,7 +89,7 @@ int run_helper(void (*pre_exec)(void *), void *pre_data, char **argv,
goto out_close; goto out_close;
} }
os_close_file(fds[1]); close(fds[1]);
fds[1] = -1; fds[1] = -1;
/*Read the errno value from the child.*/ /*Read the errno value from the child.*/
...@@ -98,7 +97,8 @@ int run_helper(void (*pre_exec)(void *), void *pre_data, char **argv, ...@@ -98,7 +97,8 @@ int run_helper(void (*pre_exec)(void *), void *pre_data, char **argv,
if(n < 0){ if(n < 0){
printk("run_helper : read on pipe failed, ret = %d\n", -n); printk("run_helper : read on pipe failed, ret = %d\n", -n);
ret = n; ret = n;
os_kill_process(pid, 1); kill(pid, SIGKILL);
CATCH_EINTR(waitpid(pid, NULL, 0));
} }
else if(n != 0){ else if(n != 0){
CATCH_EINTR(n = waitpid(pid, NULL, 0)); CATCH_EINTR(n = waitpid(pid, NULL, 0));
...@@ -109,8 +109,8 @@ int run_helper(void (*pre_exec)(void *), void *pre_data, char **argv, ...@@ -109,8 +109,8 @@ int run_helper(void (*pre_exec)(void *), void *pre_data, char **argv,
out_close: out_close:
if (fds[1] != -1) if (fds[1] != -1)
os_close_file(fds[1]); close(fds[1]);
os_close_file(fds[0]); close(fds[0]);
out_free: out_free:
if(stack_out == NULL) if(stack_out == NULL)
free_stack(stack, 0); free_stack(stack, 0);
...@@ -118,7 +118,7 @@ int run_helper(void (*pre_exec)(void *), void *pre_data, char **argv, ...@@ -118,7 +118,7 @@ int run_helper(void (*pre_exec)(void *), void *pre_data, char **argv,
return(ret); return(ret);
} }
int run_helper_thread(int (*proc)(void *), void *arg, unsigned int flags, int run_helper_thread(int (*proc)(void *), void *arg, unsigned int flags,
unsigned long *stack_out, int stack_order) unsigned long *stack_out, int stack_order)
{ {
unsigned long stack, sp; unsigned long stack, sp;
...@@ -131,7 +131,7 @@ int run_helper_thread(int (*proc)(void *), void *arg, unsigned int flags, ...@@ -131,7 +131,7 @@ int run_helper_thread(int (*proc)(void *), void *arg, unsigned int flags,
pid = clone(proc, (void *) sp, flags | SIGCHLD, arg); pid = clone(proc, (void *) sp, flags | SIGCHLD, arg);
if(pid < 0){ if(pid < 0){
err = -errno; err = -errno;
printk("run_helper_thread : clone failed, errno = %d\n", printk("run_helper_thread : clone failed, errno = %d\n",
errno); errno);
return err; return err;
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册