X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fruntime%2Finterrupt.c;h=2770d4d2d7a60aad5435ba1ea7d2aa1ad69b18a7;hb=85e1967527101d2d8a4c0f5d37857cf731690733;hp=1e957413dba5827cec659b6e5518d77ca12de429;hpb=95dadf0341e9a47b448ab30f51c33c60c451a207;p=sbcl.git diff --git a/src/runtime/interrupt.c b/src/runtime/interrupt.c index 1e95741..2770d4d 100644 --- a/src/runtime/interrupt.c +++ b/src/runtime/interrupt.c @@ -63,6 +63,7 @@ #include "alloc.h" #include "dynbind.h" #include "interr.h" +#include "pseudo-atomic.h" #include "genesis/fdefn.h" #include "genesis/simple-fun.h" #include "genesis/cons.h" @@ -74,11 +75,21 @@ static void store_signal_data_for_later (struct interrupt_data *data, siginfo_t *info, os_context_t *context); +static void +fill_current_sigmask(sigset_t *sigset) +{ + /* Get the current sigmask, by blocking the empty set. */ + sigset_t empty; + sigemptyset(&empty); + thread_sigmask(SIG_BLOCK, &empty, sigset); +} + void sigaddset_deferrable(sigset_t *s) { sigaddset(s, SIGHUP); sigaddset(s, SIGINT); + sigaddset(s, SIGTERM); sigaddset(s, SIGQUIT); sigaddset(s, SIGPIPE); sigaddset(s, SIGALRM); @@ -94,32 +105,58 @@ sigaddset_deferrable(sigset_t *s) sigaddset(s, SIGPROF); sigaddset(s, SIGWINCH); -#if !((defined(LISP_FEATURE_DARWIN) || defined(LISP_FEATURE_FREEBSD)) && defined(LISP_FEATURE_SB_THREAD)) - sigaddset(s, SIGUSR1); - sigaddset(s, SIGUSR2); -#endif - #ifdef LISP_FEATURE_SB_THREAD sigaddset(s, SIG_INTERRUPT_THREAD); #endif } void -sigaddset_blockable(sigset_t *s) +sigaddset_blockable(sigset_t *sigset) { - sigaddset_deferrable(s); + sigaddset_deferrable(sigset); #ifdef LISP_FEATURE_SB_THREAD -#ifdef SIG_RESUME_FROM_GC - sigaddset(s, SIG_RESUME_FROM_GC); -#endif - sigaddset(s, SIG_STOP_FOR_GC); + sigaddset(sigset,SIG_STOP_FOR_GC); #endif } /* initialized in interrupt_init */ -static sigset_t deferrable_sigset; -static sigset_t blockable_sigset; +sigset_t deferrable_sigset; +sigset_t blockable_sigset; +#endif + +void +check_deferrables_unblocked_in_sigset_or_lose(sigset_t *sigset) +{ +#if !defined(LISP_FEATURE_WIN32) + int i; + for(i = 1; i < NSIG; i++) { + if (sigismember(&deferrable_sigset, i) && sigismember(sigset, i)) + lose("deferrable signal %d blocked\n",i); + } +#endif +} + +void +check_deferrables_blocked_in_sigset_or_lose(sigset_t *sigset) +{ +#if !defined(LISP_FEATURE_WIN32) + int i; + for(i = 1; i < NSIG; i++) { + if (sigismember(&deferrable_sigset, i) && !sigismember(sigset, i)) + lose("deferrable signal %d not blocked\n",i); + } +#endif +} + +void +check_deferrables_blocked_or_lose(void) +{ +#if !defined(LISP_FEATURE_WIN32) + sigset_t current; + fill_current_sigmask(¤t); + check_deferrables_blocked_in_sigset_or_lose(¤t); #endif +} void check_blockables_blocked_or_lose(void) @@ -161,6 +198,60 @@ check_interrupts_enabled_or_lose(os_context_t *context) lose ("in pseudo atomic section\n"); } +/* Check our baroque invariants. */ +void +check_interrupt_context_or_lose(os_context_t *context) +{ + struct thread *thread = arch_os_get_current_thread(); + struct interrupt_data *data = thread->interrupt_data; + int interrupt_deferred_p = (data->pending_handler != 0); + int interrupt_pending = (SymbolValue(INTERRUPT_PENDING,thread) != NIL); + /* On PPC pseudo_atomic_interrupted is cleared when coming out of + * handle_allocation_trap. */ +#if defined(LISP_FEATURE_GENCGC) && !defined(LISP_FEATURE_PPC) +#if 0 + int interrupts_enabled = (SymbolValue(INTERRUPTS_ENABLED,thread) != NIL); + int gc_inhibit = (SymbolValue(GC_INHIBIT,thread) != NIL); + int gc_pending = (SymbolValue(GC_PENDING,thread) == T); + int pseudo_atomic_interrupted = get_pseudo_atomic_interrupted(thread); +#endif + /* In the time window between leaving the *INTERRUPTS-ENABLED* NIL + * section and trapping, a SIG_STOP_FOR_GC would see the next + * check fail, for this reason sig_stop_for_gc handler does not + * call this function. Plus, there may be interrupt lossage when a + * pseudo atomic is interrupted by a deferrable signal and gc is + * triggered, too. */ +#if 0 + if (interrupt_deferred_p) + if (interrupts_enabled && !pseudo_atomic_interrupted) + lose("Stray deferred interrupt."); +#endif + /* Broken momentarily at the end of WITHOUT-GCING. */ +#if 0 + if (gc_pending) + if (!(pseudo_atomic_interrupted || gc_inhibit)) + lose("GC_PENDING, but why?."); +#if defined(LISP_FEATURE_SB_THREAD) + { + int stop_for_gc_pending = + (SymbolValue(STOP_FOR_GC_PENDING,thread) != NIL); + if (stop_for_gc_pending) + if (!(pseudo_atomic_interrupted || gc_inhibit)) + lose("STOP_FOR_GC_PENDING, but why?."); + } +#endif +#endif +#endif + if (interrupt_pending && !interrupt_deferred_p) + lose("INTERRUPT_PENDING but not pending handler."); + if (interrupt_deferred_p) + check_deferrables_blocked_in_sigset_or_lose + (os_context_sigmask_addr(context)); + else + check_deferrables_unblocked_in_sigset_or_lose + (os_context_sigmask_addr(context)); +} + /* When we catch an internal error, should we pass it back to Lisp to * be handled in a high-level way? (Early in cold init, the answer is * 'no', because Lisp is still too brain-dead to handle anything. @@ -173,33 +264,27 @@ static void (*interrupt_low_level_handlers[NSIG]) (int, siginfo_t*, void*); #endif union interrupt_handler interrupt_handlers[NSIG]; -/* At the toplevel repl we routinely call this function. The signal - * mask ought to be clear anyway most of the time, but may be non-zero - * if we were interrupted e.g. while waiting for a queue. */ - void -reset_signal_mask(void) +block_blockable_signals(void) { #ifndef LISP_FEATURE_WIN32 - sigset_t new; - sigemptyset(&new); - thread_sigmask(SIG_SETMASK,&new,0); + thread_sigmask(SIG_BLOCK, &blockable_sigset, 0); #endif } void -block_blockable_signals(void) +block_deferrable_signals(void) { #ifndef LISP_FEATURE_WIN32 - thread_sigmask(SIG_BLOCK, &blockable_sigset, 0); + thread_sigmask(SIG_BLOCK, &deferrable_sigset, 0); #endif } void -block_deferrable_signals(void) +unblock_deferrable_signals(void) { #ifndef LISP_FEATURE_WIN32 - thread_sigmask(SIG_BLOCK, &deferrable_sigset, 0); + thread_sigmask(SIG_UNBLOCK, &deferrable_sigset, 0); #endif } @@ -277,7 +362,8 @@ fake_foreign_function_call(os_context_t *context) dynamic_space_free_pointer = (lispobj *)(unsigned long) (*os_context_register_addr(context, reg_ALLOC)); - /* fprintf(stderr,"dynamic_space_free_pointer: %p\n", dynamic_space_free_pointer); */ +/* fprintf(stderr,"dynamic_space_free_pointer: %p\n", */ +/* dynamic_space_free_pointer); */ #if defined(LISP_FEATURE_ALPHA) || defined(LISP_FEATURE_MIPS) if ((long)dynamic_space_free_pointer & 1) { lose("dead in fake_foreign_function_call, context = %x\n", context); @@ -341,7 +427,8 @@ undo_fake_foreign_function_call(os_context_t *context) | (*os_context_register_addr(context, reg_ALLOC) & LOWTAG_MASK); /* - ((unsigned long)(*os_context_register_addr(context, reg_ALLOC)) & ~LOWTAG_MASK) + ((unsigned long)(*os_context_register_addr(context, reg_ALLOC)) + & ~LOWTAG_MASK) | ((unsigned long) dynamic_space_free_pointer & LOWTAG_MASK); */ #endif @@ -371,6 +458,16 @@ interrupt_internal_error(os_context_t *context, boolean continuable) thread_sigmask(SIG_SETMASK, os_context_sigmask_addr(context), 0); #endif +#if defined(LISP_FEATURE_LINUX) && defined(LISP_FEATURE_MIPS) + /* Workaround for blocked SIGTRAP. */ + { + sigset_t newset; + sigemptyset(&newset); + sigaddset(&newset, SIGTRAP); + thread_sigmask(SIG_UNBLOCK, &newset, 0); + } +#endif + SHOW("in interrupt_internal_error"); #ifdef QSHOW /* Display some rudimentary debugging information about the @@ -389,28 +486,23 @@ interrupt_internal_error(os_context_t *context, boolean continuable) void interrupt_handle_pending(os_context_t *context) { - /* There are three ways we can get here. First, if an interrupt + /* There are three ways we can get here. First, if an interrupt * occurs within pseudo-atomic, it will be deferred, and we'll - * trap to here at the end of the pseudo-atomic block. Second, if + * trap to here at the end of the pseudo-atomic block. Second, if * the GC (in alloc()) decides that a GC is required, it will set - * *GC-PENDING* and pseudo-atomic-interrupted, and alloc() is - * always called from within pseudo-atomic, and thus we end up - * here again. Third, when calling GC-ON or at the end of a - * WITHOUT-GCING, MAYBE-HANDLE-PENDING-GC will trap to here if - * there is a pending GC. */ + * *GC-PENDING* and pseudo-atomic-interrupted if not *GC-INHIBIT*, + * and alloc() is always called from within pseudo-atomic, and + * thus we end up here again. Third, when calling GC-ON or at the + * end of a WITHOUT-GCING, MAYBE-HANDLE-PENDING-GC will trap to + * here if there is a pending GC. Fourth, ahem, at the end of + * WITHOUT-INTERRUPTS (bar complications with nesting). */ /* Win32 only needs to handle the GC cases (for now?) */ struct thread *thread; - /* Punt if in PA section, marking it as interrupted. This can - * happenat least if we pick up a GC request while in a - * WITHOUT-GCING with an outer PA -- it is not immediately clear - * to me that this should/could ever happen, but better safe then - * sorry. --NS 2007-05-15 */ if (arch_pseudo_atomic_atomic(context)) { - arch_set_pseudo_atomic_interrupted(context); - return; + lose("Handling pending interrupt in pseduo atomic."); } thread = arch_os_get_current_thread(); @@ -467,7 +559,6 @@ interrupt_handle_pending(os_context_t *context) * blocked signals are unblocked */ sigcopyset(os_context_sigmask_addr(context), &data->pending_mask); - sigemptyset(&data->pending_mask); /* This will break on sparc linux: the deferred handler really wants * to be called with a void_context */ run_deferred_handler(data,(void *)context); @@ -628,6 +719,7 @@ maybe_defer_handler(void *handler, struct interrupt_data *data, if (SymbolValue(INTERRUPT_PENDING,thread) != NIL) lose("interrupt already pending\n"); + check_interrupt_context_or_lose(context); /* 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. @@ -636,9 +728,9 @@ maybe_defer_handler(void *handler, struct interrupt_data *data, store_signal_data_for_later(data,handler,signal,info,context); SetSymbolValue(INTERRUPT_PENDING, T,thread); FSHOW_SIGNAL((stderr, - "/maybe_defer_handler(%x,%d),thread=%lu: deferred\n", - (unsigned int)handler,signal, - (unsigned long)thread->os_thread)); + "/maybe_defer_handler(%x,%d): deferred\n", + (unsigned int)handler,signal)); + check_interrupt_context_or_lose(context); return 1; } /* a slightly confusing test. arch_pseudo_atomic_atomic() doesn't @@ -648,15 +740,14 @@ maybe_defer_handler(void *handler, struct interrupt_data *data, store_signal_data_for_later(data,handler,signal,info,context); arch_set_pseudo_atomic_interrupted(context); FSHOW_SIGNAL((stderr, - "/maybe_defer_handler(%x,%d),thread=%lu: deferred(PA)\n", - (unsigned int)handler,signal, - (unsigned long)thread->os_thread)); + "/maybe_defer_handler(%x,%d): deferred(PA)\n", + (unsigned int)handler,signal)); + check_interrupt_context_or_lose(context); return 1; } FSHOW_SIGNAL((stderr, - "/maybe_defer_handler(%x,%d),thread=%lu: not deferred\n", - (unsigned int)handler,signal, - (unsigned long)thread->os_thread)); + "/maybe_defer_handler(%x,%d): not deferred\n", + (unsigned int)handler,signal)); return 0; } @@ -675,7 +766,8 @@ store_signal_data_for_later (struct interrupt_data *data, void *handler, if(info) memcpy(&(data->pending_info), info, sizeof(siginfo_t)); - FSHOW_SIGNAL((stderr, "/store_signal_data_for_later: signal: %d\n", signal)); + FSHOW_SIGNAL((stderr, "/store_signal_data_for_later: signal: %d\n", + signal)); if(context) { /* the signal mask in the context (from before we were @@ -704,12 +796,13 @@ maybe_now_maybe_later(int signal, siginfo_t *info, void *void_context) } static void -low_level_interrupt_handle_now(int signal, siginfo_t *info, os_context_t *context) +low_level_interrupt_handle_now(int signal, siginfo_t *info, + os_context_t *context) { /* No FP control fixage needed, caller has done that. */ check_blockables_blocked_or_lose(); check_interrupts_enabled_or_lose(context); - interrupt_low_level_handlers[signal](signal, info, context); + (*interrupt_low_level_handlers[signal])(signal, info, context); /* No Darwin context fixage needed, caller does that. */ } @@ -740,18 +833,16 @@ sig_stop_for_gc_handler(int signal, siginfo_t *info, void *void_context) struct thread *thread=arch_os_get_current_thread(); sigset_t ss; - if (arch_pseudo_atomic_atomic(context)) { + /* Test for GC_INHIBIT _first_, else we'd trap on every single + * pseudo atomic until gc is finally allowed. */ + if (SymbolValue(GC_INHIBIT,thread) != NIL) { SetSymbolValue(STOP_FOR_GC_PENDING,T,thread); - arch_set_pseudo_atomic_interrupted(context); - FSHOW_SIGNAL((stderr,"thread=%lu sig_stop_for_gc deferred (PA)\n", - thread->os_thread)); + FSHOW_SIGNAL((stderr, "sig_stop_for_gc deferred (*GC-INHIBIT*)\n")); return; - } - else if (SymbolValue(GC_INHIBIT,thread) != NIL) { + } else if (arch_pseudo_atomic_atomic(context)) { SetSymbolValue(STOP_FOR_GC_PENDING,T,thread); - FSHOW_SIGNAL((stderr, - "thread=%lu sig_stop_for_gc deferred (*GC-INHIBIT*)\n", - thread->os_thread)); + arch_set_pseudo_atomic_interrupted(context); + FSHOW_SIGNAL((stderr,"sig_stop_for_gc deferred (PA)\n")); return; } @@ -768,41 +859,25 @@ sig_stop_for_gc_handler(int signal, siginfo_t *info, void *void_context) SetSymbolValue(GC_PENDING,NIL,thread); SetSymbolValue(STOP_FOR_GC_PENDING,NIL,thread); - if(thread->state!=STATE_RUNNING) { + if(thread_state(thread)!=STATE_RUNNING) { lose("sig_stop_for_gc_handler: wrong thread state: %ld\n", fixnum_value(thread->state)); } - thread->state=STATE_SUSPENDED; - FSHOW_SIGNAL((stderr,"thread=%lu suspended\n",thread->os_thread)); - - sigemptyset(&ss); -#if defined(SIG_RESUME_FROM_GC) - sigaddset(&ss,SIG_RESUME_FROM_GC); -#else - sigaddset(&ss,SIG_STOP_FOR_GC); -#endif + set_thread_state(thread,STATE_SUSPENDED); + FSHOW_SIGNAL((stderr,"suspended\n")); - /* It is possible to get SIGCONT (and probably other non-blockable - * signals) here. */ -#ifdef SIG_RESUME_FROM_GC - { - int sigret; - do { sigwait(&ss, &sigret); } - while (sigret != SIG_RESUME_FROM_GC); - } -#else - while (sigwaitinfo(&ss,0) != SIG_STOP_FOR_GC); -#endif + wait_for_thread_state_change(thread, STATE_SUSPENDED); + FSHOW_SIGNAL((stderr,"resumed\n")); - FSHOW_SIGNAL((stderr,"thread=%lu resumed\n",thread->os_thread)); - if(thread->state!=STATE_RUNNING) { + if(thread_state(thread)!=STATE_RUNNING) { lose("sig_stop_for_gc_handler: wrong thread state on wakeup: %ld\n", - fixnum_value(thread->state)); + fixnum_value(thread_state(thread))); } undo_fake_foreign_function_call(context); } + #endif void @@ -811,6 +886,14 @@ interrupt_handle_now_handler(int signal, siginfo_t *info, void *void_context) os_context_t *context = arch_os_get_context(&void_context); #if defined(LISP_FEATURE_LINUX) || defined(RESTORE_FP_CONTROL_FROM_CONTEXT) os_restore_fp_control(context); +#ifndef LISP_FEATURE_WIN32 + if ((signal == SIGILL) || (signal == SIGBUS) +#ifndef LISP_FEATURE_LINUX + || (signal == SIGEMT) +#endif + ) + corruption_warning_and_maybe_lose("Signal %d recieved", signal); +#endif #endif interrupt_handle_now(signal, info, context); } @@ -997,6 +1080,8 @@ arrange_return_to_lisp_function(os_context_t *context, lispobj function) *os_context_register_addr(context,reg_CODE) = (os_context_register_t)(fun + FUN_POINTER_LOWTAG); #endif + FSHOW((stderr, "/arranged return to Lisp function (0x%lx)\n", + (long)function)); } #ifdef LISP_FEATURE_SB_THREAD @@ -1008,9 +1093,13 @@ interrupt_thread_handler(int num, siginfo_t *info, void *v_context) { os_context_t *context = (os_context_t*)arch_os_get_context(&v_context); + FSHOW_SIGNAL((stderr,"/interrupt_thread_handler\n")); + check_blockables_blocked_or_lose(); + /* let the handler enable interrupts again when it sees fit */ sigaddset_deferrable(os_context_sigmask_addr(context)); - arrange_return_to_lisp_function(context, StaticSymbolFunction(RUN_INTERRUPTION)); + arrange_return_to_lisp_function(context, + StaticSymbolFunction(RUN_INTERRUPTION)); } #endif @@ -1040,6 +1129,7 @@ handle_guard_page_triggered(os_context_t *context,os_vm_address_t addr) * protection so the error handler has some headroom, protect the * previous page so that we can catch returns from the guard page * and restore it. */ + corruption_warning_and_maybe_lose("Control stack exhausted"); protect_control_stack_guard_page(0); protect_control_stack_return_guard_page(1); @@ -1251,6 +1341,14 @@ install_handler(int signal, void handler(int, siginfo_t*, void*)) #endif } +/* This must not go through lisp as it's allowed anytime, even when on + * the altstack. */ +void +sigabrt_handler(int signal, siginfo_t *info, void *void_context) +{ + lose("SIGABRT received.\n"); +} + void interrupt_init(void) { @@ -1273,7 +1371,7 @@ interrupt_init(void) * 3-argument form is expected.) */ (void (*)(int, siginfo_t*, void*))SIG_DFL; } - + undoably_install_low_level_interrupt_handler(SIGABRT, sigabrt_handler); SHOW("returning from interrupt_init()"); #endif } @@ -1295,7 +1393,10 @@ lisp_memory_fault_error(os_context_t *context, os_vm_address_t addr) * now -- some address is better then no address in this case. */ current_memory_fault_address = addr; - arrange_return_to_lisp_function(context, StaticSymbolFunction(MEMORY_FAULT_ERROR)); + /* To allow debugging memory faults in signal handlers and such. */ + corruption_warning_and_maybe_lose("Memory fault"); + arrange_return_to_lisp_function(context, + StaticSymbolFunction(MEMORY_FAULT_ERROR)); } #endif