X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fruntime%2Flinux-os.c;h=669ae7cbf589df60d20f0cc0ac2534e598e0e418;hb=10adbe19b88bf9d4fe65ad67f6de0fd065af87ff;hp=376b08594e3588534ab51b4901fc45fa79778ae6;hpb=dfa55a883f94470267b626dae77ce7e7dfac3df6;p=sbcl.git diff --git a/src/runtime/linux-os.c b/src/runtime/linux-os.c index 376b085..669ae7c 100644 --- a/src/runtime/linux-os.c +++ b/src/runtime/linux-os.c @@ -23,6 +23,7 @@ #include #include #include +#include "sbcl.h" #include "./signal.h" #include "os.h" #include "arch.h" @@ -30,7 +31,9 @@ #include "interrupt.h" #include "interr.h" #include "lispregs.h" -#include "sbcl.h" +#include "runtime.h" +#include "genesis/static-symbols.h" +#include "genesis/fdefn.h" #include #include @@ -40,130 +43,108 @@ #include #include #include +#include #include "validate.h" +#include "thread.h" size_t os_vm_page_size; -#if defined GENCGC -#include "gencgc.h" +#ifdef LISP_FEATURE_SB_THREAD +#include +#include + +/* values taken from the kernel's linux/futex.h. This header file + doesn't exist in userspace, which is our excuse for not grovelling + them automatically */ +#define FUTEX_WAIT (0) +#define FUTEX_WAKE (1) +#define FUTEX_FD (2) +#define FUTEX_REQUEUE (3) + +#define __NR_sys_futex __NR_futex + +_syscall4(int,sys_futex, + int *, futex, + int, op, + int, val, + struct timespec *, rel); #endif + +#include "gc.h" +int linux_sparc_siginfo_bug = 0; +int linux_no_threads_p = 0; + void os_init(void) { - /* Early versions of Linux don't support the mmap(..) functionality - * that we need. */ - { - struct utsname name; - int major_version; - uname(&name); - major_version = atoi(name.release); - if (major_version < 2) { - lose("linux major version=%d (can't run in version < 2.0.0)", - major_version); - } + /* Conduct various version checks: do we have enough mmap(), is + * this a sparc running 2.2, can we do threads? */ + int *futex=0; + struct utsname name; + int major_version; + int minor_version; + char *p; + uname(&name); + p=name.release; + major_version = atoi(p); + p=strchr(p,'.')+1; + minor_version = atoi(p); + if (major_version<2) { + lose("linux kernel version too old: major version=%d (can't run in version < 2.0.0)", + major_version); } - - os_vm_page_size = getpagesize(); - /* this could just as well be in arch_init, but it's not */ -#ifdef i386 - SET_FPU_CONTROL_WORD(0x1372|4|8|16|32); /* no interrupts */ + if (!(major_version>2 || minor_version >= 4)) { +#ifdef LISP_FEATURE_SPARC + FSHOW((stderr,"linux kernel %d.%d predates 2.4;\n enabling workarounds for SPARC kernel bugs in signal handling.\n", major_version,minor_version)); + linux_sparc_siginfo_bug = 1; #endif + } +#ifdef LISP_FEATURE_SB_THREAD + futex_wait(futex,-1); + if(errno==ENOSYS) linux_no_threads_p = 1; + if(linux_no_threads_p) + fprintf(stderr,"Linux with NPTL support (e.g. kernel 2.6 or newer) required for \nthread-enabled SBCL. Disabling thread support.\n\n"); +#endif + os_vm_page_size = getpagesize(); } -/* various os_context_*_addr accessors moved to {x86,alpha}-linux-os.c - * -dan 20010125 - */ -/* In Debian CMU CL ca. 2.4.9, it was possible to get an infinite - * cascade of errors from do_mmap(..). This variable is a counter to - * prevent that; when it counts down to zero, an error in do_mmap - * causes the low-level monitor to be called. */ -int n_do_mmap_ignorable_errors = 3; +#ifdef LISP_FEATURE_ALPHA +/* The Alpha is a 64 bit CPU. SBCL is a 32 bit application. Due to all + * the places that assume we can get a pointer into a fixnum with no + * information loss, we have to make sure it allocates all its ram in the + * 0-2Gb region. */ -/* Return 0 for success. */ -static int -do_mmap(os_vm_address_t *addr, os_vm_size_t len, int flags) -{ - /* We *must* have the memory where we want it. */ - os_vm_address_t old_addr=*addr; - - *addr = mmap(*addr, len, OS_VM_PROT_ALL, flags, -1, 0); - if (*addr == MAP_FAILED || - ((old_addr != NULL) && (*addr != old_addr))) { - FSHOW((stderr, - "error in allocating memory from the OS\n" - "(addr=%lx, len=%lx, flags=%lx)\n", - (long) addr, - (long) len, - (long) flags)); - if (n_do_mmap_ignorable_errors > 0) { - --n_do_mmap_ignorable_errors; - } else { - lose("too many errors in allocating memory from the OS"); - } - perror("mmap"); - return 1; - } - return 0; -} +static void * under_2gb_free_pointer=DYNAMIC_1_SPACE_END; +#endif os_vm_address_t os_validate(os_vm_address_t addr, os_vm_size_t len) { - if (addr) { - int flags = MAP_PRIVATE | MAP_ANONYMOUS | MAP_FIXED; - os_vm_address_t base_addr = addr; - do { - /* KLUDGE: It looks as though this code allocates memory - * in chunks of size no larger than 'magic', but why? What - * is the significance of 0x1000000 here? Also, can it be - * right that if the first few 'do_mmap' calls succeed, - * then one fails, we leave the memory allocated by the - * first few in place even while we return a code for - * complete failure? -- WHN 19991020 - * - * Peter Van Eynde writes (20000211) - * This was done because the kernel would only check for - * overcommit for every allocation seperately. So if you - * had 16MB of free mem+swap you could allocate 16M. And - * again, and again, etc. - * This in [Linux] 2.X could be bad as they changed the memory - * system. A side effect was/is (I don't really know) that - * programs with a lot of memory mappings run slower. But - * of course for 2.2.2X we now have the NO_RESERVE flag that - * helps... - * - * FIXME: The logic is also flaky w.r.t. failed - * allocations. If we make one or more successful calls to - * do_mmap(..) before one fails, then we've allocated - * memory, and we should ensure that it gets deallocated - * sometime somehow. If this function's response to any - * failed do_mmap(..) is to give up and return NULL (as in - * sbcl-0.6.7), then any failed do_mmap(..) after any - * successful do_mmap(..) causes a memory leak. */ - int magic = 0x1000000; - if (len <= magic) { - if (do_mmap(&addr, len, flags)) { - return NULL; - } - len = 0; - } else { - if (do_mmap(&addr, magic, flags)) { - return NULL; - } - addr += magic; - len = len - magic; - } - } while (len > 0); - return base_addr; - } else { - int flags = MAP_PRIVATE | MAP_ANONYMOUS; - if (do_mmap(&addr, len, flags)) { - return NULL; - } else { - return addr; - } + int flags = MAP_PRIVATE | MAP_ANONYMOUS | MAP_NORESERVE; + os_vm_address_t actual ; + + if (addr) + flags |= MAP_FIXED; +#ifdef LISP_FEATURE_ALPHA + else { + flags |= MAP_FIXED; + addr=under_2gb_free_pointer; + } +#endif + actual = mmap(addr, len, OS_VM_PROT_ALL, flags, -1, 0); + if (actual == MAP_FAILED || (addr && (addr!=actual))) { + perror("mmap"); + return 0; /* caller should check this */ } + +#ifdef LISP_FEATURE_ALPHA + + len=(len+(os_vm_page_size-1))&(~(os_vm_page_size-1)); + under_2gb_free_pointer+=len; +#endif + + return actual; } void @@ -182,7 +163,7 @@ os_map(int fd, int offset, os_vm_address_t addr, os_vm_size_t len) MAP_PRIVATE | MAP_FILE | MAP_FIXED, fd, (off_t) offset); - if(addr == MAP_FAILED) { + if (addr == MAP_FAILED) { perror("mmap"); lose("unexpected mmap(..) failure"); } @@ -213,19 +194,26 @@ in_range_p(os_vm_address_t a, lispobj sbeg, size_t slen) boolean is_valid_lisp_addr(os_vm_address_t addr) { - return - in_range_p(addr, READ_ONLY_SPACE_START, READ_ONLY_SPACE_SIZE) || - in_range_p(addr, STATIC_SPACE_START , STATIC_SPACE_SIZE) || - in_range_p(addr, DYNAMIC_SPACE_START , DYNAMIC_SPACE_SIZE) || - in_range_p(addr, CONTROL_STACK_START , CONTROL_STACK_SIZE) || - in_range_p(addr, BINDING_STACK_START , BINDING_STACK_SIZE); + struct thread *th; + if(in_range_p(addr, READ_ONLY_SPACE_START, READ_ONLY_SPACE_SIZE) || + in_range_p(addr, STATIC_SPACE_START , STATIC_SPACE_SIZE) || + in_range_p(addr, DYNAMIC_SPACE_START , DYNAMIC_SPACE_SIZE)) + return 1; + for_each_thread(th) { + if((th->control_stack_start <= addr) && (addr < th->control_stack_end)) + return 1; + if(in_range_p(addr, th->binding_stack_start, BINDING_STACK_SIZE)) + return 1; + } + return 0; } /* * any OS-dependent special low-level handling for signals */ -#if defined GENCGC + +#if defined LISP_FEATURE_GENCGC /* * The GENCGC needs to be hooked into whatever signal is raised for @@ -234,11 +222,15 @@ is_valid_lisp_addr(os_vm_address_t addr) void sigsegv_handler(int signal, siginfo_t *info, void* void_context) { - os_context_t *context = (os_context_t*)void_context; - void* fault_addr = (void*)context->uc_mcontext.cr2; - if (!gencgc_handle_wp_violation(fault_addr)) { - interrupt_handle_now(signal, info, void_context); - } + os_context_t *context = arch_os_get_context(&void_context); + void* fault_addr = (void*)info->si_addr; + if (!gencgc_handle_wp_violation(fault_addr)) + if(!handle_guard_page_triggered(context,fault_addr)) +#ifdef LISP_FEATURE_C_STACK_IS_CONTROL_STACK + arrange_return_to_lisp_function(context, SymbolFunction(MEMORY_FAULT_ERROR)); +#else + interrupt_handle_now(signal, info, context); +#endif } #else @@ -246,49 +238,64 @@ sigsegv_handler(int signal, siginfo_t *info, void* void_context) static void sigsegv_handler(int signal, siginfo_t *info, void* void_context) { - os_context_t *context = (os_context_t*)void_context; + os_context_t *context = arch_os_get_context(&void_context); os_vm_address_t addr; -#ifdef i386 - interrupt_handle_now(signal,contextstruct); -#else -#define CONTROL_STACK_TOP (((char*)CONTROL_STACK_START)+CONTROL_STACK_SIZE) - addr = arch_get_bad_addr(signal,info,context); - - if(addr != NULL && - *os_context_register_addr(context,reg_ALLOC) & (1L<<63)){ - /* This is the end of a pseudo-atomic section during which - * a signal was received. We must deal with the pending interrupt - * (see also interrupt.c, ../code/interrupt.lisp) + if (addr != NULL && + *os_context_register_addr(context,reg_ALLOC) & (1L<<63)){ + + /* Alpha stuff: This is the end of a pseudo-atomic section + * during which a signal was received. We must deal with the + * pending interrupt (see also interrupt.c, + * ../code/interrupt.lisp) */ - /* (how we got here: when interrupting, we set bit 63 in * reg_Alloc. At the end of the atomic section we tried to - * write to reg_Alloc, got a SIGSEGV (there's nothing mapped + * write to reg_ALLOC, got a SIGSEGV (there's nothing mapped * there) so ended up here */ *os_context_register_addr(context,reg_ALLOC) -= (1L<<63); interrupt_handle_pending(context); - } else if (addr > CONTROL_STACK_TOP && addr < BINDING_STACK_START) { - fprintf(stderr, "Possible stack overflow at 0x%016lX: CONTROL_STACK_TOP=%lx, BINDING_STACK_START=%lx\n",addr, CONTROL_STACK_TOP,BINDING_STACK_START); - /* try to fix control frame pointer */ - while ( ! (CONTROL_STACK_START <= *current_control_frame_pointer && - *current_control_frame_pointer <= CONTROL_STACK_TOP)) - ((char*)current_control_frame_pointer) -= sizeof(lispobj); - ldb_monitor(); - } else if (!interrupt_maybe_gc(signal, info, context)) { - interrupt_handle_now(signal, info, context); + } else { + if(!interrupt_maybe_gc(signal, info, context)) + if(!handle_guard_page_triggered(context,addr)) + interrupt_handle_now(signal, info, context); } -#endif } #endif - +void sigcont_handler(int signal, siginfo_t *info, void *void_context) +{ + /* We need to have a handler installed for this signal so that + * sigwaitinfo() for it actually returns at the appropriate time. + * We don't need it to actually do anything. This mkes it + * possibly the only signal handler in SBCL that doesn't depend on + * not-guaranteed-by-POSIX features + */ +} void os_install_interrupt_handlers(void) { - interrupt_install_low_level_handler(SIGSEGV, sigsegv_handler); + undoably_install_low_level_interrupt_handler(SIG_MEMORY_FAULT, + sigsegv_handler); +#ifdef LISP_FEATURE_SB_THREAD + undoably_install_low_level_interrupt_handler(SIG_INTERRUPT_THREAD, + interrupt_thread_handler); + undoably_install_low_level_interrupt_handler(SIG_STOP_FOR_GC, + sig_stop_for_gc_handler); + undoably_install_low_level_interrupt_handler(SIG_THREAD_EXIT, + thread_exit_handler); +#endif } +#ifdef LISP_FEATURE_SB_THREAD +int futex_wait(int *lock_word, int oldval) { + int t= sys_futex(lock_word,FUTEX_WAIT,oldval, 0); + return t; +} +int futex_wake(int *lock_word, int n){ + return sys_futex(lock_word,FUTEX_WAKE,n,0); +} +#endif