[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
zatwierdzone przez
Linus Torvalds
Linus Torvalds
rodzic
12919aa6e0
commit
4fef0c10fa
@@ -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
|
||||
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -1,174 +0,0 @@
|
||||
/*
|
||||
* Copyright (C) 2000, 2001, 2002 Jeff Dike (jdike@karaya.com)
|
||||
* Licensed under the GPL
|
||||
*/
|
||||
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <unistd.h>
|
||||
#include <limits.h>
|
||||
#include <setjmp.h>
|
||||
#include <sys/mman.h>
|
||||
#include <sys/stat.h>
|
||||
#include <sys/utsname.h>
|
||||
#include <sys/param.h>
|
||||
#include <sys/time.h>
|
||||
#include "asm/types.h"
|
||||
#include <ctype.h>
|
||||
#include <signal.h>
|
||||
#include <wait.h>
|
||||
#include <errno.h>
|
||||
#include <stdarg.h>
|
||||
#include <sched.h>
|
||||
#include <termios.h>
|
||||
#include <string.h>
|
||||
#include "user_util.h"
|
||||
#include "kern_util.h"
|
||||
#include "user.h"
|
||||
#include "mem_user.h"
|
||||
#include "init.h"
|
||||
#include "ptrace_user.h"
|
||||
#include "uml-config.h"
|
||||
|
||||
void stop(void)
|
||||
{
|
||||
while(1) sleep(1000000);
|
||||
}
|
||||
|
||||
void stack_protections(unsigned long address)
|
||||
{
|
||||
int prot = PROT_READ | PROT_WRITE | PROT_EXEC;
|
||||
|
||||
if(mprotect((void *) address, page_size(), prot) < 0)
|
||||
panic("protecting stack failed, errno = %d", errno);
|
||||
}
|
||||
|
||||
void task_protections(unsigned long address)
|
||||
{
|
||||
unsigned long guard = address + page_size();
|
||||
unsigned long stack = guard + page_size();
|
||||
int prot = 0, pages;
|
||||
|
||||
#ifdef notdef
|
||||
if(mprotect((void *) stack, page_size(), prot) < 0)
|
||||
panic("protecting guard page failed, errno = %d", errno);
|
||||
#endif
|
||||
pages = (1 << UML_CONFIG_KERNEL_STACK_ORDER) - 2;
|
||||
prot = PROT_READ | PROT_WRITE | PROT_EXEC;
|
||||
if(mprotect((void *) stack, pages * page_size(), prot) < 0)
|
||||
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;
|
||||
int err;
|
||||
|
||||
CATCH_EINTR(err = tcgetattr(fd, &tt));
|
||||
if(err < 0)
|
||||
return -errno;
|
||||
|
||||
cfmakeraw(&tt);
|
||||
|
||||
CATCH_EINTR(err = tcsetattr(fd, TCSADRAIN, &tt));
|
||||
if(err < 0)
|
||||
return -errno;
|
||||
|
||||
/* XXX tcsetattr could have applied only some changes
|
||||
* (and cfmakeraw() is a set of changes) */
|
||||
return(0);
|
||||
}
|
||||
|
||||
void setup_machinename(char *machine_out)
|
||||
{
|
||||
struct utsname host;
|
||||
|
||||
uname(&host);
|
||||
#if defined(UML_CONFIG_UML_X86) && !defined(UML_CONFIG_64BIT)
|
||||
if (!strcmp(host.machine, "x86_64")) {
|
||||
strcpy(machine_out, "i686");
|
||||
return;
|
||||
}
|
||||
#endif
|
||||
strcpy(machine_out, host.machine);
|
||||
}
|
||||
|
||||
char host_info[(_UTSNAME_LENGTH + 1) * 4 + _UTSNAME_NODENAME_LENGTH + 1];
|
||||
|
||||
void setup_hostinfo(void)
|
||||
{
|
||||
struct utsname host;
|
||||
|
||||
uname(&host);
|
||||
sprintf(host_info, "%s %s %s %s %s", host.sysname, host.nodename,
|
||||
host.release, host.version, host.machine);
|
||||
}
|
||||
|
||||
int setjmp_wrapper(void (*proc)(void *, void *), ...)
|
||||
{
|
||||
va_list args;
|
||||
sigjmp_buf buf;
|
||||
int n;
|
||||
|
||||
n = sigsetjmp(buf, 1);
|
||||
if(n == 0){
|
||||
va_start(args, proc);
|
||||
(*proc)(&buf, &args);
|
||||
}
|
||||
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:
|
||||
*/
|
||||
Reference in New Issue
Block a user