From f1adf1f490b33a61eccad1682fbd9b1b66d404bd Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Thu, 23 Jul 2009 16:39:06 -0700 Subject: Fix pthread_cond_timedwait error handling on old kernels. --- nptl/ChangeLog | 5 +++++ nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_timedwait.S | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) (limited to 'nptl') diff --git a/nptl/ChangeLog b/nptl/ChangeLog index 2f0b8d8b7c..68fe3779c3 100644 --- a/nptl/ChangeLog +++ b/nptl/ChangeLog @@ -1,3 +1,8 @@ +2009-07-23 Ulrich Drepper + + * sysdeps/unix/sysv/linux/x86_64/pthread_cond_timedwait.S: Fix error + path when not using absolute timeout futex. + 2009-07-20 Ulrich Drepper * sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S: Minor diff --git a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_timedwait.S b/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_timedwait.S index e12790cb96..7486825d5f 100644 --- a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_timedwait.S +++ b/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_timedwait.S @@ -551,12 +551,12 @@ __pthread_cond_timedwait: jne 53b cmpq 24(%rsp), %r9 - jbe 45b + jbe 15f cmpq %rax, %r9 ja 39b - cmpq $-ETIMEDOUT, %r14 +15: cmpq $-ETIMEDOUT, %r14 jne 8b jmp 99b -- cgit v1.2.3-70-g09d2 From 01b597da400ef799a43f61fa31d305eb9db81670 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Thu, 23 Jul 2009 17:15:56 -0700 Subject: Check for .cfi_{personality,lsda} on x86-64. We need this support in NPTL now to avoid the hand-coded tables. --- nptl/ChangeLog | 2 ++ nptl/sysdeps/x86_64/configure | 36 ++++++++++++++++++++++++++++++++++++ nptl/sysdeps/x86_64/configure.in | 23 +++++++++++++++++++++++ 3 files changed, 61 insertions(+) create mode 100644 nptl/sysdeps/x86_64/configure create mode 100644 nptl/sysdeps/x86_64/configure.in (limited to 'nptl') diff --git a/nptl/ChangeLog b/nptl/ChangeLog index 68fe3779c3..cb9ec53cd1 100644 --- a/nptl/ChangeLog +++ b/nptl/ChangeLog @@ -1,5 +1,7 @@ 2009-07-23 Ulrich Drepper + * sysdeps/x86_64/configure.in: New file. + * sysdeps/unix/sysv/linux/x86_64/pthread_cond_timedwait.S: Fix error path when not using absolute timeout futex. diff --git a/nptl/sysdeps/x86_64/configure b/nptl/sysdeps/x86_64/configure new file mode 100644 index 0000000000..b959168843 --- /dev/null +++ b/nptl/sysdeps/x86_64/configure @@ -0,0 +1,36 @@ +# This file is generated from configure.in by Autoconf. DO NOT EDIT! + # Local configure fragment for sysdeps/i386. + +{ echo "$as_me:$LINENO: checking for .cfi_personality and .cfi_lsda pseudo-ops" >&5 +echo $ECHO_N "checking for .cfi_personality and .cfi_lsda pseudo-ops... $ECHO_C" >&6; } +if test "${libc_cv_asm_cfi_personality+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat > conftest.s <&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + libc_cv_asm_cfi_personality=yes + else + libc_cv_asm_cfi_personality=no + fi + rm -f conftest* + +fi +{ echo "$as_me:$LINENO: result: $libc_cv_asm_cfi_personality" >&5 +echo "${ECHO_T}$libc_cv_asm_cfi_personality" >&6; } +if test x"$libc_cv_asm_cfi_personality" != xyes; then + { { echo "$as_me:$LINENO: error: assembler too old, .cfi_personality support missing" >&5 +echo "$as_me: error: assembler too old, .cfi_personality support missing" >&2;} + { (exit 1); exit 1; }; } +fi diff --git a/nptl/sysdeps/x86_64/configure.in b/nptl/sysdeps/x86_64/configure.in new file mode 100644 index 0000000000..0ba0cc3726 --- /dev/null +++ b/nptl/sysdeps/x86_64/configure.in @@ -0,0 +1,23 @@ +GLIBC_PROVIDES dnl See aclocal.m4 in the top level source directory. +# Local configure fragment for sysdeps/i386. + +AC_CACHE_CHECK([for .cfi_personality and .cfi_lsda pseudo-ops], + libc_cv_asm_cfi_personality, [dnl + cat > conftest.s <&AS_MESSAGE_LOG_FD); then + libc_cv_asm_cfi_personality=yes + else + libc_cv_asm_cfi_personality=no + fi + rm -f conftest* +]) +if test x"$libc_cv_asm_cfi_personality" != xyes; then + AC_MSG_ERROR([assembler too old, .cfi_personality support missing]) +fi -- cgit v1.2.3-70-g09d2 From 7b7f43bed134db6a0da34282fffcbf0af10d4613 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Sun, 26 Jul 2009 13:00:04 -0700 Subject: Memory ordering in pthread_mutex_{,timed}lock. All commits should have happened before the mutex lock is taken. Therefore use the _rel variant of the cmpxchg atomic op. --- nptl/ChangeLog | 7 +++++++ nptl/pthread_mutex_lock.c | 12 ++++++------ nptl/pthread_mutex_timedlock.c | 12 ++++++------ 3 files changed, 19 insertions(+), 12 deletions(-) (limited to 'nptl') diff --git a/nptl/ChangeLog b/nptl/ChangeLog index cb9ec53cd1..222112161a 100644 --- a/nptl/ChangeLog +++ b/nptl/ChangeLog @@ -1,3 +1,10 @@ +2009-07-26 Ulrich Drepper + + [BZ #10418] + * pthread_mutex_lock.c (pthread_mutex_lock): Use _rel instead of of + _acq variants of cmpxchg. + * pthread_mutex_timedlock.c (pthread_mutex_timedlock): Likewise. + 2009-07-23 Ulrich Drepper * sysdeps/x86_64/configure.in: New file. diff --git a/nptl/pthread_mutex_lock.c b/nptl/pthread_mutex_lock.c index 406e588fdb..a0ff881faf 100644 --- a/nptl/pthread_mutex_lock.c +++ b/nptl/pthread_mutex_lock.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2002-2007, 2008 Free Software Foundation, Inc. +/* Copyright (C) 2002-2007, 2008, 2009 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper , 2002. @@ -160,7 +160,7 @@ __pthread_mutex_lock_full (pthread_mutex_t *mutex) #endif newval - = atomic_compare_and_exchange_val_acq (&mutex->__data.__lock, + = atomic_compare_and_exchange_val_rel (&mutex->__data.__lock, newval, oldval); if (newval != oldval) @@ -285,7 +285,7 @@ __pthread_mutex_lock_full (pthread_mutex_t *mutex) #ifdef NO_INCR newval |= FUTEX_WAITERS; #endif - oldval = atomic_compare_and_exchange_val_acq (&mutex->__data.__lock, + oldval = atomic_compare_and_exchange_val_rel (&mutex->__data.__lock, newval, 0); if (oldval != 0) @@ -420,7 +420,7 @@ __pthread_mutex_lock_full (pthread_mutex_t *mutex) oldprio = ceiling; oldval - = atomic_compare_and_exchange_val_acq (&mutex->__data.__lock, + = atomic_compare_and_exchange_val_rel (&mutex->__data.__lock, #ifdef NO_INCR ceilval | 2, #else @@ -434,7 +434,7 @@ __pthread_mutex_lock_full (pthread_mutex_t *mutex) do { oldval - = atomic_compare_and_exchange_val_acq (&mutex->__data.__lock, + = atomic_compare_and_exchange_val_rel (&mutex->__data.__lock, ceilval | 2, ceilval | 1); @@ -445,7 +445,7 @@ __pthread_mutex_lock_full (pthread_mutex_t *mutex) lll_futex_wait (&mutex->__data.__lock, ceilval | 2, PTHREAD_MUTEX_PSHARED (mutex)); } - while (atomic_compare_and_exchange_val_acq (&mutex->__data.__lock, + while (atomic_compare_and_exchange_val_rel (&mutex->__data.__lock, ceilval | 2, ceilval) != ceilval); } diff --git a/nptl/pthread_mutex_timedlock.c b/nptl/pthread_mutex_timedlock.c index 8d0db79d58..2c6ff114da 100644 --- a/nptl/pthread_mutex_timedlock.c +++ b/nptl/pthread_mutex_timedlock.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2002-2007, 2008 Free Software Foundation, Inc. +/* Copyright (C) 2002-2007, 2008, 2009 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper , 2002. @@ -126,7 +126,7 @@ pthread_mutex_timedlock (mutex, abstime) int newval = id | (oldval & FUTEX_WAITERS); newval - = atomic_compare_and_exchange_val_acq (&mutex->__data.__lock, + = atomic_compare_and_exchange_val_rel (&mutex->__data.__lock, newval, oldval); if (newval != oldval) { @@ -246,7 +246,7 @@ pthread_mutex_timedlock (mutex, abstime) } } - oldval = atomic_compare_and_exchange_val_acq (&mutex->__data.__lock, + oldval = atomic_compare_and_exchange_val_rel (&mutex->__data.__lock, id, 0); if (oldval != 0) @@ -404,7 +404,7 @@ pthread_mutex_timedlock (mutex, abstime) oldprio = ceiling; oldval - = atomic_compare_and_exchange_val_acq (&mutex->__data.__lock, + = atomic_compare_and_exchange_val_rel (&mutex->__data.__lock, ceilval | 1, ceilval); if (oldval == ceilval) @@ -413,7 +413,7 @@ pthread_mutex_timedlock (mutex, abstime) do { oldval - = atomic_compare_and_exchange_val_acq (&mutex->__data.__lock, + = atomic_compare_and_exchange_val_rel (&mutex->__data.__lock, ceilval | 2, ceilval | 1); @@ -456,7 +456,7 @@ pthread_mutex_timedlock (mutex, abstime) PTHREAD_MUTEX_PSHARED (mutex)); } } - while (atomic_compare_and_exchange_val_acq (&mutex->__data.__lock, + while (atomic_compare_and_exchange_val_rel (&mutex->__data.__lock, ceilval | 2, ceilval) != ceilval); } -- cgit v1.2.3-70-g09d2