Index: libcfa/src/concurrency/kernel/startup.cfa =================================================================== --- libcfa/src/concurrency/kernel/startup.cfa (revision 8110bc3a1ba874ee9362cfeb80aca91d34d22b54) +++ libcfa/src/concurrency/kernel/startup.cfa (revision 0ee224bf09a126d4b0b86ad17563bce6571dd169) @@ -29,5 +29,4 @@ #include // mprotect #include // getrlimit - #include // __NR_xxx } @@ -102,23 +101,4 @@ extern void __wake_proc(processor *); -#if defined(CFA_HAVE_LINUX_LIBRSEQ) - // No forward declaration needed - #define __kernel_rseq_register rseq_register_current_thread - #define __kernel_rseq_unregister rseq_unregister_current_thread -#elif defined(CFA_HAVE_LINUX_RSEQ_H) - void __kernel_raw_rseq_register (void); - void __kernel_raw_rseq_unregister(void); - - #define __kernel_rseq_register __kernel_raw_rseq_register - #define __kernel_rseq_unregister __kernel_raw_rseq_unregister -#else - // No forward declaration needed - // No initialization needed - static inline void noop(void) {} - - #define __kernel_rseq_register noop - #define __kernel_rseq_unregister noop -#endif - //----------------------------------------------------------------------------- // Kernel storage @@ -256,6 +236,4 @@ register_tls( mainProcessor ); - __kernel_rseq_register(); - //initialize the global state variables __cfaabi_tls.this_processor = mainProcessor; @@ -323,6 +301,4 @@ mainProcessor->local_data = 0p; - __kernel_rseq_unregister(); - unregister_tls( mainProcessor ); @@ -376,6 +352,4 @@ register_tls( proc ); - __kernel_rseq_register(); - // SKULLDUGGERY: We want to create a context for the processor coroutine // which is needed for the 2-step context switch. However, there is no reason @@ -416,6 +390,4 @@ proc->local_data = 0p; - - __kernel_rseq_unregister(); unregister_tls( proc ); @@ -833,58 +805,2 @@ } #endif - -#if defined(CFA_HAVE_LINUX_LIBRSEQ) - // No definition needed -#elif defined(CFA_HAVE_LINUX_RSEQ_H) - - #if defined( __x86_64 ) || defined( __i386 ) - #define RSEQ_SIG 0x53053053 - #elif defined( __ARM_ARCH ) - #ifdef __ARMEB__ - #define RSEQ_SIG 0xf3def5e7 /* udf #24035 ; 0x5de3 (ARMv6+) */ - #else - #define RSEQ_SIG 0xe7f5def3 /* udf #24035 ; 0x5de3 */ - #endif - #endif - - extern void __disable_interrupts_hard(); - extern void __enable_interrupts_hard(); - - void __kernel_raw_rseq_register (void) { - /* paranoid */ verify( __cfaabi_rseq.cpu_id == RSEQ_CPU_ID_UNINITIALIZED ); - - // int ret = syscall(__NR_rseq, &__cfaabi_rseq, sizeof(struct rseq), 0, (sigset_t *)0p, _NSIG / 8); - int ret = syscall(__NR_rseq, &__cfaabi_rseq, sizeof(struct rseq), 0, RSEQ_SIG); - if(ret != 0) { - int e = errno; - switch(e) { - case EINVAL: abort("KERNEL ERROR: rseq register invalid argument"); - case ENOSYS: abort("KERNEL ERROR: rseq register no supported"); - case EFAULT: abort("KERNEL ERROR: rseq register with invalid argument"); - case EBUSY : abort("KERNEL ERROR: rseq register already registered"); - case EPERM : abort("KERNEL ERROR: rseq register sig argument on unregistration does not match the signature received on registration"); - default: abort("KERNEL ERROR: rseq register unexpected return %d", e); - } - } - } - - void __kernel_raw_rseq_unregister(void) { - /* paranoid */ verify( __cfaabi_rseq.cpu_id >= 0 ); - - // int ret = syscall(__NR_rseq, &__cfaabi_rseq, sizeof(struct rseq), RSEQ_FLAG_UNREGISTER, (sigset_t *)0p, _NSIG / 8); - int ret = syscall(__NR_rseq, &__cfaabi_rseq, sizeof(struct rseq), RSEQ_FLAG_UNREGISTER, RSEQ_SIG); - if(ret != 0) { - int e = errno; - switch(e) { - case EINVAL: abort("KERNEL ERROR: rseq unregister invalid argument"); - case ENOSYS: abort("KERNEL ERROR: rseq unregister no supported"); - case EFAULT: abort("KERNEL ERROR: rseq unregister with invalid argument"); - case EBUSY : abort("KERNEL ERROR: rseq unregister already registered"); - case EPERM : abort("KERNEL ERROR: rseq unregister sig argument on unregistration does not match the signature received on registration"); - default: abort("KERNEL ERROR: rseq unregisteunexpected return %d", e); - } - } - } -#else - // No definition needed -#endif Index: libcfa/src/concurrency/ready_queue.cfa =================================================================== --- libcfa/src/concurrency/ready_queue.cfa (revision 8110bc3a1ba874ee9362cfeb80aca91d34d22b54) +++ libcfa/src/concurrency/ready_queue.cfa (revision 0ee224bf09a126d4b0b86ad17563bce6571dd169) @@ -30,5 +30,10 @@ #include "math.hfa" +#include #include + +extern "C" { + #include // __NR_xxx +} #include "ready_subqueue.hfa" @@ -89,4 +94,23 @@ } +#if defined(CFA_HAVE_LINUX_LIBRSEQ) + // No forward declaration needed + #define __kernel_rseq_register rseq_register_current_thread + #define __kernel_rseq_unregister rseq_unregister_current_thread +#elif defined(CFA_HAVE_LINUX_RSEQ_H) + void __kernel_raw_rseq_register (void); + void __kernel_raw_rseq_unregister(void); + + #define __kernel_rseq_register __kernel_raw_rseq_register + #define __kernel_rseq_unregister __kernel_raw_rseq_unregister +#else + // No forward declaration needed + // No initialization needed + static inline void noop(void) {} + + #define __kernel_rseq_register noop + #define __kernel_rseq_unregister noop +#endif + //======================================================================= // Cluster wide reader-writer lock @@ -111,4 +135,6 @@ // Lock-Free registering/unregistering of threads unsigned register_proc_id( void ) with(*__scheduler_lock) { + __kernel_rseq_register(); + __cfadbg_print_safe(ready_queue, "Kernel : Registering proc %p for RW-Lock\n", proc); bool * handle = (bool *)&kernelTLS().sched_lock; @@ -165,4 +191,6 @@ __cfadbg_print_safe(ready_queue, "Kernel : Unregister proc %p\n", proc); + + __kernel_rseq_unregister(); } @@ -848,2 +876,59 @@ } #endif + + +#if defined(CFA_HAVE_LINUX_LIBRSEQ) + // No definition needed +#elif defined(CFA_HAVE_LINUX_RSEQ_H) + + #if defined( __x86_64 ) || defined( __i386 ) + #define RSEQ_SIG 0x53053053 + #elif defined( __ARM_ARCH ) + #ifdef __ARMEB__ + #define RSEQ_SIG 0xf3def5e7 /* udf #24035 ; 0x5de3 (ARMv6+) */ + #else + #define RSEQ_SIG 0xe7f5def3 /* udf #24035 ; 0x5de3 */ + #endif + #endif + + extern void __disable_interrupts_hard(); + extern void __enable_interrupts_hard(); + + void __kernel_raw_rseq_register (void) { + /* paranoid */ verify( __cfaabi_rseq.cpu_id == RSEQ_CPU_ID_UNINITIALIZED ); + + // int ret = syscall(__NR_rseq, &__cfaabi_rseq, sizeof(struct rseq), 0, (sigset_t *)0p, _NSIG / 8); + int ret = syscall(__NR_rseq, &__cfaabi_rseq, sizeof(struct rseq), 0, RSEQ_SIG); + if(ret != 0) { + int e = errno; + switch(e) { + case EINVAL: abort("KERNEL ERROR: rseq register invalid argument"); + case ENOSYS: abort("KERNEL ERROR: rseq register no supported"); + case EFAULT: abort("KERNEL ERROR: rseq register with invalid argument"); + case EBUSY : abort("KERNEL ERROR: rseq register already registered"); + case EPERM : abort("KERNEL ERROR: rseq register sig argument on unregistration does not match the signature received on registration"); + default: abort("KERNEL ERROR: rseq register unexpected return %d", e); + } + } + } + + void __kernel_raw_rseq_unregister(void) { + /* paranoid */ verify( __cfaabi_rseq.cpu_id >= 0 ); + + // int ret = syscall(__NR_rseq, &__cfaabi_rseq, sizeof(struct rseq), RSEQ_FLAG_UNREGISTER, (sigset_t *)0p, _NSIG / 8); + int ret = syscall(__NR_rseq, &__cfaabi_rseq, sizeof(struct rseq), RSEQ_FLAG_UNREGISTER, RSEQ_SIG); + if(ret != 0) { + int e = errno; + switch(e) { + case EINVAL: abort("KERNEL ERROR: rseq unregister invalid argument"); + case ENOSYS: abort("KERNEL ERROR: rseq unregister no supported"); + case EFAULT: abort("KERNEL ERROR: rseq unregister with invalid argument"); + case EBUSY : abort("KERNEL ERROR: rseq unregister already registered"); + case EPERM : abort("KERNEL ERROR: rseq unregister sig argument on unregistration does not match the signature received on registration"); + default: abort("KERNEL ERROR: rseq unregisteunexpected return %d", e); + } + } + } +#else + // No definition needed +#endif