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

[PATCH] uml: move libc-dependent code from trap_user.c



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

This moves all systemcalls from trap_user.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 0805d89c
/* /*
* 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
*/ */
...@@ -10,6 +10,19 @@ ...@@ -10,6 +10,19 @@
#include "sysdep/ptrace.h" #include "sysdep/ptrace.h"
#include "sysdep/faultinfo.h" #include "sysdep/faultinfo.h"
typedef void (*kern_hndl)(int, union uml_pt_regs *);
struct kern_handlers {
kern_hndl relay_signal;
kern_hndl winch;
kern_hndl bus_handler;
kern_hndl page_fault;
kern_hndl sigio_handler;
kern_hndl timer_handler;
};
extern struct kern_handlers handlinfo_kern;
extern int ncpus; extern int ncpus;
extern char *linux_prog; extern char *linux_prog;
extern char *gdb_init; extern char *gdb_init;
...@@ -109,6 +122,8 @@ extern void arch_switch(void); ...@@ -109,6 +122,8 @@ extern void arch_switch(void);
extern void free_irq(unsigned int, void *); extern void free_irq(unsigned int, void *);
extern int um_in_interrupt(void); extern int um_in_interrupt(void);
extern int cpu(void); extern int cpu(void);
extern void segv_handler(int sig, union uml_pt_regs *regs);
extern void sigio_handler(int sig, union uml_pt_regs *regs);
#endif #endif
......
...@@ -9,6 +9,8 @@ ...@@ -9,6 +9,8 @@
#include "uml-config.h" #include "uml-config.h"
#include "asm/types.h" #include "asm/types.h"
#include "../os/include/file.h" #include "../os/include/file.h"
#include "sysdep/ptrace.h"
#include "kern_util.h"
#define OS_TYPE_FILE 1 #define OS_TYPE_FILE 1
#define OS_TYPE_DIR 2 #define OS_TYPE_DIR 2
...@@ -229,4 +231,8 @@ extern void unblock_signals(void); ...@@ -229,4 +231,8 @@ extern void unblock_signals(void);
extern int get_signals(void); extern int get_signals(void);
extern int set_signals(int enable); extern int set_signals(int enable);
/* trap.c */
extern void os_fill_handlinfo(struct kern_handlers h);
extern void do_longjmp(void *p, int val);
#endif #endif
/* /*
* 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
*/ */
...@@ -23,12 +23,7 @@ struct cpu_task { ...@@ -23,12 +23,7 @@ struct cpu_task {
extern struct cpu_task cpu_tasks[]; extern struct cpu_task cpu_tasks[];
struct signal_info { extern void (*sig_info[])(int, union uml_pt_regs *);
void (*handler)(int, union uml_pt_regs *);
int is_irq;
};
extern struct signal_info sig_info[];
extern unsigned long low_physmem; extern unsigned long low_physmem;
extern unsigned long high_physmem; extern unsigned long high_physmem;
...@@ -64,7 +59,6 @@ extern void setup_machinename(char *machine_out); ...@@ -64,7 +59,6 @@ extern void setup_machinename(char *machine_out);
extern void setup_hostinfo(void); 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 void do_longjmp(void *p, int val);
extern int detach(int pid, int sig); extern int detach(int pid, int sig);
extern int attach(int pid); extern int attach(int pid);
extern void kill_child_dead(int pid); extern void kill_child_dead(int pid);
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
# #
obj-y := clone.o exec_kern.o mem.o mem_user.o mmu.o process.o process_kern.o \ obj-y := clone.o exec_kern.o mem.o mem_user.o mmu.o process.o process_kern.o \
syscall.o tlb.o trap_user.o uaccess.o syscall.o tlb.o uaccess.o
USER_OBJS := process.o clone.o USER_OBJS := process.o clone.o
......
/* /*
* Copyright (C) 2000, 2001 Jeff Dike (jdike@karaya.com) * Copyright (C) 2000, 2001 Jeff Dike (jdike@karaya.com)
* Licensed under the GPL * Licensed under the GPL
*/ */
...@@ -29,6 +29,7 @@ ...@@ -29,6 +29,7 @@
#ifdef CONFIG_MODE_SKAS #ifdef CONFIG_MODE_SKAS
#include "skas.h" #include "skas.h"
#endif #endif
#include "os.h"
/* Note this is constrained to return 0, -EFAULT, -EACCESS, -ENOMEM by segv(). */ /* Note this is constrained to return 0, -EFAULT, -EACCESS, -ENOMEM by segv(). */
int handle_page_fault(unsigned long address, unsigned long ip, int handle_page_fault(unsigned long address, unsigned long ip,
...@@ -125,6 +126,14 @@ out_of_memory: ...@@ -125,6 +126,14 @@ out_of_memory:
goto out; goto out;
} }
struct kern_handlers handlinfo_kern = {
.relay_signal = relay_signal,
.winch = winch,
.bus_handler = relay_signal,
.page_fault = segv_handler,
.sigio_handler = sigio_handler,
.timer_handler = timer_handler
};
/* /*
* We give a *copy* of the faultinfo in the regs to segv. * We give a *copy* of the faultinfo in the regs to segv.
* This must be done, since nesting SEGVs could overwrite * This must be done, since nesting SEGVs could overwrite
......
/* /*
* 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
*/ */
...@@ -25,20 +25,6 @@ ...@@ -25,20 +25,6 @@
#include "user_util.h" #include "user_util.h"
#include "os.h" #include "os.h"
void kill_child_dead(int pid)
{
kill(pid, SIGKILL);
kill(pid, SIGCONT);
do {
int n;
CATCH_EINTR(n = waitpid(pid, NULL, 0));
if (n > 0)
kill(pid, SIGCONT);
else
break;
} while(1);
}
void segv_handler(int sig, union uml_pt_regs *regs) void segv_handler(int sig, union uml_pt_regs *regs)
{ {
struct faultinfo * fi = UPT_FAULTINFO(regs); struct faultinfo * fi = UPT_FAULTINFO(regs);
...@@ -55,43 +41,18 @@ void usr2_handler(int sig, union uml_pt_regs *regs) ...@@ -55,43 +41,18 @@ void usr2_handler(int sig, union uml_pt_regs *regs)
CHOOSE_MODE(syscall_handler_tt(sig, regs), (void) 0); CHOOSE_MODE(syscall_handler_tt(sig, regs), (void) 0);
} }
struct signal_info sig_info[] = { void (*sig_info[NSIG])(int, union uml_pt_regs *);
[ SIGTRAP ] { .handler = relay_signal,
.is_irq = 0 },
[ SIGFPE ] { .handler = relay_signal,
.is_irq = 0 },
[ SIGILL ] { .handler = relay_signal,
.is_irq = 0 },
[ SIGWINCH ] { .handler = winch,
.is_irq = 1 },
[ SIGBUS ] { .handler = bus_handler,
.is_irq = 0 },
[ SIGSEGV] { .handler = segv_handler,
.is_irq = 0 },
[ SIGIO ] { .handler = sigio_handler,
.is_irq = 1 },
[ SIGVTALRM ] { .handler = timer_handler,
.is_irq = 1 },
[ SIGALRM ] { .handler = timer_handler,
.is_irq = 1 },
[ SIGUSR2 ] { .handler = usr2_handler,
.is_irq = 0 },
};
void do_longjmp(void *b, int val) void os_fill_handlinfo(struct kern_handlers h)
{ {
sigjmp_buf *buf = b; sig_info[SIGTRAP] = h.relay_signal;
sig_info[SIGFPE] = h.relay_signal;
siglongjmp(*buf, val); sig_info[SIGILL] = h.relay_signal;
sig_info[SIGWINCH] = h.winch;
sig_info[SIGBUS] = h.bus_handler;
sig_info[SIGSEGV] = h.page_fault;
sig_info[SIGIO] = h.sigio_handler;
sig_info[SIGVTALRM] = h.timer_handler;
sig_info[SIGALRM] = h.timer_handler;
sig_info[SIGUSR2] = usr2_handler;
} }
/*
* 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:
*/
/* /*
* Copyright (C) 2002 Jeff Dike (jdike@karaya.com) * Copyright (C) 2002 Jeff Dike (jdike@karaya.com)
* Licensed under the GPL * Licensed under the GPL
*/ */
...@@ -18,8 +18,8 @@ void sig_handler_common_tt(int sig, void *sc_ptr) ...@@ -18,8 +18,8 @@ void sig_handler_common_tt(int sig, void *sc_ptr)
{ {
struct sigcontext *sc = sc_ptr; struct sigcontext *sc = sc_ptr;
struct tt_regs save_regs, *r; struct tt_regs save_regs, *r;
struct signal_info *info;
int save_errno = errno, is_user; int save_errno = errno, is_user;
void (*handler)(int, union uml_pt_regs *);
/* This is done because to allow SIGSEGV to be delivered inside a SEGV /* This is done because to allow SIGSEGV to be delivered inside a SEGV
* handler. This can happen in copy_user, and if SEGV is disabled, * handler. This can happen in copy_user, and if SEGV is disabled,
...@@ -40,10 +40,14 @@ void sig_handler_common_tt(int sig, void *sc_ptr) ...@@ -40,10 +40,14 @@ void sig_handler_common_tt(int sig, void *sc_ptr)
if(sig != SIGUSR2) if(sig != SIGUSR2)
r->syscall = -1; r->syscall = -1;
info = &sig_info[sig]; handler = sig_info[sig];
if(!info->is_irq) unblock_signals();
/* unblock SIGALRM, SIGVTALRM, SIGIO if sig isn't IRQ signal */
if (sig != SIGIO && sig != SIGWINCH &&
sig != SIGVTALRM && sig != SIGALRM)
unblock_signals();
(*info->handler)(sig, (union uml_pt_regs *) r); handler(sig, (union uml_pt_regs *) r);
if(is_user){ if(is_user){
interrupt_end(); interrupt_end();
......
/* /*
* Copyright (C) 2000, 2002 Jeff Dike (jdike@karaya.com) * Copyright (C) 2000, 2002 Jeff Dike (jdike@karaya.com)
* Licensed under the GPL * Licensed under the GPL
*/ */
...@@ -363,6 +363,11 @@ int linux_main(int argc, char **argv) ...@@ -363,6 +363,11 @@ int linux_main(int argc, char **argv)
uml_start = CHOOSE_MODE_PROC(set_task_sizes_tt, set_task_sizes_skas, 0, uml_start = CHOOSE_MODE_PROC(set_task_sizes_tt, set_task_sizes_skas, 0,
&host_task_size, &task_size); &host_task_size, &task_size);
/*
* Setting up handlers to 'sig_info' struct
*/
os_fill_handlinfo(handlinfo_kern);
brk_start = (unsigned long) sbrk(0); brk_start = (unsigned long) sbrk(0);
CHOOSE_MODE_PROC(before_mem_tt, before_mem_skas, brk_start); CHOOSE_MODE_PROC(before_mem_tt, before_mem_skas, brk_start);
/* Increase physical memory size for exec-shield users /* Increase physical memory size for exec-shield users
......
...@@ -4,11 +4,13 @@ ...@@ -4,11 +4,13 @@
# #
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 tt.o tty.o uaccess.o umid.o user_syms.o drivers/ \ start_up.o time.o trap.o tt.o tty.o uaccess.o umid.o user_syms.o \
sys-$(SUBARCH)/ 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 \ 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 umid.o start_up.o time.o trap.o tt.o tty.o uaccess.o umid.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
......
#
# Copyright (C) 2002 - 2004 Jeff Dike (jdike@addtoit.com)
# Licensed under the GPL
#
obj-y := trap.o
USER_OBJS := trap.o
include arch/um/scripts/Makefile.rules
/* /*
* Copyright (C) 2002 - 2003 Jeff Dike (jdike@addtoit.com) * Copyright (C) 2002 - 2003 Jeff Dike (jdike@addtoit.com)
* Licensed under the GPL * Licensed under the GPL
*/ */
...@@ -19,7 +19,7 @@ void sig_handler_common_skas(int sig, void *sc_ptr) ...@@ -19,7 +19,7 @@ void sig_handler_common_skas(int sig, void *sc_ptr)
{ {
struct sigcontext *sc = sc_ptr; struct sigcontext *sc = sc_ptr;
struct skas_regs *r; struct skas_regs *r;
struct signal_info *info; void (*handler)(int, union uml_pt_regs *);
int save_errno = errno; int save_errno = errno;
int save_user; int save_user;
...@@ -41,10 +41,15 @@ void sig_handler_common_skas(int sig, void *sc_ptr) ...@@ -41,10 +41,15 @@ void sig_handler_common_skas(int sig, void *sc_ptr)
} }
change_sig(SIGUSR1, 1); change_sig(SIGUSR1, 1);
info = &sig_info[sig];
if(!info->is_irq) unblock_signals();
(*info->handler)(sig, (union uml_pt_regs *) r); handler = sig_info[sig];
/* unblock SIGALRM, SIGVTALRM, SIGIO if sig isn't IRQ signal */
if (sig != SIGIO && sig != SIGWINCH &&
sig != SIGVTALRM && sig != SIGALRM)
unblock_signals();
handler(sig, (union uml_pt_regs *) r);
errno = save_errno; errno = save_errno;
r->is_user = save_user; r->is_user = save_user;
...@@ -54,25 +59,15 @@ extern int ptrace_faultinfo; ...@@ -54,25 +59,15 @@ extern int ptrace_faultinfo;
void user_signal(int sig, union uml_pt_regs *regs, int pid) void user_signal(int sig, union uml_pt_regs *regs, int pid)
{ {
struct signal_info *info; void (*handler)(int, union uml_pt_regs *);
int segv = ((sig == SIGFPE) || (sig == SIGSEGV) || (sig == SIGBUS) || int segv = ((sig == SIGFPE) || (sig == SIGSEGV) || (sig == SIGBUS) ||
(sig == SIGILL) || (sig == SIGTRAP)); (sig == SIGILL) || (sig == SIGTRAP));
if (segv) if (segv)
get_skas_faultinfo(pid, &regs->skas.faultinfo); get_skas_faultinfo(pid, &regs->skas.faultinfo);
info = &sig_info[sig];
(*info->handler)(sig, regs); handler = sig_info[sig];
handler(sig, (union uml_pt_regs *) regs);
unblock_signals(); unblock_signals();
} }
/*
* 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:
*/
/*
* Copyright (C) 2000, 2001, 2002 Jeff Dike (jdike@karaya.com)
* Licensed under the GPL
*/
#include <setjmp.h>
#include <signal.h>
#include "kern_util.h"
#include "user_util.h"
#include "os.h"
void do_longjmp(void *b, int val)
{
sigjmp_buf *buf = b;
siglongjmp(*buf, val);
}
...@@ -49,6 +49,20 @@ int protect_memory(unsigned long addr, unsigned long len, int r, int w, int x, ...@@ -49,6 +49,20 @@ int protect_memory(unsigned long addr, unsigned long len, int r, int w, int x,
return(0); return(0);
} }
void kill_child_dead(int pid)
{
kill(pid, SIGKILL);
kill(pid, SIGCONT);
do {
int n;
CATCH_EINTR(n = waitpid(pid, NULL, 0));
if (n > 0)
kill(pid, SIGCONT);
else
break;
} while(1);
}
/* /*
*------------------------- *-------------------------
* only for tt mode (will be deleted in future...) * only for tt mode (will be deleted in future...)
......
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