diff options
author | Rich Felker <dalias@aerifal.cx> | 2011-04-17 11:43:03 -0400 |
---|---|---|
committer | Rich Felker <dalias@aerifal.cx> | 2011-04-17 11:43:03 -0400 |
commit | feee98903cd8119d9a3db62589246a940f44a9f5 (patch) | |
tree | 37922ce54f00145d7fc0ac795216fce611e0806a /arch/x86_64 | |
parent | 90f09a0dde3b37ebfabc4d3f6e2bb64086b7e804 (diff) | |
download | musl-feee98903cd8119d9a3db62589246a940f44a9f5.tar.gz |
overhaul pthread cancellation
this patch improves the correctness, simplicity, and size of
cancellation-related code. modulo any small errors, it should now be
completely conformant, safe, and resource-leak free.
the notion of entering and exiting cancellation-point context has been
completely eliminated and replaced with alternative syscall assembly
code for cancellable syscalls. the assembly is responsible for setting
up execution context information (stack pointer and address of the
syscall instruction) which the cancellation signal handler can use to
determine whether the interrupted code was in a cancellable state.
these changes eliminate race conditions in the previous generation of
cancellation handling code (whereby a cancellation request received
just prior to the syscall would not be processed, leaving the syscall
to block, potentially indefinitely), and remedy an issue where
non-cancellable syscalls made from signal handlers became cancellable
if the signal handler interrupted a cancellation point.
x86_64 asm is untested and may need a second try to get it right.
Diffstat (limited to 'arch/x86_64')
-rw-r--r-- | arch/x86_64/bits/syscall.h | 3 | ||||
-rw-r--r-- | arch/x86_64/pthread_arch.h | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/arch/x86_64/bits/syscall.h b/arch/x86_64/bits/syscall.h index d18edece..21d4c23a 100644 --- a/arch/x86_64/bits/syscall.h +++ b/arch/x86_64/bits/syscall.h @@ -60,7 +60,8 @@ static inline long __syscall6(long __n, long __a1, long __a2, long __a3, long __ return __ret; } -#define __socketcall(nm, a, b, c, d, e, f) syscall(__NR_##nm, a, b, c, d, e, f) +#define __socketcall(nm,a,b,c,d,e,f) syscall(__NR_##nm, a, b, c, d, e, f) +#define __socketcall_cp(nm,a,b,c,d,e,f) syscall_cp(__NR_##nm, a, b, c, d, e, f) #define __NR_read 0 #define __NR_write 1 diff --git a/arch/x86_64/pthread_arch.h b/arch/x86_64/pthread_arch.h index af7ae86e..c424493a 100644 --- a/arch/x86_64/pthread_arch.h +++ b/arch/x86_64/pthread_arch.h @@ -5,5 +5,5 @@ static inline struct pthread *__pthread_self() return self; } -#define PC_AT_SYS(c) \ - (*(uint16_t *)(((ucontext_t *)(c))->uc_mcontext.__gregs[16])==0x050f) +#define CANCEL_REG_SP 15 +#define CANCEL_REG_IP 16 |