X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fruntime%2Finterrupt.c;h=9c639839e96b584dce7494176151d5f44a668ea9;hb=2a860441fcd4181c0a511094397fdc6b6511b280;hp=d23df7b868ad8111cd6cf4dcace2b6d86d93afec;hpb=7cca1cabd213d38218a40e973b06ca11c8546396;p=sbcl.git diff --git a/src/runtime/interrupt.c b/src/runtime/interrupt.c index d23df7b..9c63983 100644 --- a/src/runtime/interrupt.c +++ b/src/runtime/interrupt.c @@ -22,7 +22,7 @@ * In that case, the Lisp-level handler is stored in interrupt_handlers[..] * and interrupt_low_level_handlers[..] is cleared. * - * However, some signals need special handling, e.g. + * However, some signals need special handling, e.g. * * o the SIGSEGV (for e.g. Linux) or SIGBUS (for e.g. FreeBSD) used by the * garbage collector to detect violations of write protection, @@ -36,8 +36,8 @@ * o the SIGTRAP (Linux/Alpha) which Lisp code uses to handle breakpoints, * pseudo-atomic sections, and some classes of error (e.g. "function * not defined"). This never goes anywhere near the Lisp handlers at all. - * See runtime/alpha-arch.c and code/signal.lisp - * + * See runtime/alpha-arch.c and code/signal.lisp + * * - WHN 20000728, dan 20010128 */ @@ -47,6 +47,7 @@ #include #include #include +#include #include "sbcl.h" #include "runtime.h" @@ -63,19 +64,18 @@ #include "interr.h" #include "genesis/fdefn.h" #include "genesis/simple-fun.h" +#include "genesis/cons.h" -void run_deferred_handler(struct interrupt_data *data, void *v_context) ; -static void store_signal_data_for_later (struct interrupt_data *data, - void *handler, int signal, - siginfo_t *info, - os_context_t *context); +void run_deferred_handler(struct interrupt_data *data, void *v_context); +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); -extern volatile lispobj all_threads_lock; - -void sigaddset_blockable(sigset_t *s) +void sigaddset_deferrable(sigset_t *s) { sigaddset(s, SIGHUP); sigaddset(s, SIGINT); @@ -83,7 +83,6 @@ void sigaddset_blockable(sigset_t *s) sigaddset(s, SIGPIPE); sigaddset(s, SIGALRM); sigaddset(s, SIGURG); - sigaddset(s, SIGFPE); sigaddset(s, SIGTSTP); sigaddset(s, SIGCHLD); sigaddset(s, SIGIO); @@ -95,20 +94,30 @@ void sigaddset_blockable(sigset_t *s) sigaddset(s, SIGUSR1); sigaddset(s, SIGUSR2); #ifdef LISP_FEATURE_SB_THREAD - sigaddset(s, SIG_STOP_FOR_GC); sigaddset(s, SIG_INTERRUPT_THREAD); #endif } +void sigaddset_blockable(sigset_t *s) +{ + sigaddset_deferrable(s); +#ifdef LISP_FEATURE_SB_THREAD + sigaddset(s, SIG_STOP_FOR_GC); +#endif +} + +/* initialized in interrupt_init */ +static sigset_t deferrable_sigset; static sigset_t blockable_sigset; -inline static void check_blockables_blocked_or_lose() +void +check_blockables_blocked_or_lose() { /* Get the current sigmask, by blocking the empty set. */ sigset_t empty,current; - sigemptyset(&empty); - sigprocmask(SIG_BLOCK, &empty, ¤t); 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); } bind_variable(FREE_INTERRUPT_CONTEXT_INDEX, - make_fixnum(context_index + 1),thread); + make_fixnum(context_index + 1),thread); thread->interrupt_contexts[context_index] = context; @@ -251,7 +270,7 @@ 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 + * the usual signal mask will be restored from the context when the handler * finishes. Otherwise, be careful */ void @@ -259,10 +278,7 @@ undo_fake_foreign_function_call(os_context_t *context) { struct thread *thread=arch_os_get_current_thread(); /* Block all blockable signals. */ - sigset_t block; - sigemptyset(&block); - sigaddset_blockable(&block); - sigprocmask(SIG_BLOCK, &block, 0); + block_blockable_signals(); /* going back into Lisp */ foreign_function_call_active = 0; @@ -281,41 +297,38 @@ undo_fake_foreign_function_call(os_context_t *context) * signalling an internal error */ void interrupt_internal_error(int signal, siginfo_t *info, os_context_t *context, - boolean continuable) + boolean continuable) { - lispobj context_sap = 0; + lispobj context_sap; - check_blockables_blocked_or_lose(); fake_foreign_function_call(context); + if (!internal_errors_enabled) { + 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"); + } + /* Allocate the SAP object while the interrupts are still * disabled. */ - if (internal_errors_enabled) { - context_sap = alloc_sap(context); - } + context_sap = alloc_sap(context); - sigprocmask(SIG_SETMASK, os_context_sigmask_addr(context), 0); + thread_sigmask(SIG_SETMASK, os_context_sigmask_addr(context), 0); - if (internal_errors_enabled) { - SHOW("in interrupt_internal_error"); + SHOW("in interrupt_internal_error"); #ifdef QSHOW - /* Display some rudimentary debugging information about the - * error, so that even if the Lisp error handler gets badly - * confused, we have a chance to determine what's going on. */ - describe_internal_error(context); + /* Display some rudimentary debugging information about the + * error, so that even if the Lisp error handler gets badly + * confused, we have a chance to determine what's going on. */ + describe_internal_error(context); #endif - funcall2(SymbolFunction(INTERNAL_ERROR), context_sap, - continuable ? T : NIL); - } else { - 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"); - } + funcall2(SymbolFunction(INTERNAL_ERROR), context_sap, + continuable ? T : NIL); + undo_fake_foreign_function_call(context); /* blocks signals again */ - if (continuable) { - arch_skip_instruction(context); - } + if (continuable) + arch_skip_instruction(context); } void @@ -325,34 +338,64 @@ interrupt_handle_pending(os_context_t *context) struct interrupt_data *data; check_blockables_blocked_or_lose(); - check_interrupts_enabled_or_lose(context); thread=arch_os_get_current_thread(); data=thread->interrupt_data; - /* Pseudo atomic may trigger several times for a single interrupt, - * and while without-interrupts should not, a false trigger by - * pseudo-atomic may eat a pending handler even from - * without-interrupts. */ - if (data->pending_handler) { - - /* If we're here as the result of a pseudo-atomic as opposed - * to WITHOUT-INTERRUPTS, then INTERRUPT_PENDING is already - * NIL, because maybe_defer_handler sets - * PSEUDO_ATOMIC_INTERRUPTED only if interrupts are enabled.*/ - SetSymbolValue(INTERRUPT_PENDING, NIL,thread); - - /* 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. - * This should ensure that when we return from the handler the - * 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); + if (SymbolValue(GC_INHIBIT,thread)==NIL) { +#ifdef LISP_FEATURE_SB_THREAD + if (SymbolValue(STOP_FOR_GC_PENDING,thread) != NIL) { + /* another thread has already initiated a gc, this attempt + * might as well be cancelled */ + SetSymbolValue(GC_PENDING,NIL,thread); + SetSymbolValue(STOP_FOR_GC_PENDING,NIL,thread); + sig_stop_for_gc_handler(SIG_STOP_FOR_GC,NULL,context); + } else +#endif + if (SymbolValue(GC_PENDING,thread) != NIL) { + /* GC_PENDING is cleared in SUB-GC, or if another thread + * is doing a gc already we will get a SIG_STOP_FOR_GC and + * that will clear it. */ + interrupt_maybe_gc_int(0,NULL,context); + } + check_blockables_blocked_or_lose(); + } + + /* we may be here only to do the gc stuff, if interrupts are + * enabled run the pending handler */ + if (!((SymbolValue(INTERRUPTS_ENABLED,thread) == NIL) || + ( +#if !defined(LISP_FEATURE_X86) && !defined(LISP_FEATURE_X86_64) + (!foreign_function_call_active) && +#endif + arch_pseudo_atomic_atomic(context)))) { + + /* There may be no pending handler, because it was only a gc + * that had to be executed or because pseudo atomic triggered + * twice for a single interrupt. For the interested reader, + * that may happen if an interrupt hits after the interrupted + * flag is cleared but before pseduo-atomic is set and a + * pseudo atomic is interrupted in that interrupt. */ + if (data->pending_handler) { + + /* If we're here as the result of a pseudo-atomic as opposed + * to WITHOUT-INTERRUPTS, then INTERRUPT_PENDING is already + * NIL, because maybe_defer_handler sets + * PSEUDO_ATOMIC_INTERRUPTED only if interrupts are enabled.*/ + SetSymbolValue(INTERRUPT_PENDING, NIL,thread); + + /* 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. + * This should ensure that when we return from the handler the + * 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); + } } } @@ -375,26 +418,26 @@ void interrupt_handle_now(int signal, siginfo_t *info, void *void_context) { os_context_t *context = (os_context_t*)void_context; - struct thread *thread=arch_os_get_current_thread(); #if !defined(LISP_FEATURE_X86) && !defined(LISP_FEATURE_X86_64) boolean were_in_lisp; #endif union interrupt_handler handler; check_blockables_blocked_or_lose(); - check_interrupts_enabled_or_lose(context); + if (sigismember(&deferrable_sigset,signal)) + check_interrupts_enabled_or_lose(context); #ifdef LISP_FEATURE_LINUX /* Under Linux on some architectures, we appear to have to restore the FPU control word from the context, as after the signal is delivered we appear to have a null FPU control word. */ os_restore_fp_control(context); -#endif - handler = thread->interrupt_data->interrupt_handlers[signal]; +#endif + handler = interrupt_handlers[signal]; if (ARE_SAME_HANDLER(handler.c, SIG_IGN)) { - return; + return; } - + #if !defined(LISP_FEATURE_X86) && !defined(LISP_FEATURE_X86_64) were_in_lisp = !foreign_function_call_active; if (were_in_lisp) @@ -403,54 +446,58 @@ interrupt_handle_now(int signal, siginfo_t *info, void *void_context) fake_foreign_function_call(context); } -#ifdef QSHOW_SIGNALS - FSHOW((stderr, - "/entering interrupt_handle_now(%d, info, context)\n", - signal)); -#endif + FSHOW_SIGNAL((stderr, + "/entering interrupt_handle_now(%d, info, context)\n", + signal)); if (ARE_SAME_HANDLER(handler.c, SIG_DFL)) { - /* 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); + /* 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); } else if (lowtag_of(handler.lisp) == FUN_POINTER_LOWTAG) { - /* Once we've decided what to do about contexts in a - * return-elsewhere world (the original context will no longer - * be available; should we copy it or was nobody using it anyway?) - * then we should convert this to return-elsewhere */ + /* Once we've decided what to do about contexts in a + * return-elsewhere world (the original context will no longer + * be available; should we copy it or was nobody using it anyway?) + * then we should convert this to return-elsewhere */ /* CMUCL comment said "Allocate the SAPs while the interrupts - * are still disabled.". I (dan, 2003.08.21) assume this is - * because we're not in pseudoatomic and allocation shouldn't - * be interrupted. In which case it's no longer an issue as - * all our allocation from C now goes through a PA wrapper, - * but still, doesn't hurt */ + * are still disabled.". I (dan, 2003.08.21) assume this is + * because we're not in pseudoatomic and allocation shouldn't + * be interrupted. In which case it's no longer an issue as + * 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 */ lispobj info_sap,context_sap = alloc_sap(context); info_sap = alloc_sap(info); - /* Allow signals again. */ - sigprocmask(SIG_SETMASK, os_context_sigmask_addr(context), 0); - -#ifdef QSHOW_SIGNALS - SHOW("calling Lisp-level handler"); + /* Leave deferrable signals blocked, the handler itself will + * allow signals again when it sees fit. */ +#ifdef LISP_FEATURE_SB_THREAD + { + sigset_t unblock; + sigaddset(&unblock, SIG_STOP_FOR_GC); + thread_sigmask(SIG_UNBLOCK, &unblock, 0); + } #endif + FSHOW_SIGNAL((stderr,"/calling Lisp-level handler\n")); + funcall3(handler.lisp, - make_fixnum(signal), - info_sap, - context_sap); + make_fixnum(signal), + info_sap, + context_sap); } else { -#ifdef QSHOW_SIGNALS - SHOW("calling C-level handler"); -#endif + FSHOW_SIGNAL((stderr,"/calling C-level handler\n")); /* Allow signals again. */ - sigprocmask(SIG_SETMASK, os_context_sigmask_addr(context), 0); - + thread_sigmask(SIG_SETMASK, os_context_sigmask_addr(context), 0); + (*handler.c)(signal, info, void_context); } @@ -461,11 +508,9 @@ interrupt_handle_now(int signal, siginfo_t *info, void *void_context) undo_fake_foreign_function_call(context); /* block signals again */ } -#ifdef QSHOW_SIGNALS - FSHOW((stderr, - "/returning from interrupt_handle_now(%d, info, context)\n", - signal)); -#endif + FSHOW_SIGNAL((stderr, + "/returning from interrupt_handle_now(%d, info, context)\n", + signal)); } /* This is called at the end of a critical section if the indications @@ -476,11 +521,10 @@ interrupt_handle_now(int signal, siginfo_t *info, void *void_context) void run_deferred_handler(struct interrupt_data *data, void *v_context) { - /* The pending_handler may enable interrupts (see - * interrupt_maybe_gc_int) and then another interrupt may hit, - * overwrite interrupt_data, so reset the pending handler before - * calling it. Trust the handler to finish with the siginfo before - * enabling interrupts. */ + /* The pending_handler may enable interrupts and then another + * interrupt may hit, overwrite interrupt_data, so reset the + * pending handler before calling it. Trust the handler to finish + * with the siginfo before enabling interrupts. */ void (*pending_handler) (int, siginfo_t*, void*)=data->pending_handler; data->pending_handler=0; (*pending_handler)(data->pending_signal,&(data->pending_info), v_context); @@ -488,7 +532,7 @@ run_deferred_handler(struct interrupt_data *data, void *v_context) { boolean maybe_defer_handler(void *handler, struct interrupt_data *data, - int signal, siginfo_t *info, os_context_t *context) + int signal, siginfo_t *info, os_context_t *context) { struct thread *thread=arch_os_get_current_thread(); @@ -498,47 +542,50 @@ maybe_defer_handler(void *handler, struct interrupt_data *data, lose("interrupt already pending"); /* 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. + * atomic section inside a WITHOUT-INTERRUPTS. */ if (SymbolValue(INTERRUPTS_ENABLED,thread) == NIL) { - store_signal_data_for_later(data,handler,signal,info,context); + store_signal_data_for_later(data,handler,signal,info,context); SetSymbolValue(INTERRUPT_PENDING, T,thread); -#ifdef QSHOW_SIGNALS - FSHOW((stderr, - "/maybe_defer_handler(%x,%d),thread=%d: deferred\n", - (unsigned int)handler,signal,thread->pid)); -#endif - return 1; - } + FSHOW_SIGNAL((stderr, + "/maybe_defer_handler(%x,%d),thread=%lu: deferred\n", + (unsigned int)handler,signal, + (unsigned long)thread->os_thread)); + return 1; + } /* a slightly confusing test. arch_pseudo_atomic_atomic() doesn't * actually use its argument for anything on x86, so this branch * may succeed even when context is null (gencgc alloc()) */ if ( #if !defined(LISP_FEATURE_X86) && !defined(LISP_FEATURE_X86_64) - (!foreign_function_call_active) && + /* FIXME: this foreign_function_call_active test is dubious at + * best. If a foreign call is made in a pseudo atomic section + * (?) or more likely a pseudo atomic section is in a foreign + * call then an interrupt is executed immediately. Maybe it + * has to do with C code not maintaining pseudo atomic + * properly. MG - 2005-08-10 */ + (!foreign_function_call_active) && #endif - arch_pseudo_atomic_atomic(context)) { - store_signal_data_for_later(data,handler,signal,info,context); - arch_set_pseudo_atomic_interrupted(context); -#ifdef QSHOW_SIGNALS - FSHOW((stderr, - "/maybe_defer_handler(%x,%d),thread=%d: deferred(PA)\n", - (unsigned int)handler,signal,thread->pid)); -#endif - return 1; + arch_pseudo_atomic_atomic(context)) { + 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)); + return 1; } -#ifdef QSHOW_SIGNALS - FSHOW((stderr, - "/maybe_defer_handler(%x,%d),thread=%d: not deferred\n", - (unsigned int)handler,signal,thread->pid)); -#endif + FSHOW_SIGNAL((stderr, + "/maybe_defer_handler(%x,%d),thread=%lu: not deferred\n", + (unsigned int)handler,signal, + (unsigned long)thread->os_thread)); return 0; } static void store_signal_data_for_later (struct interrupt_data *data, void *handler, - int signal, - siginfo_t *info, os_context_t *context) + int signal, + siginfo_t *info, os_context_t *context) { if (data->pending_handler) lose("tried to overwrite pending interrupt handler %x with %x\n", @@ -548,15 +595,15 @@ store_signal_data_for_later (struct interrupt_data *data, void *handler, data->pending_handler = handler; data->pending_signal = signal; if(info) - memcpy(&(data->pending_info), info, sizeof(siginfo_t)); + memcpy(&(data->pending_info), info, sizeof(siginfo_t)); if(context) { - /* the signal mask in the context (from before we were - * interrupted) is copied to be restored when - * run_deferred_handler happens. Then the usually-blocked - * signals are added to the mask in the context so that we are - * running with blocked signals when the handler returns */ - sigcopyset(&(data->pending_mask),os_context_sigmask_addr(context)); - sigaddset_blockable(os_context_sigmask_addr(context)); + /* the signal mask in the context (from before we were + * interrupted) is copied to be restored when + * run_deferred_handler happens. Then the usually-blocked + * signals are added to the mask in the context so that we are + * running with blocked signals when the handler returns */ + sigcopyset(&(data->pending_mask),os_context_sigmask_addr(context)); + sigaddset_deferrable(os_context_sigmask_addr(context)); } } @@ -568,10 +615,9 @@ maybe_now_maybe_later(int signal, siginfo_t *info, void *void_context) struct interrupt_data *data=thread->interrupt_data; #ifdef LISP_FEATURE_LINUX os_restore_fp_control(context); -#endif - if(maybe_defer_handler(interrupt_handle_now,data, - signal,info,context)) - return; +#endif + if(maybe_defer_handler(interrupt_handle_now,data,signal,info,context)) + return; interrupt_handle_now(signal, info, context); #ifdef LISP_FEATURE_DARWIN /* Work around G5 bug */ @@ -583,15 +629,13 @@ static void low_level_interrupt_handle_now(int signal, siginfo_t *info, void *void_context) { os_context_t *context = (os_context_t*)void_context; - struct thread *thread=arch_os_get_current_thread(); #ifdef LISP_FEATURE_LINUX os_restore_fp_control(context); #endif check_blockables_blocked_or_lose(); check_interrupts_enabled_or_lose(context); - (*thread->interrupt_data->interrupt_low_level_handlers[signal]) - (signal, info, void_context); + interrupt_low_level_handlers[signal](signal, info, void_context); #ifdef LISP_FEATURE_DARWIN /* Work around G5 bug */ DARWIN_FIX_CONTEXT(context); @@ -606,10 +650,10 @@ low_level_maybe_now_maybe_later(int signal, siginfo_t *info, void *void_context) struct interrupt_data *data=thread->interrupt_data; #ifdef LISP_FEATURE_LINUX os_restore_fp_control(context); -#endif +#endif if(maybe_defer_handler(low_level_interrupt_handle_now,data, - signal,info,context)) - return; + signal,info,context)) + return; low_level_interrupt_handle_now(signal, info, context); #ifdef LISP_FEATURE_DARWIN /* Work around G5 bug */ @@ -618,41 +662,51 @@ low_level_maybe_now_maybe_later(int signal, siginfo_t *info, void *void_context) } #ifdef LISP_FEATURE_SB_THREAD + void sig_stop_for_gc_handler(int signal, siginfo_t *info, void *void_context) { os_context_t *context = arch_os_get_context(&void_context); struct thread *thread=arch_os_get_current_thread(); sigset_t ss; - int i; - - /* need the context stored so it can have registers scavenged */ - fake_foreign_function_call(context); - - sigemptyset(&ss); - for(i=1;istate!=STATE_STOPPING) { - lose("sig_stop_for_gc_handler: wrong thread state: %ld\n", - fixnum_value(thread->state)); - } - thread->state=STATE_STOPPED; - sigemptyset(&ss); sigaddset(&ss,SIG_STOP_FOR_GC); - sigwaitinfo(&ss,0); - if(thread->state!=STATE_STOPPED) { - lose("sig_stop_for_gc_handler: wrong thread state on wakeup: %ld\n", - fixnum_value(thread->state)); - } - thread->state=STATE_RUNNING; + if ((arch_pseudo_atomic_atomic(context) || + SymbolValue(GC_INHIBIT,thread) != NIL)) { + SetSymbolValue(STOP_FOR_GC_PENDING,T,thread); + if (SymbolValue(GC_INHIBIT,thread) == NIL) + arch_set_pseudo_atomic_interrupted(context); + FSHOW_SIGNAL((stderr,"thread=%lu sig_stop_for_gc deferred\n", + thread->os_thread)); + } else { + /* need the context stored so it can have registers scavenged */ + fake_foreign_function_call(context); - undo_fake_foreign_function_call(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)); + } + thread->state=STATE_SUSPENDED; + FSHOW_SIGNAL((stderr,"thread=%lu suspended\n",thread->os_thread)); + + sigemptyset(&ss); sigaddset(&ss,SIG_STOP_FOR_GC); + /* 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", + fixnum_value(thread->state)); + } + + undo_fake_foreign_function_call(context); + } } #endif @@ -670,17 +724,17 @@ interrupt_handle_now_handler(int signal, siginfo_t *info, void *void_context) * stuff to detect and handle hitting the GC trigger */ -#ifndef LISP_FEATURE_GENCGC +#ifndef LISP_FEATURE_GENCGC /* since GENCGC has its own way to record trigger */ static boolean gc_trigger_hit(int signal, siginfo_t *info, os_context_t *context) { if (current_auto_gc_trigger == NULL) - return 0; + return 0; else{ - void *badaddr=arch_get_bad_addr(signal,info,context); - return (badaddr >= (void *)current_auto_gc_trigger && - badaddr <((void *)current_dynamic_space + DYNAMIC_SPACE_SIZE)); + void *badaddr=arch_get_bad_addr(signal,info,context); + return (badaddr >= (void *)current_auto_gc_trigger && + badaddr <((void *)current_dynamic_space + DYNAMIC_SPACE_SIZE)); } } #endif @@ -701,12 +755,13 @@ 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); void *code = &(((struct simple_fun *) fun)->code); -#endif +#endif /* Build a stack frame showing `interrupted' so that the * user's backtrace makes (as much) sense (as usual) */ /* FIXME: what about restoring fp state? */ + /* FIXME: what about restoring errno? */ #ifdef LISP_FEATURE_X86 /* Suppose the existence of some function that saved all * registers, called call_into_lisp, then restored GP registers and @@ -714,15 +769,17 @@ void arrange_return_to_lisp_function(os_context_t *context, lispobj function) push ebp mov ebp esp - pushad + pushfl + pushal push $0 push $0 pushl {address of function to call} call 0x8058db0 addl $12,%esp - popa - leave - ret + popal + popfl + leave + ret * What we do here is set up the stack that call_into_lisp would * expect to see if it had been called by this code, and frob the @@ -737,10 +794,11 @@ void arrange_return_to_lisp_function(os_context_t *context, lispobj function) u32 *sp=(u32 *)*os_context_register_addr(context,reg_ESP); - *(sp-15) = post_signal_tramp; /* return address for call_into_lisp */ + /* return address for call_into_lisp: */ + *(sp-15) = (u32)post_signal_tramp; *(sp-14) = function; /* args for call_into_lisp : function*/ - *(sp-13) = 0; /* arg array */ - *(sp-12) = 0; /* no. args */ + *(sp-13) = 0; /* arg array */ + *(sp-12) = 0; /* no. args */ /* this order matches that used in POPAD */ *(sp-11)=*os_context_register_addr(context,reg_EDI); *(sp-10)=*os_context_register_addr(context,reg_ESI); @@ -759,20 +817,20 @@ void arrange_return_to_lisp_function(os_context_t *context, lispobj function) #elif defined(LISP_FEATURE_X86_64) u64 *sp=(u64 *)*os_context_register_addr(context,reg_RSP); - *(sp-20) = post_signal_tramp; /* return address for call_into_lisp */ - - *(sp-19)=*os_context_register_addr(context,reg_R15); - *(sp-18)=*os_context_register_addr(context,reg_R14); - *(sp-17)=*os_context_register_addr(context,reg_R13); - *(sp-16)=*os_context_register_addr(context,reg_R12); - *(sp-15)=*os_context_register_addr(context,reg_R11); - *(sp-14)=*os_context_register_addr(context,reg_R10); - *(sp-13)=*os_context_register_addr(context,reg_R9); - *(sp-12)=*os_context_register_addr(context,reg_R8); - *(sp-11)=*os_context_register_addr(context,reg_RDI); - *(sp-10)=*os_context_register_addr(context,reg_RSI); - *(sp-9)=*os_context_register_addr(context,reg_RSP)-16; - *(sp-8)=0; + /* return address for call_into_lisp: */ + *(sp-18) = (u64)post_signal_tramp; + + *(sp-17)=*os_context_register_addr(context,reg_R15); + *(sp-16)=*os_context_register_addr(context,reg_R14); + *(sp-15)=*os_context_register_addr(context,reg_R13); + *(sp-14)=*os_context_register_addr(context,reg_R12); + *(sp-13)=*os_context_register_addr(context,reg_R11); + *(sp-12)=*os_context_register_addr(context,reg_R10); + *(sp-11)=*os_context_register_addr(context,reg_R9); + *(sp-10)=*os_context_register_addr(context,reg_R8); + *(sp-9)=*os_context_register_addr(context,reg_RDI); + *(sp-8)=*os_context_register_addr(context,reg_RSI); + /* skip RBP and RSP */ *(sp-7)=*os_context_register_addr(context,reg_RBX); *(sp-6)=*os_context_register_addr(context,reg_RDX); *(sp-5)=*os_context_register_addr(context,reg_RCX); @@ -781,85 +839,89 @@ void arrange_return_to_lisp_function(os_context_t *context, lispobj function) *(sp-2)=*os_context_register_addr(context,reg_RBP); *(sp-1)=*os_context_pc_addr(context); - *os_context_register_addr(context,reg_RDI) = function; /* function */ + *os_context_register_addr(context,reg_RDI) = + (os_context_register_t)function; /* function */ *os_context_register_addr(context,reg_RSI) = 0; /* arg. array */ *os_context_register_addr(context,reg_RDX) = 0; /* no. args */ -#else +#else struct thread *th=arch_os_get_current_thread(); build_fake_control_stack_frames(th,context); #endif #ifdef LISP_FEATURE_X86 - *os_context_pc_addr(context) = call_into_lisp; - *os_context_register_addr(context,reg_ECX) = 0; - *os_context_register_addr(context,reg_EBP) = sp-2; -#ifdef __NetBSD__ - *os_context_register_addr(context,reg_UESP) = sp-15; + *os_context_pc_addr(context) = (os_context_register_t)call_into_lisp; + *os_context_register_addr(context,reg_ECX) = 0; + *os_context_register_addr(context,reg_EBP) = (os_context_register_t)(sp-2); +#ifdef __NetBSD__ + *os_context_register_addr(context,reg_UESP) = + (os_context_register_t)(sp-15); #else - *os_context_register_addr(context,reg_ESP) = sp-15; + *os_context_register_addr(context,reg_ESP) = (os_context_register_t)(sp-15); #endif #elif defined(LISP_FEATURE_X86_64) - *os_context_pc_addr(context) = call_into_lisp; - *os_context_register_addr(context,reg_RCX) = 0; - *os_context_register_addr(context,reg_RBP) = sp-2; - *os_context_register_addr(context,reg_RSP) = sp-20; + *os_context_pc_addr(context) = (os_context_register_t)call_into_lisp; + *os_context_register_addr(context,reg_RCX) = 0; + *os_context_register_addr(context,reg_RBP) = (os_context_register_t)(sp-2); + *os_context_register_addr(context,reg_RSP) = (os_context_register_t)(sp-18); #else /* this much of the calling convention is common to all non-x86 ports */ - *os_context_pc_addr(context) = code; - *os_context_register_addr(context,reg_NARGS) = 0; - *os_context_register_addr(context,reg_LIP) = code; - *os_context_register_addr(context,reg_CFP) = - current_control_frame_pointer; + *os_context_pc_addr(context) = (os_context_register_t)(unsigned long)code; + *os_context_register_addr(context,reg_NARGS) = 0; + *os_context_register_addr(context,reg_LIP) = + (os_context_register_t)(unsigned long)code; + *os_context_register_addr(context,reg_CFP) = + (os_context_register_t)(unsigned long)current_control_frame_pointer; #endif #ifdef ARCH_HAS_NPC_REGISTER *os_context_npc_addr(context) = - 4 + *os_context_pc_addr(context); + 4 + *os_context_pc_addr(context); #endif #ifdef LISP_FEATURE_SPARC - *os_context_register_addr(context,reg_CODE) = - fun + FUN_POINTER_LOWTAG; + *os_context_register_addr(context,reg_CODE) = + (os_context_register_t)(fun + FUN_POINTER_LOWTAG); #endif } #ifdef LISP_FEATURE_SB_THREAD + +/* 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) { os_context_t *context = (os_context_t*)arch_os_get_context(&v_context); - arrange_return_to_lisp_function(context,info->si_value.sival_int); + /* 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)); } -void thread_exit_handler(int num, siginfo_t *info, void *v_context) -{ /* called when a child thread exits */ - mark_dead_threads(); -} - #endif /* KLUDGE: Theoretically the approach we use for undefined alien * variables should work for functions as well, but on PPC/Darwin * we get bus error at bogus addresses instead, hence this workaround, * that has the added benefit of automatically discriminating between - * functions and variables. + * functions and variables. */ void undefined_alien_function() { funcall0(SymbolFunction(UNDEFINED_ALIEN_FUNCTION_ERROR)); } -boolean handle_guard_page_triggered(os_context_t *context,void *addr){ +boolean handle_guard_page_triggered(os_context_t *context,os_vm_address_t addr) +{ struct thread *th=arch_os_get_current_thread(); - - /* note the os_context hackery here. When the signal handler returns, + + /* note the os_context hackery here. When the signal handler returns, * it won't go back to what it was doing ... */ - if(addr >= CONTROL_STACK_GUARD_PAGE(th) && + if(addr >= CONTROL_STACK_GUARD_PAGE(th) && addr < CONTROL_STACK_GUARD_PAGE(th) + os_vm_page_size) { /* We hit the end of the control stack: disable guard page * 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. */ - protect_control_stack_guard_page(th->pid,0); - protect_control_stack_return_guard_page(th->pid,1); - + protect_control_stack_guard_page(0); + protect_control_stack_return_guard_page(1); + arrange_return_to_lisp_function (context, SymbolFunction(CONTROL_STACK_EXHAUSTED_ERROR)); return 1; @@ -870,15 +932,15 @@ boolean handle_guard_page_triggered(os_context_t *context,void *addr){ * unprotect this one. This works even if we somehow missed * the return-guard-page, and hit it on our way to new * exhaustion instead. */ - protect_control_stack_guard_page(th->pid,1); - protect_control_stack_return_guard_page(th->pid,0); + protect_control_stack_guard_page(1); + protect_control_stack_return_guard_page(0); return 1; } else if (addr >= undefined_alien_address && - addr < undefined_alien_address + os_vm_page_size) { - arrange_return_to_lisp_function + addr < undefined_alien_address + os_vm_page_size) { + arrange_return_to_lisp_function (context, SymbolFunction(UNDEFINED_ALIEN_VARIABLE_ERROR)); - return 1; + return 1; } else return 0; } @@ -894,16 +956,27 @@ boolean interrupt_maybe_gc(int signal, siginfo_t *info, void *void_context) { os_context_t *context=(os_context_t *) void_context; - struct thread *th=arch_os_get_current_thread(); - struct interrupt_data *data= - th ? th->interrupt_data : global_interrupt_data; - if(!data->pending_handler && !foreign_function_call_active && - gc_trigger_hit(signal, info, context)){ + if(!foreign_function_call_active && gc_trigger_hit(signal, info, context)){ + struct thread *thread=arch_os_get_current_thread(); clear_auto_gc_trigger(); - if(!maybe_defer_handler(interrupt_maybe_gc_int, - data,signal,info,void_context)) - interrupt_maybe_gc_int(signal,info,void_context); + /* Don't flood the system with interrupts if the need to gc is + * already noted. This can happen for example when SUB-GC + * allocates or after a gc triggered in a WITHOUT-GCING. */ + if (SymbolValue(GC_PENDING,thread) == NIL) { + if (SymbolValue(GC_INHIBIT,thread) == NIL) { + if (arch_pseudo_atomic_atomic(context)) { + /* set things up so that GC happens when we finish + * the PA section */ + SetSymbolValue(GC_PENDING,T,thread); + arch_set_pseudo_atomic_interrupted(context); + } else { + interrupt_maybe_gc_int(signal,info,void_context); + } + } else { + SetSymbolValue(GC_PENDING,T,thread); + } + } return 1; } return 0; @@ -916,24 +989,41 @@ boolean interrupt_maybe_gc_int(int signal, siginfo_t *info, void *void_context) { os_context_t *context=(os_context_t *) void_context; + struct thread *thread=arch_os_get_current_thread(); - check_blockables_blocked_or_lose(); fake_foreign_function_call(context); /* SUB-GC may return without GCing if *GC-INHIBIT* is set, in * which case we will be running with no gc trigger barrier * thing for a while. But it shouldn't be long until the end - * of WITHOUT-GCING. + * of WITHOUT-GCING. * * FIXME: It would be good to protect the end of dynamic space * and signal a storage condition from there. */ - /* restore the signal mask from the interrupted context before - * calling into Lisp */ - if (context) - sigprocmask(SIG_SETMASK, os_context_sigmask_addr(context), 0); - + /* Restore the signal mask from the interrupted context before + * calling into Lisp if interrupts are enabled. Why not always? + * + * Suppose there is a WITHOUT-INTERRUPTS block far, far out. If an + * interrupt hits while in SUB-GC, it is deferred and the + * os_context_sigmask of that interrupt is set to block further + * deferrable interrupts (until the first one is + * handled). Unfortunately, that context refers to this place and + * when we return from here the signals will not be blocked. + * + * A kludgy alternative is to propagate the sigmask change to the + * outer context. + */ + 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; + sigaddset(&new,SIG_STOP_FOR_GC); + thread_sigmask(SIG_UNBLOCK,&new,0); + } +#endif funcall0(SymbolFunction(SUB_GC)); undo_fake_foreign_function_call(context); @@ -947,39 +1037,35 @@ interrupt_maybe_gc_int(int signal, siginfo_t *info, void *void_context) void undoably_install_low_level_interrupt_handler (int signal, - void handler(int, - siginfo_t*, - void*)) + void handler(int, + siginfo_t*, + void*)) { struct sigaction sa; - struct thread *th=arch_os_get_current_thread(); - struct interrupt_data *data= - th ? th->interrupt_data : global_interrupt_data; if (0 > signal || signal >= NSIG) { - lose("bad signal number %d", signal); + lose("bad signal number %d", signal); } - if (sigismember(&blockable_sigset,signal)) + if (sigismember(&deferrable_sigset,signal)) sa.sa_sigaction = low_level_maybe_now_maybe_later; else sa.sa_sigaction = handler; - sigemptyset(&sa.sa_mask); - sigaddset_blockable(&sa.sa_mask); + sigcopyset(&sa.sa_mask, &blockable_sigset); sa.sa_flags = SA_SIGINFO | SA_RESTART; #ifdef LISP_FEATURE_C_STACK_IS_CONTROL_STACK - if((signal==SIG_MEMORY_FAULT) + if((signal==SIG_MEMORY_FAULT) #ifdef SIG_INTERRUPT_THREAD || (signal==SIG_INTERRUPT_THREAD) #endif ) - sa.sa_flags|= SA_ONSTACK; + sa.sa_flags |= SA_ONSTACK; #endif - + sigaction(signal, &sa, NULL); - data->interrupt_low_level_handlers[signal] = - (ARE_SAME_HANDLER(handler, SIG_DFL) ? 0 : handler); + interrupt_low_level_handlers[signal] = + (ARE_SAME_HANDLER(handler, SIG_DFL) ? 0 : handler); } /* This is called from Lisp. */ @@ -989,41 +1075,34 @@ install_handler(int signal, void handler(int, siginfo_t*, void*)) struct sigaction sa; sigset_t old, new; union interrupt_handler oldhandler; - struct thread *th=arch_os_get_current_thread(); - struct interrupt_data *data= - th ? th->interrupt_data : global_interrupt_data; FSHOW((stderr, "/entering POSIX install_handler(%d, ..)\n", signal)); sigemptyset(&new); sigaddset(&new, signal); - sigprocmask(SIG_BLOCK, &new, &old); + thread_sigmask(SIG_BLOCK, &new, &old); + + FSHOW((stderr, "/interrupt_low_level_handlers[signal]=%x\n", + (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)) { + sa.sa_sigaction = handler; + } else if (sigismember(&deferrable_sigset, signal)) { + sa.sa_sigaction = maybe_now_maybe_later; + } else { + sa.sa_sigaction = interrupt_handle_now_handler; + } - sigemptyset(&new); - sigaddset_blockable(&new); - - FSHOW((stderr, "/data->interrupt_low_level_handlers[signal]=%x\n", - (unsigned int)data->interrupt_low_level_handlers[signal])); - if (data->interrupt_low_level_handlers[signal]==0) { - if (ARE_SAME_HANDLER(handler, SIG_DFL) || - ARE_SAME_HANDLER(handler, SIG_IGN)) { - sa.sa_sigaction = handler; - } else if (sigismember(&new, signal)) { - sa.sa_sigaction = maybe_now_maybe_later; - } else { - sa.sa_sigaction = interrupt_handle_now_handler; - } - - sigemptyset(&sa.sa_mask); - sigaddset_blockable(&sa.sa_mask); - sa.sa_flags = SA_SIGINFO | SA_RESTART; - sigaction(signal, &sa, NULL); + sigcopyset(&sa.sa_mask, &blockable_sigset); + sa.sa_flags = SA_SIGINFO | SA_RESTART; + sigaction(signal, &sa, NULL); } - oldhandler = data->interrupt_handlers[signal]; - data->interrupt_handlers[signal].c = handler; + oldhandler = interrupt_handlers[signal]; + interrupt_handlers[signal].c = handler; - sigprocmask(SIG_SETMASK, &old, 0); + thread_sigmask(SIG_SETMASK, &old, 0); FSHOW((stderr, "/leaving POSIX install_handler(%d, ..)\n", signal)); @@ -1035,20 +1114,20 @@ interrupt_init() { int i; SHOW("entering interrupt_init()"); + sigemptyset(&deferrable_sigset); sigemptyset(&blockable_sigset); + sigaddset_deferrable(&deferrable_sigset); sigaddset_blockable(&blockable_sigset); - - global_interrupt_data=calloc(sizeof(struct interrupt_data), 1); /* Set up high level handler information. */ for (i = 0; i < NSIG; i++) { - global_interrupt_data->interrupt_handlers[i].c = - /* (The cast here blasts away the distinction between - * SA_SIGACTION-style three-argument handlers and - * signal(..)-style one-argument handlers, which is OK - * because it works to call the 1-argument form where the - * 3-argument form is expected.) */ - (void (*)(int, siginfo_t*, void*))SIG_DFL; + interrupt_handlers[i].c = + /* (The cast here blasts away the distinction between + * SA_SIGACTION-style three-argument handlers and + * signal(..)-style one-argument handlers, which is OK + * because it works to call the 1-argument form where the + * 3-argument form is expected.) */ + (void (*)(int, siginfo_t*, void*))SIG_DFL; } SHOW("returning from interrupt_init()");