X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fruntime%2Flinux-os.c;h=778f72cb2bc348eaf0bc74b1321d4c1f07f2223e;hb=b27fb452f72190637b03a6ef2e1333091da42a98;hp=2029247f35a28020a0500a696e2b3069869fd6ef;hpb=fe240ce504041bfb181a81cb11b7b4bba112f65f;p=sbcl.git diff --git a/src/runtime/linux-os.c b/src/runtime/linux-os.c index 2029247..778f72c 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 @@ -44,59 +47,174 @@ #include "validate.h" #include "thread.h" +#include "gc.h" +#if defined LISP_FEATURE_GENCGC +#include "gencgc-internal.h" +#endif + +#ifdef LISP_FEATURE_X86 +/* Prototype for personality(2). Done inline here since the header file + * for this isn't available on old versions of glibc. */ +int personality (unsigned long); +#endif + size_t os_vm_page_size; -#include "gc.h" +#ifdef LISP_FEATURE_SB_THREAD +#include +#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 sys_futex sbcl_sys_futex +static inline int sys_futex (void *futex, int op, int val, struct timespec *rel) +{ + return syscall (SYS_futex, futex, op, val, rel); +} + +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 + int linux_sparc_siginfo_bug = 0; +int linux_no_threads_p = 0; + +#ifdef LISP_FEATURE_SB_THREAD +int +isnptl (void) +{ + size_t n = confstr (_CS_GNU_LIBPTHREAD_VERSION, NULL, 0); + if (n > 0) { + char *buf = alloca (n); + confstr (_CS_GNU_LIBPTHREAD_VERSION, buf, n); + if (strstr (buf, "NPTL")) { + return 1; + } + } + return 0; +} +#endif -void os_init(void) +void +os_init(char *argv[], char *envp[]) { /* Conduct various version checks: do we have enough mmap(), is * this a sparc running 2.2, can we do threads? */ - { - 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); - } #ifdef LISP_FEATURE_SB_THREAD - if ((major_version <2) || (major_version==2 && minor_version < 4)) { - lose("linux kernel 2.4 required for thread-enabled SBCL"); - } + int *futex=0; #endif + struct utsname name; + int major_version; + int minor_version; + int patch_version; + char *p; + uname(&name); + p=name.release; + major_version = atoi(p); + p=strchr(p,'.')+1; + minor_version = atoi(p); + p=strchr(p,'.')+1; + patch_version = atoi(p); + if (major_version<2) { + lose("linux kernel version too old: major version=%d (can't run in version < 2.0.0)\n", + major_version); + } + if (!(major_version>2 || minor_version >= 4)) { #ifdef LISP_FEATURE_SPARC - if ((major_version <2) || (major_version==2 && minor_version < 4)) { - FSHOW((stderr,"linux kernel %d.%d predates 2.4;\n enabling workarounds for SPARC kernel bugs in signal handling.\n", minor_version)); - linux_sparc_siginfo_bug = 1; - } + 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) { + lose("This version of SBCL is compiled with threading support, but your kernel\n" + "is too old to support this. Please use a more recent kernel or\n" + "a version of SBCL without threading support.\n"); + } + if(! isnptl()) { + lose("This version of SBCL only works correctly with the NPTL threading\n" + "library. Please use a newer glibc, use an older SBCL, or stop using\n" + "LD_ASSUME_KERNEL\n"); + } +#endif os_vm_page_size = getpagesize(); - /* This could just as well be in arch_init(), but it's not. */ -#ifdef __i386__ - /* FIXME: This used to be here. However, I have just removed it - with no apparent ill effects (it may be that earlier kernels - started up a process with a different set of traps, or - something?) Find out what this was meant to do, and reenable it - or delete it if possible. -- CSR, 2002-07-15 */ - /* SET_FPU_CONTROL_WORD(0x1372|4|8|16|32); no interrupts */ + + /* KLUDGE: Disable memory randomization on new Linux kernels + * by setting a personality flag and re-executing. (We need + * to re-execute, since the memory maps that can conflict with + * the SBCL spaces have already been done at this point). + * + * Since randomization is currently implemented only on x86 kernels, + * don't do this trick on other platforms. + */ +#ifdef LISP_FEATURE_X86 + if ((major_version == 2 + /* Some old kernels will apparently lose unsupported personality flags + * on exec() */ + && ((minor_version == 6 && patch_version >= 11) + || (minor_version > 6))) + || major_version >= 3) + { + int pers = personality(0xffffffffUL); + /* 0x40000 aka. ADDR_NO_RANDOMIZE */ + if (!(pers & 0x40000)) { + int retval = personality(pers | 0x40000); + /* Allegedly some Linux kernels (the reported case was + * "hardened Linux 2.6.7") won't set the new personality, + * but nor will they return -1 for an error. So as a + * workaround query the new personality... + */ + int newpers = personality(0xffffffffUL); + /* ... and don't re-execute if either the setting resulted + * in an error or if the value didn't change. Otherwise + * this might result in an infinite loop. + */ + if (retval != -1 && newpers != pers) { + /* Use /proc/self/exe instead of trying to figure out + * the executable path from PATH and argv[0], since + * that's unreliable. We follow the symlink instead of + * executing the file directly in order to prevent top + * from displaying the name of the process as "exe". */ + char runtime[PATH_MAX+1]; + int i = readlink("/proc/self/exe", runtime, PATH_MAX); + if (i != -1) { + runtime[i] = '\0'; + execve(runtime, argv, envp); + } + } + /* Either changing the personality or execve() failed. Either + * way we might as well continue, and hope that the random + * memory maps are ok this time around. + */ + fprintf(stderr, "WARNING: Couldn't re-execute SBCL with the proper personality flags (maybe /proc isn't mounted?). Trying to continue anyway.\n"); + } + } #endif } #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 + * 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. */ @@ -107,20 +225,23 @@ os_vm_address_t os_validate(os_vm_address_t addr, os_vm_size_t len) { int flags = MAP_PRIVATE | MAP_ANONYMOUS | MAP_NORESERVE; - os_vm_address_t actual ; + os_vm_address_t actual; - if (addr) - flags |= MAP_FIXED; #ifdef LISP_FEATURE_ALPHA - else { - flags |= MAP_FIXED; - addr=under_2gb_free_pointer; + if (!addr) { + addr=under_2gb_free_pointer; } -#endif +#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 */ + if (actual == MAP_FAILED) { + perror("mmap"); + return 0; /* caller should check this */ + } + + if (addr && (addr!=actual)) { + fprintf(stderr, "mmap: wanted %lu bytes at %p, actually mapped at %p\n", + (unsigned long) len, addr, actual); + return 0; } #ifdef LISP_FEATURE_ALPHA @@ -136,59 +257,56 @@ void os_invalidate(os_vm_address_t addr, os_vm_size_t len) { if (munmap(addr,len) == -1) { - perror("munmap"); + perror("munmap"); } } os_vm_address_t os_map(int fd, int offset, os_vm_address_t addr, os_vm_size_t len) { - addr = mmap(addr, len, - OS_VM_PROT_ALL, - MAP_PRIVATE | MAP_FILE | MAP_FIXED, - fd, (off_t) offset); - - if (addr == MAP_FAILED) { - perror("mmap"); - lose("unexpected mmap(..) failure"); + os_vm_address_t actual; + + actual = mmap(addr, len, OS_VM_PROT_ALL, MAP_PRIVATE | MAP_FIXED, + fd, (off_t) offset); + if (actual == MAP_FAILED || (addr && (addr != actual))) { + perror("mmap"); + lose("unexpected mmap(..) failure\n"); } - return addr; + return actual; } void os_protect(os_vm_address_t address, os_vm_size_t length, os_vm_prot_t prot) { if (mprotect(address, length, prot) == -1) { - perror("mprotect"); + perror("mprotect"); } } -/* FIXME: Now that FOO_END, rather than FOO_SIZE, is the fundamental - * description of a space, we could probably punt this and just do - * (FOO_START <= x && x < FOO_END) everywhere it's called. */ -static boolean -in_range_p(os_vm_address_t a, lispobj sbeg, size_t slen) -{ - char* beg = (char*)((long)sbeg); - char* end = (char*)((long)sbeg) + slen; - char* adr = (char*)a; - return (adr >= beg && adr < end); -} - boolean is_valid_lisp_addr(os_vm_address_t addr) { 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; + size_t ad = (size_t) addr; + + if ((READ_ONLY_SPACE_START <= ad && ad < READ_ONLY_SPACE_END) + || (STATIC_SPACE_START <= ad && ad < STATIC_SPACE_END) +#if defined LISP_FEATURE_GENCGC + || (DYNAMIC_SPACE_START <= ad && ad < DYNAMIC_SPACE_END) +#else + || (DYNAMIC_0_SPACE_START <= ad && ad < DYNAMIC_0_SPACE_END) + || (DYNAMIC_1_SPACE_START <= ad && ad < DYNAMIC_1_SPACE_END) +#endif + ) + 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; + if((size_t)(th->control_stack_start) <= ad + && ad < (size_t)(th->control_stack_end)) + return 1; + if((size_t)(th->binding_stack_start) <= ad + && ad < (size_t)(th->binding_stack_start + BINDING_STACK_SIZE)) + return 1; } return 0; } @@ -197,68 +315,54 @@ is_valid_lisp_addr(os_vm_address_t addr) * any OS-dependent special low-level handling for signals */ - -#if defined LISP_FEATURE_GENCGC - /* - * The GENCGC needs to be hooked into whatever signal is raised for + * The GC needs to be hooked into whatever signal is raised for * page fault on this OS. */ -void +static void sigsegv_handler(int signal, siginfo_t *info, void* void_context) { os_context_t *context = arch_os_get_context(&void_context); - void* fault_addr = (void*)context->uc_mcontext.cr2; - if (!gencgc_handle_wp_violation(fault_addr)) - if(!handle_control_stack_guard_triggered(context,fault_addr)) - interrupt_handle_now(signal, info, void_context); -} + os_vm_address_t addr = arch_get_bad_addr(signal, info, context); -#else +#ifdef LISP_FEATURE_ALPHA + /* 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) -static void -sigsegv_handler(int signal, siginfo_t *info, void* void_context) -{ - os_context_t *context = arch_os_get_context(&void_context); - os_vm_address_t addr; - - addr = arch_get_bad_addr(signal,info,context); - 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 - * there) so ended up here - */ - *os_context_register_addr(context,reg_ALLOC) -= (1L<<63); - interrupt_handle_pending(context); - } else { - if(!interrupt_maybe_gc(signal, info, context)) - if(!handle_control_stack_guard_triggered(context,addr)) - interrupt_handle_now(signal, info, context); + (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 there) so ended up here. */ + if (addr != NULL && + *os_context_register_addr(context, reg_ALLOC) & (1L<<63)) { + *os_context_register_addr(context, reg_ALLOC) -= (1L<<63); + interrupt_handle_pending(context); + return; } -} #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 - */ +#ifdef LISP_FEATURE_GENCGC + if (!gencgc_handle_wp_violation(addr)) +#else + if (!interrupt_maybe_gc(signal, info, context)) +#endif + if (!handle_guard_page_triggered(context, 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 } void os_install_interrupt_handlers(void) { undoably_install_low_level_interrupt_handler(SIG_MEMORY_FAULT, - sigsegv_handler); - undoably_install_low_level_interrupt_handler(SIGCONT, - sigcont_handler); + 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); +#endif } -