X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fruntime%2Finterrupt.c;h=eca23aa9dae466b4de4be6676567952827a120bf;hb=942e45e3bb73fd55786e4a0ab4590324063c0c89;hp=4497428503cd8e9dd777cdb93990cfeaf90dadbf;hpb=0b5119848b6b8713e473fa669356645747e11dbd;p=sbcl.git diff --git a/src/runtime/interrupt.c b/src/runtime/interrupt.c index 4497428..eca23aa 100644 --- a/src/runtime/interrupt.c +++ b/src/runtime/interrupt.c @@ -40,16 +40,18 @@ * * - WHN 20000728, dan 20010128 */ +#include "sbcl.h" #include #include #include #include #include +#ifndef LISP_FEATURE_WIN32 #include +#endif #include -#include "sbcl.h" #include "runtime.h" #include "arch.h" #include "os.h" @@ -68,14 +70,16 @@ -void run_deferred_handler(struct interrupt_data *data, void *v_context) ; +static void run_deferred_handler(struct interrupt_data *data, void *v_context); +#ifndef LISP_FEATURE_WIN32 static void store_signal_data_for_later (struct interrupt_data *data, void *handler, int signal, siginfo_t *info, os_context_t *context); boolean interrupt_maybe_gc_int(int signal, siginfo_t *info, void *v_context); -void sigaddset_deferrable(sigset_t *s) +void +sigaddset_deferrable(sigset_t *s) { sigaddset(s, SIGHUP); sigaddset(s, SIGINT); @@ -98,7 +102,8 @@ void sigaddset_deferrable(sigset_t *s) #endif } -void sigaddset_blockable(sigset_t *s) +void +sigaddset_blockable(sigset_t *s) { sigaddset_deferrable(s); #ifdef LISP_FEATURE_SB_THREAD @@ -109,31 +114,36 @@ void sigaddset_blockable(sigset_t *s) /* initialized in interrupt_init */ static sigset_t deferrable_sigset; static sigset_t blockable_sigset; +#endif -inline static void check_blockables_blocked_or_lose() +void +check_blockables_blocked_or_lose() { +#ifndef LISP_FEATURE_WIN32 /* Get the current sigmask, by blocking the empty set. */ sigset_t empty,current; int i; sigemptyset(&empty); thread_sigmask(SIG_BLOCK, &empty, ¤t); - for(i=0;i= MAX_INTERRUPTS) { - lose("maximum interrupt nesting depth (%d) exceeded", MAX_INTERRUPTS); + lose("maximum interrupt nesting depth (%d) exceeded\n", MAX_INTERRUPTS); } bind_variable(FREE_INTERRUPT_CONTEXT_INDEX, @@ -271,7 +289,6 @@ fake_foreign_function_call(os_context_t *context) /* blocks all blockable signals. If you are calling from a signal handler, * the usual signal mask will be restored from the context when the handler * finishes. Otherwise, be careful */ - void undo_fake_foreign_function_call(os_context_t *context) { @@ -306,14 +323,16 @@ interrupt_internal_error(int signal, siginfo_t *info, os_context_t *context, describe_internal_error(context); /* There's no good way to recover from an internal error * before the Lisp error handling mechanism is set up. */ - lose("internal error too early in init, can't recover"); + lose("internal error too early in init, can't recover\n"); } /* Allocate the SAP object while the interrupts are still * disabled. */ context_sap = alloc_sap(context); +#ifndef LISP_FEATURE_WIN32 thread_sigmask(SIG_SETMASK, os_context_sigmask_addr(context), 0); +#endif SHOW("in interrupt_internal_error"); #ifdef QSHOW @@ -341,6 +360,12 @@ interrupt_handle_pending(os_context_t *context) thread=arch_os_get_current_thread(); data=thread->interrupt_data; +#if defined(LISP_FEATURE_X86) || defined(LISP_FEATURE_X86_64) + /* If pseudo_atomic_interrupted is set then the interrupt is going + * to be handled now, ergo it's safe to clear it. */ + arch_clear_pseudo_atomic_interrupted(context); +#endif + if (SymbolValue(GC_INHIBIT,thread)==NIL) { #ifdef LISP_FEATURE_SB_THREAD if (SymbolValue(STOP_FOR_GC_PENDING,thread) != NIL) { @@ -383,6 +408,7 @@ interrupt_handle_pending(os_context_t *context) * PSEUDO_ATOMIC_INTERRUPTED only if interrupts are enabled.*/ SetSymbolValue(INTERRUPT_PENDING, NIL,thread); +#ifndef LISP_FEATURE_WIN32 /* restore the saved signal mask from the original signal (the * one that interrupted us during the critical section) into the * os_context for the signal we're currently in the handler for. @@ -391,6 +417,7 @@ interrupt_handle_pending(os_context_t *context) sigcopyset(os_context_sigmask_addr(context), &data->pending_mask); sigemptyset(&data->pending_mask); +#endif /* This will break on sparc linux: the deferred handler really wants * to be called with a void_context */ run_deferred_handler(data,(void *)context); @@ -422,8 +449,10 @@ interrupt_handle_now(int signal, siginfo_t *info, void *void_context) #endif union interrupt_handler handler; check_blockables_blocked_or_lose(); +#ifndef LISP_FEATURE_WIN32 if (sigismember(&deferrable_sigset,signal)) check_interrupts_enabled_or_lose(context); +#endif #ifdef LISP_FEATURE_LINUX /* Under Linux on some architectures, we appear to have to restore @@ -454,7 +483,7 @@ interrupt_handle_now(int signal, siginfo_t *info, void *void_context) /* This can happen if someone tries to ignore or default one * of the signals we need for runtime support, and the runtime * support decides to pass on it. */ - lose("no handler for signal %d in interrupt_handle_now(..)", signal); + lose("no handler for signal %d in interrupt_handle_now(..)\n", signal); } else if (lowtag_of(handler.lisp) == FUN_POINTER_LOWTAG) { /* Once we've decided what to do about contexts in a @@ -469,13 +498,21 @@ interrupt_handle_now(int signal, siginfo_t *info, void *void_context) * all our allocation from C now goes through a PA wrapper, * but still, doesn't hurt. * - * Yeah, but non-gencgc platforms that don't really wrap - * allocation in PA. MG - 2005-08-29 */ + * Yeah, but non-gencgc platforms don't really wrap allocation + * in PA. MG - 2005-08-29 */ lispobj info_sap,context_sap = alloc_sap(context); info_sap = alloc_sap(info); - /* Allow signals again. */ - thread_sigmask(SIG_SETMASK, os_context_sigmask_addr(context), 0); + /* Leave deferrable signals blocked, the handler itself will + * allow signals again when it sees fit. */ +#ifdef LISP_FEATURE_SB_THREAD + { + sigset_t unblock; + sigemptyset(&unblock); + sigaddset(&unblock, SIG_STOP_FOR_GC); + thread_sigmask(SIG_UNBLOCK, &unblock, 0); + } +#endif FSHOW_SIGNAL((stderr,"/calling Lisp-level handler\n")); @@ -487,8 +524,10 @@ interrupt_handle_now(int signal, siginfo_t *info, void *void_context) FSHOW_SIGNAL((stderr,"/calling C-level handler\n")); +#ifndef LISP_FEATURE_WIN32 /* Allow signals again. */ thread_sigmask(SIG_SETMASK, os_context_sigmask_addr(context), 0); +#endif (*handler.c)(signal, info, void_context); } @@ -510,8 +549,7 @@ interrupt_handle_now(int signal, siginfo_t *info, void *void_context) * far as C or the kernel is concerned we dealt with the signal * already; we're just doing the Lisp-level processing now that we * put off then */ - -void +static void run_deferred_handler(struct interrupt_data *data, void *v_context) { /* The pending_handler may enable interrupts and then another * interrupt may hit, overwrite interrupt_data, so reset the @@ -522,6 +560,7 @@ run_deferred_handler(struct interrupt_data *data, void *v_context) { (*pending_handler)(data->pending_signal,&(data->pending_info), v_context); } +#ifndef LISP_FEATURE_WIN32 boolean maybe_defer_handler(void *handler, struct interrupt_data *data, int signal, siginfo_t *info, os_context_t *context) @@ -531,7 +570,7 @@ maybe_defer_handler(void *handler, struct interrupt_data *data, check_blockables_blocked_or_lose(); if (SymbolValue(INTERRUPT_PENDING,thread) != NIL) - lose("interrupt already pending"); + lose("interrupt already pending\n"); /* If interrupts are disabled then INTERRUPT_PENDING is set and * not PSEDUO_ATOMIC_INTERRUPTED. This is important for a pseudo * atomic section inside a WITHOUT-INTERRUPTS. @@ -652,6 +691,7 @@ low_level_maybe_now_maybe_later(int signal, siginfo_t *info, void *void_context) DARWIN_FIX_CONTEXT(context); #endif } +#endif #ifdef LISP_FEATURE_SB_THREAD @@ -676,10 +716,6 @@ sig_stop_for_gc_handler(int signal, siginfo_t *info, void *void_context) sigfillset(&ss); /* Block everything. */ thread_sigmask(SIG_BLOCK,&ss,0); - /* The GC can't tell if a thread is a zombie, so this would be a - * good time to let the kernel reap any of our children in that - * awful state, to stop them from being waited for indefinitely. - * Userland reaping is done later when GC is finished */ if(thread->state!=STATE_RUNNING) { lose("sig_stop_for_gc_handler: wrong thread state: %ld\n", fixnum_value(thread->state)); @@ -688,7 +724,9 @@ sig_stop_for_gc_handler(int signal, siginfo_t *info, void *void_context) FSHOW_SIGNAL((stderr,"thread=%lu suspended\n",thread->os_thread)); sigemptyset(&ss); sigaddset(&ss,SIG_STOP_FOR_GC); - sigwaitinfo(&ss,0); + /* It is possible to get SIGCONT (and probably other + * non-blockable signals) here. */ + while (sigwaitinfo(&ss,0) != SIG_STOP_FOR_GC); FSHOW_SIGNAL((stderr,"thread=%lu resumed\n",thread->os_thread)); if(thread->state!=STATE_RUNNING) { lose("sig_stop_for_gc_handler: wrong thread state on wakeup: %ld\n", @@ -735,12 +773,13 @@ gc_trigger_hit(int signal, siginfo_t *info, os_context_t *context) */ #if (defined(LISP_FEATURE_X86) || defined(LISP_FEATURE_X86_64)) -int *context_eflags_addr(os_context_t *context); +extern int *context_eflags_addr(os_context_t *context); #endif extern lispobj call_into_lisp(lispobj fun, lispobj *args, int nargs); extern void post_signal_tramp(void); -void arrange_return_to_lisp_function(os_context_t *context, lispobj function) +void +arrange_return_to_lisp_function(os_context_t *context, lispobj function) { #if !(defined(LISP_FEATURE_X86) || defined(LISP_FEATURE_X86_64)) void * fun=native_pointer(function); @@ -877,9 +916,12 @@ void arrange_return_to_lisp_function(os_context_t *context, lispobj function) /* FIXME: this function can go away when all lisp handlers are invoked * via arrange_return_to_lisp_function. */ -void interrupt_thread_handler(int num, siginfo_t *info, void *v_context) +void +interrupt_thread_handler(int num, siginfo_t *info, void *v_context) { os_context_t *context = (os_context_t*)arch_os_get_context(&v_context); + /* let the handler enable interrupts again when it sees fit */ + sigaddset_deferrable(os_context_sigmask_addr(context)); arrange_return_to_lisp_function(context, SymbolFunction(RUN_INTERRUPTION)); } @@ -891,11 +933,13 @@ void interrupt_thread_handler(int num, siginfo_t *info, void *v_context) * that has the added benefit of automatically discriminating between * functions and variables. */ -void undefined_alien_function() { +void +undefined_alien_function() { funcall0(SymbolFunction(UNDEFINED_ALIEN_FUNCTION_ERROR)); } -boolean handle_guard_page_triggered(os_context_t *context,os_vm_address_t addr) +boolean +handle_guard_page_triggered(os_context_t *context,os_vm_address_t addr) { struct thread *th=arch_os_get_current_thread(); @@ -977,7 +1021,9 @@ boolean interrupt_maybe_gc_int(int signal, siginfo_t *info, void *void_context) { os_context_t *context=(os_context_t *) void_context; +#ifndef LISP_FEATURE_WIN32 struct thread *thread=arch_os_get_current_thread(); +#endif fake_foreign_function_call(context); @@ -1003,15 +1049,18 @@ interrupt_maybe_gc_int(int signal, siginfo_t *info, void *void_context) * A kludgy alternative is to propagate the sigmask change to the * outer context. */ +#ifndef LISP_FEATURE_WIN32 if(SymbolValue(INTERRUPTS_ENABLED,thread)!=NIL) thread_sigmask(SIG_SETMASK, os_context_sigmask_addr(context), 0); #ifdef LISP_FEATURE_SB_THREAD else { sigset_t new; + sigemptyset(&new); sigaddset(&new,SIG_STOP_FOR_GC); thread_sigmask(SIG_UNBLOCK,&new,0); } #endif +#endif funcall0(SymbolFunction(SUB_GC)); undo_fake_foreign_function_call(context); @@ -1023,6 +1072,92 @@ interrupt_maybe_gc_int(int signal, siginfo_t *info, void *void_context) * noise to install handlers */ +#ifndef LISP_FEATURE_WIN32 +/* In Linux 2.4 synchronous signals (sigtrap & co) can be delivered if + * they are blocked, in Linux 2.6 the default handler is invoked + * instead that usually coredumps. One might hastily think that adding + * SA_NODEFER helps, but until ~2.6.13 if SA_NODEFER is specified then + * the whole sa_mask is ignored and instead of not adding the signal + * in question to the mask. That means if it's not blockable the + * signal must be unblocked at the beginning of signal handlers. + * + * It turns out that NetBSD's SA_NODEFER doesn't DTRT in a different + * way: if SA_NODEFER is set and the signal is in sa_mask, the signal + * will be unblocked in the sigmask during the signal handler. -- RMK + * X-mas day, 2005 + */ +static volatile int sigaction_nodefer_works = -1; + +#define SA_NODEFER_TEST_BLOCK_SIGNAL SIGABRT +#define SA_NODEFER_TEST_KILL_SIGNAL SIGUSR1 + +static void +sigaction_nodefer_test_handler(int signal, siginfo_t *info, void *void_context) +{ + sigset_t empty, current; + int i; + sigemptyset(&empty); + sigprocmask(SIG_BLOCK, &empty, ¤t); + /* There should be exactly two blocked signals: the two we added + * to sa_mask when setting up the handler. NetBSD doesn't block + * the signal we're handling when SA_NODEFER is set; Linux before + * 2.6.13 or so also doesn't block the other signal when + * SA_NODEFER is set. */ + for(i = 1; i < NSIG; i++) + if (sigismember(¤t, i) != + (((i == SA_NODEFER_TEST_BLOCK_SIGNAL) || (i == signal)) ? 1 : 0)) { + FSHOW_SIGNAL((stderr, "SA_NODEFER doesn't work, signal %d\n", i)); + sigaction_nodefer_works = 0; + } + if (sigaction_nodefer_works == -1) + sigaction_nodefer_works = 1; +} + +static void +see_if_sigaction_nodefer_works() +{ + struct sigaction sa, old_sa; + + sa.sa_flags = SA_SIGINFO | SA_NODEFER; + sa.sa_sigaction = sigaction_nodefer_test_handler; + sigemptyset(&sa.sa_mask); + sigaddset(&sa.sa_mask, SA_NODEFER_TEST_BLOCK_SIGNAL); + sigaddset(&sa.sa_mask, SA_NODEFER_TEST_KILL_SIGNAL); + sigaction(SA_NODEFER_TEST_KILL_SIGNAL, &sa, &old_sa); + /* Make sure no signals are blocked. */ + { + sigset_t empty; + sigemptyset(&empty); + sigprocmask(SIG_SETMASK, &empty, 0); + } + kill(getpid(), SA_NODEFER_TEST_KILL_SIGNAL); + while (sigaction_nodefer_works == -1); + sigaction(SA_NODEFER_TEST_KILL_SIGNAL, &old_sa, NULL); +} + +#undef SA_NODEFER_TEST_BLOCK_SIGNAL +#undef SA_NODEFER_TEST_KILL_SIGNAL + +static void +unblock_me_trampoline(int signal, siginfo_t *info, void *void_context) +{ + sigset_t unblock; + sigemptyset(&unblock); + sigaddset(&unblock, signal); + thread_sigmask(SIG_UNBLOCK, &unblock, 0); + interrupt_handle_now_handler(signal, info, void_context); +} + +static void +low_level_unblock_me_trampoline(int signal, siginfo_t *info, void *void_context) +{ + sigset_t unblock; + sigemptyset(&unblock); + sigaddset(&unblock, signal); + thread_sigmask(SIG_UNBLOCK, &unblock, 0); + (*interrupt_low_level_handlers[signal])(signal, info, void_context); +} + void undoably_install_low_level_interrupt_handler (int signal, void handler(int, @@ -1032,18 +1167,27 @@ undoably_install_low_level_interrupt_handler (int signal, struct sigaction sa; if (0 > signal || signal >= NSIG) { - lose("bad signal number %d", signal); + lose("bad signal number %d\n", signal); } - if (sigismember(&deferrable_sigset,signal)) + if (ARE_SAME_HANDLER(handler, SIG_DFL)) + sa.sa_sigaction = handler; + else if (sigismember(&deferrable_sigset,signal)) sa.sa_sigaction = low_level_maybe_now_maybe_later; + else if (!sigaction_nodefer_works && + !sigismember(&blockable_sigset, signal)) + sa.sa_sigaction = low_level_unblock_me_trampoline; else sa.sa_sigaction = handler; sigcopyset(&sa.sa_mask, &blockable_sigset); - sa.sa_flags = SA_SIGINFO | SA_RESTART; + sa.sa_flags = SA_SIGINFO | SA_RESTART | + (sigaction_nodefer_works ? SA_NODEFER : 0); #ifdef LISP_FEATURE_C_STACK_IS_CONTROL_STACK if((signal==SIG_MEMORY_FAULT) +#ifdef SIG_MEMORY_FAULT2 + || (signal==SIG_MEMORY_FAULT2) +#endif #ifdef SIG_INTERRUPT_THREAD || (signal==SIG_INTERRUPT_THREAD) #endif @@ -1055,11 +1199,13 @@ undoably_install_low_level_interrupt_handler (int signal, interrupt_low_level_handlers[signal] = (ARE_SAME_HANDLER(handler, SIG_DFL) ? 0 : handler); } +#endif /* This is called from Lisp. */ unsigned long install_handler(int signal, void handler(int, siginfo_t*, void*)) { +#ifndef LISP_FEATURE_WIN32 struct sigaction sa; sigset_t old, new; union interrupt_handler oldhandler; @@ -1074,16 +1220,19 @@ install_handler(int signal, void handler(int, siginfo_t*, void*)) (unsigned int)interrupt_low_level_handlers[signal])); if (interrupt_low_level_handlers[signal]==0) { if (ARE_SAME_HANDLER(handler, SIG_DFL) || - ARE_SAME_HANDLER(handler, SIG_IGN)) { + ARE_SAME_HANDLER(handler, SIG_IGN)) sa.sa_sigaction = handler; - } else if (sigismember(&deferrable_sigset, signal)) { + else if (sigismember(&deferrable_sigset, signal)) sa.sa_sigaction = maybe_now_maybe_later; - } else { + else if (!sigaction_nodefer_works && + !sigismember(&blockable_sigset, signal)) + sa.sa_sigaction = unblock_me_trampoline; + else sa.sa_sigaction = interrupt_handle_now_handler; - } sigcopyset(&sa.sa_mask, &blockable_sigset); - sa.sa_flags = SA_SIGINFO | SA_RESTART; + sa.sa_flags = SA_SIGINFO | SA_RESTART | + (sigaction_nodefer_works ? SA_NODEFER : 0); sigaction(signal, &sa, NULL); } @@ -1095,13 +1244,19 @@ install_handler(int signal, void handler(int, siginfo_t*, void*)) FSHOW((stderr, "/leaving POSIX install_handler(%d, ..)\n", signal)); return (unsigned long)oldhandler.lisp; +#else + /* Probably-wrong Win32 hack */ + return 0; +#endif } void interrupt_init() { +#ifndef LISP_FEATURE_WIN32 int i; SHOW("entering interrupt_init()"); + see_if_sigaction_nodefer_works(); sigemptyset(&deferrable_sigset); sigemptyset(&blockable_sigset); sigaddset_deferrable(&deferrable_sigset); @@ -1119,4 +1274,5 @@ interrupt_init() } SHOW("returning from interrupt_init()"); +#endif }