Commit 0805d89c authored by Gennady Sharapov's avatar Gennady Sharapov Committed by Linus Torvalds

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

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

This moves all systemcalls from signal_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 b2de464f
...@@ -51,8 +51,6 @@ extern void timer_handler(int sig, union uml_pt_regs *regs); ...@@ -51,8 +51,6 @@ extern void timer_handler(int sig, union uml_pt_regs *regs);
extern int set_signals(int enable); extern int set_signals(int enable);
extern void force_sigbus(void); extern void force_sigbus(void);
extern int pid_to_processor_id(int pid); extern int pid_to_processor_id(int pid);
extern void block_signals(void);
extern void unblock_signals(void);
extern void deliver_signals(void *t); extern void deliver_signals(void *t);
extern int next_syscall_index(int max); extern int next_syscall_index(int max);
extern int next_trap_index(int max); extern int next_trap_index(int max);
......
...@@ -219,4 +219,14 @@ extern int umid_file_name(char *name, char *buf, int len); ...@@ -219,4 +219,14 @@ extern int umid_file_name(char *name, char *buf, int len);
extern int set_umid(char *name); extern int set_umid(char *name);
extern char *get_umid(void); extern char *get_umid(void);
/* signal.c */
extern void set_sigstack(void *sig_stack, int size);
extern void remove_sigstack(void);
extern void set_handler(int sig, void (*handler)(int), int flags, ...);
extern int change_sig(int signal, int on);
extern void block_signals(void);
extern void unblock_signals(void);
extern int get_signals(void);
extern int set_signals(int enable);
#endif #endif
/*
* Copyright (C) 2001 Jeff Dike (jdike@karaya.com)
* Licensed under the GPL
*/
#ifndef __SIGNAL_USER_H__
#define __SIGNAL_USER_H__
extern int signal_stack_size;
extern int change_sig(int signal, int on);
extern void set_sigstack(void *stack, int size);
extern void set_handler(int sig, void (*handler)(int), int flags, ...);
extern int set_signals(int enable);
extern int get_signals(void);
#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:
*/
...@@ -9,7 +9,7 @@ clean-files := ...@@ -9,7 +9,7 @@ clean-files :=
obj-y = config.o exec_kern.o exitcode.o \ 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 signal_user.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 trap_user.o uaccess.o um_arch.o umid.o \ time_kern.o tlb.o trap_kern.o trap_user.o uaccess.o um_arch.o umid.o \
user_util.o user_util.o
......
...@@ -15,7 +15,6 @@ ...@@ -15,7 +15,6 @@
#include "kern_util.h" #include "kern_util.h"
#include "user.h" #include "user.h"
#include "process.h" #include "process.h"
#include "signal_user.h"
#include "sigio.h" #include "sigio.h"
#include "irq_user.h" #include "irq_user.h"
#include "os.h" #include "os.h"
......
...@@ -36,7 +36,6 @@ ...@@ -36,7 +36,6 @@
#include "kern_util.h" #include "kern_util.h"
#include "kern.h" #include "kern.h"
#include "signal_kern.h" #include "signal_kern.h"
#include "signal_user.h"
#include "init.h" #include "init.h"
#include "irq_user.h" #include "irq_user.h"
#include "mem_user.h" #include "mem_user.h"
......
...@@ -22,7 +22,6 @@ ...@@ -22,7 +22,6 @@
#include "asm/ucontext.h" #include "asm/ucontext.h"
#include "kern_util.h" #include "kern_util.h"
#include "signal_kern.h" #include "signal_kern.h"
#include "signal_user.h"
#include "kern.h" #include "kern.h"
#include "frame_kern.h" #include "frame_kern.h"
#include "sigcontext.h" #include "sigcontext.h"
......
/*
* Copyright (C) 2000 Jeff Dike (jdike@karaya.com)
* Licensed under the GPL
*/
#include <stdio.h>
#include <unistd.h>
#include <stdlib.h>
#include <signal.h>
#include <errno.h>
#include <stdarg.h>
#include <string.h>
#include <sys/mman.h>
#include "user_util.h"
#include "kern_util.h"
#include "user.h"
#include "signal_user.h"
#include "signal_kern.h"
#include "sysdep/sigcontext.h"
#include "sigcontext.h"
void set_sigstack(void *sig_stack, int size)
{
stack_t stack = ((stack_t) { .ss_flags = 0,
.ss_sp = (__ptr_t) sig_stack,
.ss_size = size - sizeof(void *) });
if(sigaltstack(&stack, NULL) != 0)
panic("enabling signal stack failed, errno = %d\n", errno);
}
void set_handler(int sig, void (*handler)(int), int flags, ...)
{
struct sigaction action;
va_list ap;
int mask;
va_start(ap, flags);
action.sa_handler = handler;
sigemptyset(&action.sa_mask);
while((mask = va_arg(ap, int)) != -1){
sigaddset(&action.sa_mask, mask);
}
va_end(ap);
action.sa_flags = flags;
action.sa_restorer = NULL;
if(sigaction(sig, &action, NULL) < 0)
panic("sigaction failed");
}
int change_sig(int signal, int on)
{
sigset_t sigset, old;
sigemptyset(&sigset);
sigaddset(&sigset, signal);
sigprocmask(on ? SIG_UNBLOCK : SIG_BLOCK, &sigset, &old);
return(!sigismember(&old, signal));
}
/* Both here and in set/get_signal we don't touch SIGPROF, because we must not
* disable profiling; it's safe because the profiling code does not interact
* with the kernel code at all.*/
static void change_signals(int type)
{
sigset_t mask;
sigemptyset(&mask);
sigaddset(&mask, SIGVTALRM);
sigaddset(&mask, SIGALRM);
sigaddset(&mask, SIGIO);
if(sigprocmask(type, &mask, NULL) < 0)
panic("Failed to change signal mask - errno = %d", errno);
}
void block_signals(void)
{
change_signals(SIG_BLOCK);
}
void unblock_signals(void)
{
change_signals(SIG_UNBLOCK);
}
/* These are the asynchronous signals. SIGVTALRM and SIGARLM are handled
* together under SIGVTALRM_BIT. SIGPROF is excluded because we want to
* be able to profile all of UML, not just the non-critical sections. If
* profiling is not thread-safe, then that is not my problem. We can disable
* profiling when SMP is enabled in that case.
*/
#define SIGIO_BIT 0
#define SIGVTALRM_BIT 1
static int enable_mask(sigset_t *mask)
{
int sigs;
sigs = sigismember(mask, SIGIO) ? 0 : 1 << SIGIO_BIT;
sigs |= sigismember(mask, SIGVTALRM) ? 0 : 1 << SIGVTALRM_BIT;
sigs |= sigismember(mask, SIGALRM) ? 0 : 1 << SIGVTALRM_BIT;
return(sigs);
}
int get_signals(void)
{
sigset_t mask;
if(sigprocmask(SIG_SETMASK, NULL, &mask) < 0)
panic("Failed to get signal mask");
return(enable_mask(&mask));
}
int set_signals(int enable)
{
sigset_t mask;
int ret;
sigemptyset(&mask);
if(enable & (1 << SIGIO_BIT))
sigaddset(&mask, SIGIO);
if(enable & (1 << SIGVTALRM_BIT)){
sigaddset(&mask, SIGVTALRM);
sigaddset(&mask, SIGALRM);
}
/* This is safe - sigprocmask is guaranteed to copy locally the
* value of new_set, do his work and then, at the end, write to
* old_set.
*/
if(sigprocmask(SIG_UNBLOCK, &mask, &mask) < 0)
panic("Failed to enable signals");
ret = enable_mask(&mask);
sigemptyset(&mask);
if((enable & (1 << SIGIO_BIT)) == 0)
sigaddset(&mask, SIGIO);
if((enable & (1 << SIGVTALRM_BIT)) == 0){
sigaddset(&mask, SIGVTALRM);
sigaddset(&mask, SIGALRM);
}
if(sigprocmask(SIG_BLOCK, &mask, NULL) < 0)
panic("Failed to block signals");
return(ret);
}
/*
* 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:
*/
...@@ -22,7 +22,6 @@ extern int start_idle_thread(void *stack, void *switch_buf_ptr, ...@@ -22,7 +22,6 @@ extern int start_idle_thread(void *stack, void *switch_buf_ptr,
extern int user_thread(unsigned long stack, int flags); extern int user_thread(unsigned long stack, int flags);
extern void userspace(union uml_pt_regs *regs); extern void userspace(union uml_pt_regs *regs);
extern void new_thread_proc(void *stack, void (*handler)(int sig)); extern void new_thread_proc(void *stack, void (*handler)(int sig));
extern void remove_sigstack(void);
extern void new_thread_handler(int sig); extern void new_thread_handler(int sig);
extern void handle_syscall(union uml_pt_regs *regs); extern void handle_syscall(union uml_pt_regs *regs);
extern int map(struct mm_id * mm_idp, unsigned long virt, extern int map(struct mm_id * mm_idp, unsigned long virt,
......
...@@ -31,7 +31,6 @@ ...@@ -31,7 +31,6 @@
#include "proc_mm.h" #include "proc_mm.h"
#include "skas_ptrace.h" #include "skas_ptrace.h"
#include "chan_user.h" #include "chan_user.h"
#include "signal_user.h"
#include "registers.h" #include "registers.h"
#include "mem.h" #include "mem.h"
#include "uml-config.h" #include "uml-config.h"
...@@ -514,16 +513,6 @@ int start_idle_thread(void *stack, void *switch_buf_ptr, void **fork_buf_ptr) ...@@ -514,16 +513,6 @@ int start_idle_thread(void *stack, void *switch_buf_ptr, void **fork_buf_ptr)
siglongjmp(**switch_buf, 1); siglongjmp(**switch_buf, 1);
} }
void remove_sigstack(void)
{
stack_t stack = ((stack_t) { .ss_flags = SS_DISABLE,
.ss_sp = NULL,
.ss_size = 0 });
if(sigaltstack(&stack, NULL) != 0)
panic("disabling signal stack failed, errno = %d\n", errno);
}
void initial_thread_cb_skas(void (*proc)(void *), void *arg) void initial_thread_cb_skas(void (*proc)(void *), void *arg)
{ {
sigjmp_buf here; sigjmp_buf here;
......
...@@ -14,7 +14,6 @@ ...@@ -14,7 +14,6 @@
#include "asm/atomic.h" #include "asm/atomic.h"
#include "kern_util.h" #include "kern_util.h"
#include "time_user.h" #include "time_user.h"
#include "signal_user.h"
#include "skas.h" #include "skas.h"
#include "os.h" #include "os.h"
#include "user_util.h" #include "user_util.h"
......
...@@ -5,7 +5,6 @@ ...@@ -5,7 +5,6 @@
#include <signal.h> #include <signal.h>
#include <errno.h> #include <errno.h>
#include "signal_user.h"
#include "user_util.h" #include "user_util.h"
#include "kern_util.h" #include "kern_util.h"
#include "task.h" #include "task.h"
...@@ -14,6 +13,7 @@ ...@@ -14,6 +13,7 @@
#include "ptrace_user.h" #include "ptrace_user.h"
#include "sysdep/ptrace.h" #include "sysdep/ptrace.h"
#include "sysdep/ptrace_user.h" #include "sysdep/ptrace_user.h"
#include "os.h"
void sig_handler_common_skas(int sig, void *sc_ptr) void sig_handler_common_skas(int sig, void *sc_ptr)
{ {
......
...@@ -14,9 +14,9 @@ ...@@ -14,9 +14,9 @@
#include "kern_util.h" #include "kern_util.h"
#include "user.h" #include "user.h"
#include "process.h" #include "process.h"
#include "signal_user.h"
#include "time_user.h" #include "time_user.h"
#include "kern_constants.h" #include "kern_constants.h"
#include "os.h"
/* XXX This really needs to be declared and initialized in a kernel file since /* XXX This really needs to be declared and initialized in a kernel file since
* it's in <linux/time.h> * it's in <linux/time.h>
......
...@@ -17,7 +17,6 @@ ...@@ -17,7 +17,6 @@
#include "sigcontext.h" #include "sigcontext.h"
#include "sysdep/sigcontext.h" #include "sysdep/sigcontext.h"
#include "irq_user.h" #include "irq_user.h"
#include "signal_user.h"
#include "time_user.h" #include "time_user.h"
#include "task.h" #include "task.h"
#include "mode.h" #include "mode.h"
......
...@@ -14,7 +14,6 @@ ...@@ -14,7 +14,6 @@
#include "kern_util.h" #include "kern_util.h"
#include "irq_user.h" #include "irq_user.h"
#include "time_user.h" #include "time_user.h"
#include "signal_user.h"
#include "mem_user.h" #include "mem_user.h"
#include "os.h" #include "os.h"
#include "tlb.h" #include "tlb.h"
......
...@@ -13,7 +13,6 @@ ...@@ -13,7 +13,6 @@
#include "asm/ptrace.h" #include "asm/ptrace.h"
#include "asm/tlbflush.h" #include "asm/tlbflush.h"
#include "irq_user.h" #include "irq_user.h"
#include "signal_user.h"
#include "kern_util.h" #include "kern_util.h"
#include "user_util.h" #include "user_util.h"
#include "os.h" #include "os.h"
......
...@@ -19,7 +19,6 @@ ...@@ -19,7 +19,6 @@
#include "sigcontext.h" #include "sigcontext.h"
#include "sysdep/sigcontext.h" #include "sysdep/sigcontext.h"
#include "os.h" #include "os.h"
#include "signal_user.h"
#include "user_util.h" #include "user_util.h"
#include "mem_user.h" #include "mem_user.h"
#include "process.h" #include "process.h"
......
...@@ -8,11 +8,11 @@ ...@@ -8,11 +8,11 @@
#include <signal.h> #include <signal.h>
#include "sysdep/ptrace.h" #include "sysdep/ptrace.h"
#include "sysdep/sigcontext.h" #include "sysdep/sigcontext.h"
#include "signal_user.h"
#include "user_util.h" #include "user_util.h"
#include "kern_util.h" #include "kern_util.h"
#include "task.h" #include "task.h"
#include "tt.h" #include "tt.h"
#include "os.h"
void sig_handler_common_tt(int sig, void *sc_ptr) void sig_handler_common_tt(int sig, void *sc_ptr)
{ {
......
...@@ -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 "mem_user.h" #include "mem_user.h"
#include "signal_user.h"
#include "time_user.h" #include "time_user.h"
#include "irq_user.h" #include "irq_user.h"
#include "user.h" #include "user.h"
......
...@@ -15,7 +15,6 @@ ...@@ -15,7 +15,6 @@
#include "os.h" #include "os.h"
#include "user.h" #include "user.h"
#include "user_util.h" #include "user_util.h"
#include "signal_user.h"
#include "process.h" #include "process.h"
#include "irq_user.h" #include "irq_user.h"
#include "kern_util.h" #include "kern_util.h"
......
...@@ -4,9 +4,22 @@ ...@@ -4,9 +4,22 @@
*/ */
#include <signal.h> #include <signal.h>
#include <stdio.h>
#include <unistd.h>
#include <stdlib.h>
#include <errno.h>
#include <stdarg.h>
#include <string.h>
#include <sys/mman.h>
#include "user_util.h"
#include "kern_util.h"
#include "user.h"
#include "signal_kern.h"
#include "sysdep/sigcontext.h"
#include "sysdep/signal.h"
#include "sigcontext.h"
#include "time_user.h" #include "time_user.h"
#include "mode.h" #include "mode.h"
#include "sysdep/signal.h"
void sig_handler(ARCH_SIGHDLR_PARAM) void sig_handler(ARCH_SIGHDLR_PARAM)
{ {
...@@ -36,13 +49,138 @@ void alarm_handler(ARCH_SIGHDLR_PARAM) ...@@ -36,13 +49,138 @@ void alarm_handler(ARCH_SIGHDLR_PARAM)
switch_timers(1); switch_timers(1);
} }
/* void set_sigstack(void *sig_stack, int size)
* Overrides for Emacs so that we follow Linus's tabbing style. {
* Emacs will notice this stuff at the end of the file and automatically stack_t stack = ((stack_t) { .ss_flags = 0,
* adjust the settings for this buffer only. This must remain at the end .ss_sp = (__ptr_t) sig_stack,
* of the file. .ss_size = size - sizeof(void *) });
* ---------------------------------------------------------------------------
* Local variables: if(sigaltstack(&stack, NULL) != 0)
* c-file-style: "linux" panic("enabling signal stack failed, errno = %d\n", errno);
* End: }
void remove_sigstack(void)
{
stack_t stack = ((stack_t) { .ss_flags = SS_DISABLE,
.ss_sp = NULL,
.ss_size = 0 });
if(sigaltstack(&stack, NULL) != 0)
panic("disabling signal stack failed, errno = %d\n", errno);
}
void set_handler(int sig, void (*handler)(int), int flags, ...)
{
struct sigaction action;
va_list ap;
int mask;
va_start(ap, flags);
action.sa_handler = handler;
sigemptyset(&action.sa_mask);
while((mask = va_arg(ap, int)) != -1){
sigaddset(&action.sa_mask, mask);
}
va_end(ap);
action.sa_flags = flags;
action.sa_restorer = NULL;
if(sigaction(sig, &action, NULL) < 0)
panic("sigaction failed");
}
int change_sig(int signal, int on)
{
sigset_t sigset, old;
sigemptyset(&sigset);
sigaddset(&sigset, signal);
sigprocmask(on ? SIG_UNBLOCK : SIG_BLOCK, &sigset, &old);
return(!sigismember(&old, signal));
}
/* Both here and in set/get_signal we don't touch SIGPROF, because we must not
* disable profiling; it's safe because the profiling code does not interact
* with the kernel code at all.*/
static void change_signals(int type)
{
sigset_t mask;
sigemptyset(&mask);
sigaddset(&mask, SIGVTALRM);
sigaddset(&mask, SIGALRM);
sigaddset(&mask, SIGIO);
if(sigprocmask(type, &mask, NULL) < 0)
panic("Failed to change signal mask - errno = %d", errno);
}
void block_signals(void)
{
change_signals(SIG_BLOCK);
}
void unblock_signals(void)
{
change_signals(SIG_UNBLOCK);
}
/* These are the asynchronous signals. SIGVTALRM and SIGARLM are handled
* together under SIGVTALRM_BIT. SIGPROF is excluded because we want to
* be able to profile all of UML, not just the non-critical sections. If
* profiling is not thread-safe, then that is not my problem. We can disable
* profiling when SMP is enabled in that case.
*/ */
#define SIGIO_BIT 0
#define SIGVTALRM_BIT 1
static int enable_mask(sigset_t *mask)
{
int sigs;
sigs = sigismember(mask, SIGIO) ? 0 : 1 << SIGIO_BIT;
sigs |= sigismember(mask, SIGVTALRM) ? 0 : 1 << SIGVTALRM_BIT;
sigs |= sigismember(mask, SIGALRM) ? 0 : 1 << SIGVTALRM_BIT;
return(sigs);
}
int get_signals(void)
{
sigset_t mask;
if(sigprocmask(SIG_SETMASK, NULL, &mask) < 0)
panic("Failed to get signal mask");
return(enable_mask(&mask));
}
int set_signals(int enable)
{
sigset_t mask;
int ret;
sigemptyset(&mask);
if(enable & (1 << SIGIO_BIT))
sigaddset(&mask, SIGIO);
if(enable & (1 << SIGVTALRM_BIT)){
sigaddset(&mask, SIGVTALRM);
sigaddset(&mask, SIGALRM);
}
/* This is safe - sigprocmask is guaranteed to copy locally the
* value of new_set, do his work and then, at the end, write to
* old_set.
*/
if(sigprocmask(SIG_UNBLOCK, &mask, &mask) < 0)
panic("Failed to enable signals");
ret = enable_mask(&mask);
sigemptyset(&mask);
if((enable & (1 << SIGIO_BIT)) == 0)
sigaddset(&mask, SIGIO);
if((enable & (1 << SIGVTALRM_BIT)) == 0){
sigaddset(&mask, SIGVTALRM);
sigaddset(&mask, SIGALRM);
}
if(sigprocmask(SIG_BLOCK, &mask, NULL) < 0)
panic("Failed to block signals");
return(ret);
}
...@@ -24,7 +24,6 @@ ...@@ -24,7 +24,6 @@
#include "kern_util.h" #include "kern_util.h"
#include "user.h" #include "user.h"
#include "signal_kern.h" #include "signal_kern.h"
#include "signal_user.h"
#include "sysdep/ptrace.h" #include "sysdep/ptrace.h"
#include "sysdep/sigcontext.h" #include "sysdep/sigcontext.h"
#include "irq_user.h" #include "irq_user.h"
......
...@@ -23,7 +23,6 @@ ...@@ -23,7 +23,6 @@
#include "kern_util.h" #include "kern_util.h"
#include "user.h" #include "user.h"
#include "signal_kern.h" #include "signal_kern.h"
#include "signal_user.h"
#include "sysdep/ptrace.h" #include "sysdep/ptrace.h"
#include "sysdep/sigcontext.h" #include "sysdep/sigcontext.h"
#include "irq_user.h" #include "irq_user.h"
......
...@@ -10,7 +10,6 @@ ...@@ -10,7 +10,6 @@
#include "asm/uaccess.h" #include "asm/uaccess.h"
#include "asm/unistd.h" #include "asm/unistd.h"
#include "frame_kern.h" #include "frame_kern.h"
#include "signal_user.h"
#include "sigcontext.h" #include "sigcontext.h"
#include "registers.h" #include "registers.h"
#include "mode.h" #include "mode.h"
......
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