X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fruntime%2Finterrupt.c;h=ea0880f57459f8b2e93adda71435946f61227028;hb=1e161456a066b34e4a764fd351217dafc4f4f787;hp=8c87054c7d2d559959b71d2d04a2d07cf8c70ef7;hpb=cf507f95509a855a752b6f1771aa06877b8a3b30;p=sbcl.git diff --git a/src/runtime/interrupt.c b/src/runtime/interrupt.c index 8c87054..ea0880f 100644 --- a/src/runtime/interrupt.c +++ b/src/runtime/interrupt.c @@ -59,15 +59,28 @@ #include "globals.h" #include "lispregs.h" #include "validate.h" +#include "interr.h" #include "gc.h" #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" +/* 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. + * After sufficient initialization has been completed, the answer + * becomes 'yes'.) */ +boolean internal_errors_enabled = 0; + +#ifndef LISP_FEATURE_WIN32 +static +void (*interrupt_low_level_handlers[NSIG]) (int, siginfo_t*, os_context_t*); +#endif +union interrupt_handler interrupt_handlers[NSIG]; + /* 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. */ @@ -80,6 +93,56 @@ os_context_t *context = arch_os_get_context(&void_context); #endif +/* Foreign code may want to start some threads on its own. + * Non-targetted, truly asynchronous signals can be delivered to + * basically any thread, but invoking Lisp handlers in such foregign + * threads is really bad, so let's resignal it. + * + * This should at least bring attention to the problem, but it cannot + * work for SIGSEGV and similar. It is good enough for timers, and + * maybe all deferrables. */ + +#ifdef LISP_FEATURE_SB_THREAD +static void +add_handled_signals(sigset_t *sigset) +{ + int i; + for(i = 1; i < NSIG; i++) { + if (!(ARE_SAME_HANDLER(interrupt_low_level_handlers[i], SIG_DFL)) || + !(ARE_SAME_HANDLER(interrupt_handlers[i].c, SIG_DFL))) { + sigaddset(sigset, i); + } + } +} + +void block_signals(sigset_t *what, sigset_t *where, sigset_t *old); +#endif + +static boolean +maybe_resignal_to_lisp_thread(int signal, os_context_t *context) +{ +#ifdef LISP_FEATURE_SB_THREAD + if (!pthread_getspecific(lisp_thread)) { + if (!(sigismember(&deferrable_sigset,signal))) { + corruption_warning_and_maybe_lose + ("Received signal %d in non-lisp thread %lu, resignalling to a lisp thread.", + signal, + pthread_self()); + } + { + sigset_t sigset; + sigemptyset(&sigset); + add_handled_signals(&sigset); + block_signals(&sigset, 0, 0); + block_signals(&sigset, os_context_sigmask_addr(context), 0); + kill(getpid(), signal); + } + return 1; + } else +#endif + return 0; +} + /* These are to be used in signal handlers. Currently all handlers are * called from one of: * @@ -98,10 +161,11 @@ * kernel properly, so we fix it up ourselves in the * arch_os_get_context(..) function. -- CSR, 2002-07-23 */ -#define SAVE_ERRNO(context,void_context) \ +#define SAVE_ERRNO(signal,context,void_context) \ { \ int _saved_errno = errno; \ RESTORE_FP_CONTROL_WORD(context,void_context); \ + if (!maybe_resignal_to_lisp_thread(signal, context)) \ { #define RESTORE_ERRNO \ @@ -250,11 +314,13 @@ sigset_t gc_sigset; #endif +#if !defined(LISP_FEATURE_WIN32) boolean deferrables_blocked_p(sigset_t *sigset) { return all_signals_blocked_p(sigset, &deferrable_sigset, "deferrable"); } +#endif void check_deferrables_unblocked_or_lose(sigset_t *sigset) @@ -274,11 +340,13 @@ check_deferrables_blocked_or_lose(sigset_t *sigset) #endif } +#if !defined(LISP_FEATURE_WIN32) boolean blockables_blocked_p(sigset_t *sigset) { return all_signals_blocked_p(sigset, &blockable_sigset, "blockable"); } +#endif void check_blockables_unblocked_or_lose(sigset_t *sigset) @@ -298,11 +366,13 @@ check_blockables_blocked_or_lose(sigset_t *sigset) #endif } +#if !defined(LISP_FEATURE_WIN32) boolean gc_signals_blocked_p(sigset_t *sigset) { return all_signals_blocked_p(sigset, &gc_sigset, "gc"); } +#endif void check_gc_signals_unblocked_or_lose(sigset_t *sigset) @@ -498,7 +568,14 @@ check_interrupt_context_or_lose(os_context_t *context) if (stop_for_gc_pending) if (!(pseudo_atomic_interrupted || gc_inhibit || in_race_p)) lose("STOP_FOR_GC_PENDING, but why?\n"); + if (pseudo_atomic_interrupted) + if (!(gc_pending || stop_for_gc_pending || interrupt_deferred_p)) + lose("pseudo_atomic_interrupted, but why?\n"); } +#else + if (pseudo_atomic_interrupted) + if (!(gc_pending || interrupt_deferred_p)) + lose("pseudo_atomic_interrupted, but why?\n"); #endif #endif if (interrupt_pending && !interrupt_deferred_p) @@ -518,20 +595,6 @@ check_interrupt_context_or_lose(os_context_t *context) } #endif } - -/* 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. - * After sufficient initialization has been completed, the answer - * becomes 'yes'.) */ -boolean internal_errors_enabled = 0; - -#ifndef LISP_FEATURE_WIN32 -static -void (*interrupt_low_level_handlers[NSIG]) (int, siginfo_t*, os_context_t*); -#endif -union interrupt_handler interrupt_handlers[NSIG]; - /* * utility routines used by various signal handlers @@ -546,23 +609,23 @@ build_fake_control_stack_frames(struct thread *th,os_context_t *context) /* Build a fake stack frame or frames */ - current_control_frame_pointer = + access_control_frame_pointer(th) = (lispobj *)(unsigned long) (*os_context_register_addr(context, reg_CSP)); if ((lispobj *)(unsigned long) (*os_context_register_addr(context, reg_CFP)) - == current_control_frame_pointer) { + == access_control_frame_pointer(th)) { /* There is a small window during call where the callee's * frame isn't built yet. */ if (lowtag_of(*os_context_register_addr(context, reg_CODE)) == FUN_POINTER_LOWTAG) { /* We have called, but not built the new frame, so * build it for them. */ - current_control_frame_pointer[0] = + access_control_frame_pointer(th)[0] = *os_context_register_addr(context, reg_OCFP); - current_control_frame_pointer[1] = + access_control_frame_pointer(th)[1] = *os_context_register_addr(context, reg_LRA); - current_control_frame_pointer += 8; + access_control_frame_pointer(th) += 8; /* Build our frame on top of it. */ oldcont = (lispobj)(*os_context_register_addr(context, reg_CFP)); } @@ -581,11 +644,11 @@ build_fake_control_stack_frames(struct thread *th,os_context_t *context) oldcont = (lispobj)(*os_context_register_addr(context, reg_CFP)); } - current_control_stack_pointer = current_control_frame_pointer + 8; + access_control_stack_pointer(th) = access_control_frame_pointer(th) + 8; - current_control_frame_pointer[0] = oldcont; - current_control_frame_pointer[1] = NIL; - current_control_frame_pointer[2] = + access_control_frame_pointer(th)[0] = oldcont; + access_control_frame_pointer(th)[1] = NIL; + access_control_frame_pointer(th)[2] = (lispobj)(*os_context_register_addr(context, reg_CODE)); #endif } @@ -603,8 +666,12 @@ fake_foreign_function_call(os_context_t *context) /* Get current Lisp state from context. */ #ifdef reg_ALLOC +#ifdef LISP_FEATURE_SB_THREAD + thread->pseudo_atomic_bits = +#else dynamic_space_free_pointer = (lispobj *)(unsigned long) +#endif (*os_context_register_addr(context, reg_ALLOC)); /* fprintf(stderr,"dynamic_space_free_pointer: %p\n", */ /* dynamic_space_free_pointer); */ @@ -621,9 +688,8 @@ fake_foreign_function_call(os_context_t *context) #endif #endif #ifdef reg_BSP - current_binding_stack_pointer = - (lispobj *)(unsigned long) - (*os_context_register_addr(context, reg_BSP)); + set_binding_stack_pointer(thread, + *os_context_register_addr(context, reg_BSP)); #endif build_fake_control_stack_frames(thread,context); @@ -642,8 +708,11 @@ fake_foreign_function_call(os_context_t *context) thread->interrupt_contexts[context_index] = context; -#ifdef FOREIGN_FUNCTION_CALL_FLAG - foreign_function_call_active = 1; +#if !defined(LISP_FEATURE_X86) && !defined(LISP_FEATURE_X86_64) + /* x86oid targets don't maintain the foreign function call flag at + * all, so leave them to believe that they are never in foreign + * code. */ + foreign_function_call_active_p(thread) = 1; #endif } @@ -657,14 +726,12 @@ undo_fake_foreign_function_call(os_context_t *context) /* Block all blockable signals. */ block_blockable_signals(0, 0); -#ifdef FOREIGN_FUNCTION_CALL_FLAG - foreign_function_call_active = 0; -#endif + foreign_function_call_active_p(thread) = 0; /* Undo dynamic binding of FREE_INTERRUPT_CONTEXT_INDEX */ unbind(thread); -#ifdef reg_ALLOC +#if defined(reg_ALLOC) && !defined(LISP_FEATURE_SB_THREAD) /* Put the dynamic space free pointer back into the context. */ *os_context_register_addr(context, reg_ALLOC) = (unsigned long) dynamic_space_free_pointer @@ -676,6 +743,17 @@ undo_fake_foreign_function_call(os_context_t *context) | ((unsigned long) dynamic_space_free_pointer & LOWTAG_MASK); */ #endif +#if defined(reg_ALLOC) && defined(LISP_FEATURE_SB_THREAD) + /* Put the pseudo-atomic bits and dynamic space free pointer back + * into the context (p-a-bits for p-a, and dynamic space free + * pointer for ROOM). */ + *os_context_register_addr(context, reg_ALLOC) = + (unsigned long) dynamic_space_free_pointer + | (thread->pseudo_atomic_bits & LOWTAG_MASK); + /* And clear them so we don't get bit later by call-in/call-out + * not updating them. */ + thread->pseudo_atomic_bits = 0; +#endif } /* a handler for the signal caused by execution of a trap opcode @@ -756,7 +834,7 @@ interrupt_handle_pending(os_context_t *context) struct interrupt_data *data = thread->interrupt_data; if (arch_pseudo_atomic_atomic(context)) { - lose("Handling pending interrupt in pseduo atomic."); + lose("Handling pending interrupt in pseudo atomic."); } FSHOW_SIGNAL((stderr, "/entering interrupt_handle_pending\n")); @@ -876,20 +954,22 @@ interrupt_handle_pending(os_context_t *context) sigcopyset(os_context_sigmask_addr(context), &data->pending_mask); run_deferred_handler(data, context); } +#endif +#ifdef LISP_FEATURE_GENCGC + if (get_pseudo_atomic_interrupted(thread)) + lose("pseudo_atomic_interrupted after interrupt_handle_pending\n"); +#endif /* It is possible that the end of this function was reached * without never actually doing anything, the tests in Lisp for * when to call receive-pending-interrupt are not exact. */ FSHOW_SIGNAL((stderr, "/exiting interrupt_handle_pending\n")); -#endif } void interrupt_handle_now(int signal, siginfo_t *info, os_context_t *context) { -#ifdef FOREIGN_FUNCTION_CALL_FLAG boolean were_in_lisp; -#endif union interrupt_handler handler; check_blockables_blocked_or_lose(0); @@ -905,10 +985,8 @@ interrupt_handle_now(int signal, siginfo_t *info, os_context_t *context) return; } -#ifdef FOREIGN_FUNCTION_CALL_FLAG - were_in_lisp = !foreign_function_call_active; + were_in_lisp = !foreign_function_call_active_p(arch_os_get_current_thread()); if (were_in_lisp) -#endif { fake_foreign_function_call(context); } @@ -965,9 +1043,7 @@ interrupt_handle_now(int signal, siginfo_t *info, os_context_t *context) (*handler.c)(signal, info, context); } -#ifdef FOREIGN_FUNCTION_CALL_FLAG if (were_in_lisp) -#endif { undo_fake_foreign_function_call(context); /* block signals again */ } @@ -1023,12 +1099,12 @@ maybe_defer_handler(void *handler, struct interrupt_data *data, */ if ((SymbolValue(INTERRUPTS_ENABLED,thread) == NIL) || in_leaving_without_gcing_race_p(thread)) { - store_signal_data_for_later(data,handler,signal,info,context); - SetSymbolValue(INTERRUPT_PENDING, T,thread); FSHOW_SIGNAL((stderr, "/maybe_defer_handler(%x,%d): deferred (RACE=%d)\n", (unsigned int)handler,signal, in_leaving_without_gcing_race_p(thread))); + store_signal_data_for_later(data,handler,signal,info,context); + SetSymbolValue(INTERRUPT_PENDING, T,thread); check_interrupt_context_or_lose(context); return 1; } @@ -1036,11 +1112,11 @@ maybe_defer_handler(void *handler, struct interrupt_data *data, * actually use its argument for anything on x86, so this branch * may succeed even when context is null (gencgc alloc()) */ if (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): deferred(PA)\n", (unsigned int)handler,signal)); + store_signal_data_for_later(data,handler,signal,info,context); + arch_set_pseudo_atomic_interrupted(context); check_interrupt_context_or_lose(context); return 1; } @@ -1083,10 +1159,9 @@ store_signal_data_for_later (struct interrupt_data *data, void *handler, static void maybe_now_maybe_later(int signal, siginfo_t *info, void *void_context) { - SAVE_ERRNO(context,void_context); + SAVE_ERRNO(signal,context,void_context); struct thread *thread = arch_os_get_current_thread(); struct interrupt_data *data = thread->interrupt_data; - if(!maybe_defer_handler(interrupt_handle_now,data,signal,info,context)) interrupt_handle_now(signal, info, context); RESTORE_ERRNO; @@ -1106,7 +1181,7 @@ low_level_interrupt_handle_now(int signal, siginfo_t *info, static void low_level_maybe_now_maybe_later(int signal, siginfo_t *info, void *void_context) { - SAVE_ERRNO(context,void_context); + SAVE_ERRNO(signal,context,void_context); struct thread *thread = arch_os_get_current_thread(); struct interrupt_data *data = thread->interrupt_data; @@ -1124,19 +1199,20 @@ void sig_stop_for_gc_handler(int signal, siginfo_t *info, os_context_t *context) { struct thread *thread=arch_os_get_current_thread(); + boolean was_in_lisp; /* 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); FSHOW_SIGNAL((stderr, "sig_stop_for_gc deferred (*GC-INHIBIT*)\n")); + SetSymbolValue(STOP_FOR_GC_PENDING,T,thread); return; } else if (arch_pseudo_atomic_atomic(context)) { + FSHOW_SIGNAL((stderr,"sig_stop_for_gc deferred (PA)\n")); SetSymbolValue(STOP_FOR_GC_PENDING,T,thread); arch_set_pseudo_atomic_interrupted(context); maybe_save_gc_mask_and_block_deferrables (os_context_sigmask_addr(context)); - FSHOW_SIGNAL((stderr,"sig_stop_for_gc deferred (PA)\n")); return; } @@ -1144,13 +1220,34 @@ sig_stop_for_gc_handler(int signal, siginfo_t *info, os_context_t *context) /* Not PA and GC not inhibited -- we can stop now. */ - /* need the context stored so it can have registers scavenged */ - fake_foreign_function_call(context); + was_in_lisp = !foreign_function_call_active_p(arch_os_get_current_thread()); + + if (was_in_lisp) { + /* need the context stored so it can have registers scavenged */ + fake_foreign_function_call(context); + } /* Not pending anymore. */ SetSymbolValue(GC_PENDING,NIL,thread); SetSymbolValue(STOP_FOR_GC_PENDING,NIL,thread); + /* Consider this: in a PA section GC is requested: GC_PENDING, + * pseudo_atomic_interrupted and gc_blocked_deferrables are set, + * deferrables are blocked then pseudo_atomic_atomic is cleared, + * but a SIG_STOP_FOR_GC arrives before trapping to + * interrupt_handle_pending. Here, GC_PENDING is cleared but + * pseudo_atomic_interrupted is not and we go on running with + * pseudo_atomic_interrupted but without a pending interrupt or + * GC. GC_BLOCKED_DEFERRABLES is also left at 1. So let's tidy it + * up. */ + if (thread->interrupt_data->gc_blocked_deferrables) { + FSHOW_SIGNAL((stderr,"cleaning up after gc_blocked_deferrables\n")); + clear_pseudo_atomic_interrupted(thread); + sigcopyset(os_context_sigmask_addr(context), + &thread->interrupt_data->pending_mask); + thread->interrupt_data->gc_blocked_deferrables = 0; + } + if(thread_state(thread)!=STATE_RUNNING) { lose("sig_stop_for_gc_handler: wrong thread state: %ld\n", fixnum_value(thread->state)); @@ -1159,6 +1256,12 @@ sig_stop_for_gc_handler(int signal, siginfo_t *info, os_context_t *context) set_thread_state(thread,STATE_SUSPENDED); FSHOW_SIGNAL((stderr,"suspended\n")); + /* While waiting for gc to finish occupy ourselves with zeroing + * the unused portion of the control stack to reduce conservatism. + * On hypothetic platforms with threads and exact gc it is + * actually a must. */ + scrub_control_stack(); + wait_for_thread_state_change(thread, STATE_SUSPENDED); FSHOW_SIGNAL((stderr,"resumed\n")); @@ -1167,7 +1270,9 @@ sig_stop_for_gc_handler(int signal, siginfo_t *info, os_context_t *context) fixnum_value(thread_state(thread))); } - undo_fake_foreign_function_call(context); + if (was_in_lisp) { + undo_fake_foreign_function_call(context); + } } #endif @@ -1175,14 +1280,14 @@ sig_stop_for_gc_handler(int signal, siginfo_t *info, os_context_t *context) void interrupt_handle_now_handler(int signal, siginfo_t *info, void *void_context) { - SAVE_ERRNO(context,void_context); + SAVE_ERRNO(signal,context,void_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); + corruption_warning_and_maybe_lose("Signal %d received", signal); #endif interrupt_handle_now(signal, info, context); RESTORE_ERRNO; @@ -1370,7 +1475,7 @@ arrange_return_to_lisp_function(os_context_t *context, lispobj function) *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; + (os_context_register_t)(unsigned long)access_control_frame_pointer(th); #endif #ifdef ARCH_HAS_NPC_REGISTER *os_context_npc_addr(context) = @@ -1396,23 +1501,55 @@ undefined_alien_function(void) funcall0(StaticSymbolFunction(UNDEFINED_ALIEN_FUNCTION_ERROR)); } +void lower_thread_control_stack_guard_page(struct thread *th) +{ + protect_control_stack_guard_page(0, th); + protect_control_stack_return_guard_page(1, th); + th->control_stack_guard_page_protected = NIL; + fprintf(stderr, "INFO: Control stack guard page unprotected\n"); +} + +void reset_thread_control_stack_guard_page(struct thread *th) +{ + memset(CONTROL_STACK_GUARD_PAGE(th), 0, os_vm_page_size); + protect_control_stack_guard_page(1, th); + protect_control_stack_return_guard_page(0, th); + th->control_stack_guard_page_protected = T; + fprintf(stderr, "INFO: Control stack guard page reprotected\n"); +} + +/* Called from the REPL, too. */ +void reset_control_stack_guard_page(void) +{ + struct thread *th=arch_os_get_current_thread(); + if (th->control_stack_guard_page_protected == NIL) { + reset_thread_control_stack_guard_page(th); + } +} + +void lower_control_stack_guard_page(void) +{ + lower_thread_control_stack_guard_page(arch_os_get_current_thread()); +} + 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, - * it won't go back to what it was doing ... */ - if(addr >= CONTROL_STACK_GUARD_PAGE(th) && - addr < CONTROL_STACK_GUARD_PAGE(th) + os_vm_page_size) { + if(addr >= CONTROL_STACK_HARD_GUARD_PAGE(th) && + addr < CONTROL_STACK_HARD_GUARD_PAGE(th) + os_vm_page_size) { + lose("Control stack exhausted"); + } + else 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. */ - corruption_warning_and_maybe_lose("Control stack exhausted"); - protect_control_stack_guard_page(0, NULL); - protect_control_stack_return_guard_page(1, NULL); - + if (th->control_stack_guard_page_protected == NIL) + lose("control_stack_guard_page_protected NIL"); + lower_control_stack_guard_page(); #ifdef LISP_FEATURE_C_STACK_IS_CONTROL_STACK /* For the unfortunate case, when the control stack is * exhausted in a signal handler. */ @@ -1428,16 +1565,20 @@ handle_guard_page_triggered(os_context_t *context,os_vm_address_t 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. */ - fprintf(stderr, "INFO: Control stack guard page reprotected\n"); - protect_control_stack_guard_page(1, NULL); - protect_control_stack_return_guard_page(0, NULL); + if (th->control_stack_guard_page_protected != NIL) + lose("control_stack_guard_page_protected not NIL"); + reset_control_stack_guard_page(); return 1; } + else if(addr >= BINDING_STACK_HARD_GUARD_PAGE(th) && + addr < BINDING_STACK_HARD_GUARD_PAGE(th) + os_vm_page_size) { + lose("Binding stack exhausted"); + } else if(addr >= BINDING_STACK_GUARD_PAGE(th) && addr < BINDING_STACK_GUARD_PAGE(th) + os_vm_page_size) { - corruption_warning_and_maybe_lose("Binding stack exhausted"); protect_binding_stack_guard_page(0, NULL); protect_binding_stack_return_guard_page(1, NULL); + fprintf(stderr, "INFO: Binding stack guard page unprotected\n"); /* For the unfortunate case, when the binding stack is * exhausted in a signal handler. */ @@ -1448,16 +1589,20 @@ handle_guard_page_triggered(os_context_t *context,os_vm_address_t addr) } else if(addr >= BINDING_STACK_RETURN_GUARD_PAGE(th) && addr < BINDING_STACK_RETURN_GUARD_PAGE(th) + os_vm_page_size) { - fprintf(stderr, "INFO: Binding stack guard page reprotected\n"); protect_binding_stack_guard_page(1, NULL); protect_binding_stack_return_guard_page(0, NULL); + fprintf(stderr, "INFO: Binding stack guard page reprotected\n"); return 1; } + else if(addr >= ALIEN_STACK_HARD_GUARD_PAGE(th) && + addr < ALIEN_STACK_HARD_GUARD_PAGE(th) + os_vm_page_size) { + lose("Alien stack exhausted"); + } else if(addr >= ALIEN_STACK_GUARD_PAGE(th) && addr < ALIEN_STACK_GUARD_PAGE(th) + os_vm_page_size) { - corruption_warning_and_maybe_lose("Alien stack exhausted"); protect_alien_stack_guard_page(0, NULL); protect_alien_stack_return_guard_page(1, NULL); + fprintf(stderr, "INFO: Alien stack guard page unprotected\n"); /* For the unfortunate case, when the alien stack is * exhausted in a signal handler. */ @@ -1468,15 +1613,15 @@ handle_guard_page_triggered(os_context_t *context,os_vm_address_t addr) } else if(addr >= ALIEN_STACK_RETURN_GUARD_PAGE(th) && addr < ALIEN_STACK_RETURN_GUARD_PAGE(th) + os_vm_page_size) { - fprintf(stderr, "INFO: Alien stack guard page reprotected\n"); protect_alien_stack_guard_page(1, NULL); protect_alien_stack_return_guard_page(0, NULL); + fprintf(stderr, "INFO: Alien stack guard page reprotected\n"); return 1; } else if (addr >= undefined_alien_address && addr < undefined_alien_address + os_vm_page_size) { arrange_return_to_lisp_function - (context, StaticSymbolFunction(UNDEFINED_ALIEN_VARIABLE_ERROR)); + (context, StaticSymbolFunction(UNDEFINED_ALIEN_VARIABLE_ERROR)); return 1; } else return 0; @@ -1554,7 +1699,7 @@ see_if_sigaction_nodefer_works(void) static void unblock_me_trampoline(int signal, siginfo_t *info, void *void_context) { - SAVE_ERRNO(context,void_context); + SAVE_ERRNO(signal,context,void_context); sigset_t unblock; sigemptyset(&unblock); @@ -1567,7 +1712,7 @@ unblock_me_trampoline(int signal, siginfo_t *info, void *void_context) static void low_level_unblock_me_trampoline(int signal, siginfo_t *info, void *void_context) { - SAVE_ERRNO(context,void_context); + SAVE_ERRNO(signal,context,void_context); sigset_t unblock; sigemptyset(&unblock); @@ -1580,7 +1725,7 @@ low_level_unblock_me_trampoline(int signal, siginfo_t *info, void *void_context) static void low_level_handle_now_handler(int signal, siginfo_t *info, void *void_context) { - SAVE_ERRNO(context,void_context); + SAVE_ERRNO(signal,context,void_context); (*interrupt_low_level_handlers[signal])(signal, info, context); RESTORE_ERRNO; }