mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-26 06:50:07 +00:00
07ed18d26a
This patch adds several new tunables to control the behavior of elision on supported platforms[1]. Since elision now depends on tunables, we should always *compile* with elision enabled, and leave the code disabled, but available for runtime selection. This gives us *much* better compile-time testing of the existing code to avoid bit-rot[2]. Tested on ppc, ppc64, ppc64le, s390x and x86_64. [1] This part of the patch was initially proposed by Paul Murphy but was "staled" because the framework have changed since the patch was originally proposed: https://patchwork.sourceware.org/patch/10342/ [2] This part of the patch was inititally proposed as a RFC by Carlos O'Donnell. Make sense to me integrate this on the patch: https://sourceware.org/ml/libc-alpha/2017-05/msg00335.html * elf/dl-tunables.list: Add elision parameters. * manual/tunables.texi: Add entries about elision tunable. * sysdeps/unix/sysv/linux/powerpc/elision-conf.c: Add callback functions to dynamically enable/disable elision. Add multiple callbacks functions to set elision parameters. Deleted __libc_enable_secure check. * sysdeps/unix/sysv/linux/s390/elision-conf.c: Likewise. * sysdeps/unix/sysv/linux/x86/elision-conf.c: Likewise. * configure: Regenerated. * configure.ac: Option enable_lock_elision was deleted. * config.h.in: ENABLE_LOCK_ELISION flag was deleted. * config.make.in: Remove references to enable_lock_elision. * manual/install.texi: Elision configure option was removed. * INSTALL: Regenerated to remove enable_lock_elision. * nptl/Makefile: Disable elision so it can verify error case for destroying a mutex. * sysdeps/powerpc/nptl/elide.h: Cleanup ENABLE_LOCK_ELISION check. Deleted macros for the case when ENABLE_LOCK_ELISION was not defined. * sysdeps/s390/configure: Regenerated. * sysdeps/s390/configure.ac: Remove references to enable_lock_elision.. * nptl/tst-mutex8.c: Deleted all #ifndef ENABLE_LOCK_ELISION from the test. * sysdeps/powerpc/powerpc32/sysdep.h: Deleted all ENABLE_LOCK_ELISION checks. * sysdeps/powerpc/powerpc64/sysdep.h: Likewise. * sysdeps/powerpc/sysdep.h: Likewise. * sysdeps/s390/nptl/bits/pthreadtypes-arch.h: Likewise. * sysdeps/unix/sysv/linux/powerpc/force-elision.h: Likewise. * sysdeps/unix/sysv/linux/s390/elision-conf.h: Likewise. * sysdeps/unix/sysv/linux/s390/force-elision.h: Likewise. * sysdeps/unix/sysv/linux/s390/lowlevellock.h: Likewise. * sysdeps/unix/sysv/linux/s390/Makefile: Remove references to enable-lock-elision. Reviewed-by: Tulio Magno Quites Machado Filho <tuliom@linux.vnet.ibm.com>
396 lines
8.1 KiB
C
396 lines
8.1 KiB
C
/* Copyright (C) 2003-2017 Free Software Foundation, Inc.
|
|
This file is part of the GNU C Library.
|
|
Contributed by Ulrich Drepper <drepper@redhat.com>, 2003.
|
|
|
|
The GNU C Library is free software; you can redistribute it and/or
|
|
modify it under the terms of the GNU Lesser General Public
|
|
License as published by the Free Software Foundation; either
|
|
version 2.1 of the License, or (at your option) any later version.
|
|
|
|
The GNU C Library is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
Lesser General Public License for more details.
|
|
|
|
You should have received a copy of the GNU Lesser General Public
|
|
License along with the GNU C Library; if not, see
|
|
<http://www.gnu.org/licenses/>. */
|
|
|
|
/* This test checks behavior not required by POSIX. */
|
|
#include <errno.h>
|
|
#include <pthread.h>
|
|
#include <stdbool.h>
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
|
|
|
|
static pthread_mutex_t *m;
|
|
static pthread_barrier_t b;
|
|
static pthread_cond_t c;
|
|
static bool done;
|
|
|
|
|
|
static void
|
|
cl (void *arg)
|
|
{
|
|
if (pthread_mutex_unlock (m) != 0)
|
|
{
|
|
puts ("cl: mutex_unlocked failed");
|
|
exit (1);
|
|
}
|
|
}
|
|
|
|
|
|
static void *
|
|
tf (void *arg)
|
|
{
|
|
if (pthread_mutex_lock (m) != 0)
|
|
{
|
|
puts ("tf: mutex_lock failed");
|
|
return (void *) 1l;
|
|
}
|
|
|
|
int e = pthread_barrier_wait (&b);
|
|
if (e != 0 && e != PTHREAD_BARRIER_SERIAL_THREAD)
|
|
{
|
|
puts ("barrier_wait failed");
|
|
return (void *) 1l;
|
|
}
|
|
|
|
if (arg == NULL)
|
|
do
|
|
if (pthread_cond_wait (&c, m) != 0)
|
|
{
|
|
puts ("tf: cond_wait failed");
|
|
return (void *) 1l;
|
|
}
|
|
while (! done);
|
|
else
|
|
do
|
|
{
|
|
pthread_cleanup_push (cl, NULL);
|
|
|
|
if (pthread_cond_wait (&c, m) != 0)
|
|
{
|
|
puts ("tf: cond_wait failed");
|
|
return (void *) 1l;
|
|
}
|
|
|
|
pthread_cleanup_pop (0);
|
|
}
|
|
while (! done);
|
|
|
|
if (pthread_mutex_unlock (m) != 0)
|
|
{
|
|
puts ("tf: mutex_unlock failed");
|
|
return (void *) 1l;
|
|
}
|
|
|
|
return NULL;
|
|
}
|
|
|
|
|
|
static int
|
|
check_type (const char *mas, pthread_mutexattr_t *ma)
|
|
{
|
|
int e;
|
|
|
|
e = pthread_mutex_init (m, ma);
|
|
if (e != 0)
|
|
{
|
|
#ifdef ENABLE_PI
|
|
if (e == ENOTSUP)
|
|
{
|
|
puts ("PI mutexes unsupported");
|
|
return 0;
|
|
}
|
|
#endif
|
|
printf ("1st mutex_init failed for %s\n", mas);
|
|
return 1;
|
|
}
|
|
|
|
if (pthread_mutex_destroy (m) != 0)
|
|
{
|
|
printf ("immediate mutex_destroy failed for %s\n", mas);
|
|
return 1;
|
|
}
|
|
|
|
if (pthread_mutex_init (m, ma) != 0)
|
|
{
|
|
printf ("2nd mutex_init failed for %s\n", mas);
|
|
return 1;
|
|
}
|
|
|
|
if (pthread_mutex_lock (m) != 0)
|
|
{
|
|
printf ("1st mutex_lock failed for %s\n", mas);
|
|
return 1;
|
|
}
|
|
|
|
/* Elided mutexes don't fail destroy, but this test is run with
|
|
elision disabled so we can test them. */
|
|
e = pthread_mutex_destroy (m);
|
|
if (e == 0)
|
|
{
|
|
printf ("mutex_destroy of self-locked mutex succeeded for %s\n", mas);
|
|
return 1;
|
|
}
|
|
if (e != EBUSY)
|
|
{
|
|
printf ("mutex_destroy of self-locked mutex did not return EBUSY %s\n",
|
|
mas);
|
|
return 1;
|
|
}
|
|
|
|
if (pthread_mutex_unlock (m) != 0)
|
|
{
|
|
printf ("1st mutex_unlock failed for %s\n", mas);
|
|
return 1;
|
|
}
|
|
|
|
if (pthread_mutex_trylock (m) != 0)
|
|
{
|
|
printf ("mutex_trylock failed for %s\n", mas);
|
|
return 1;
|
|
}
|
|
|
|
/* Elided mutexes don't fail destroy. */
|
|
e = pthread_mutex_destroy (m);
|
|
if (e == 0)
|
|
{
|
|
printf ("mutex_destroy of self-trylocked mutex succeeded for %s\n", mas);
|
|
return 1;
|
|
}
|
|
if (e != EBUSY)
|
|
{
|
|
printf ("\
|
|
mutex_destroy of self-trylocked mutex did not return EBUSY %s\n",
|
|
mas);
|
|
return 1;
|
|
}
|
|
|
|
if (pthread_mutex_unlock (m) != 0)
|
|
{
|
|
printf ("2nd mutex_unlock failed for %s\n", mas);
|
|
return 1;
|
|
}
|
|
|
|
pthread_t th;
|
|
if (pthread_create (&th, NULL, tf, NULL) != 0)
|
|
{
|
|
puts ("1st create failed");
|
|
return 1;
|
|
}
|
|
done = false;
|
|
|
|
e = pthread_barrier_wait (&b);
|
|
if (e != 0 && e != PTHREAD_BARRIER_SERIAL_THREAD)
|
|
{
|
|
puts ("1st barrier_wait failed");
|
|
return 1;
|
|
}
|
|
|
|
if (pthread_mutex_lock (m) != 0)
|
|
{
|
|
printf ("2nd mutex_lock failed for %s\n", mas);
|
|
return 1;
|
|
}
|
|
|
|
if (pthread_mutex_unlock (m) != 0)
|
|
{
|
|
printf ("3rd mutex_unlock failed for %s\n", mas);
|
|
return 1;
|
|
}
|
|
|
|
/* Elided mutexes don't fail destroy. */
|
|
e = pthread_mutex_destroy (m);
|
|
if (e == 0)
|
|
{
|
|
printf ("mutex_destroy of condvar-used mutex succeeded for %s\n", mas);
|
|
return 1;
|
|
}
|
|
if (e != EBUSY)
|
|
{
|
|
printf ("\
|
|
mutex_destroy of condvar-used mutex did not return EBUSY for %s\n", mas);
|
|
return 1;
|
|
}
|
|
|
|
done = true;
|
|
if (pthread_cond_signal (&c) != 0)
|
|
{
|
|
puts ("cond_signal failed");
|
|
return 1;
|
|
}
|
|
|
|
void *r;
|
|
if (pthread_join (th, &r) != 0)
|
|
{
|
|
puts ("join failed");
|
|
return 1;
|
|
}
|
|
if (r != NULL)
|
|
{
|
|
puts ("thread didn't return NULL");
|
|
return 1;
|
|
}
|
|
|
|
if (pthread_mutex_destroy (m) != 0)
|
|
{
|
|
printf ("mutex_destroy after condvar-use failed for %s\n", mas);
|
|
return 1;
|
|
}
|
|
|
|
if (pthread_mutex_init (m, ma) != 0)
|
|
{
|
|
printf ("3rd mutex_init failed for %s\n", mas);
|
|
return 1;
|
|
}
|
|
|
|
if (pthread_create (&th, NULL, tf, (void *) 1) != 0)
|
|
{
|
|
puts ("2nd create failed");
|
|
return 1;
|
|
}
|
|
done = false;
|
|
|
|
e = pthread_barrier_wait (&b);
|
|
if (e != 0 && e != PTHREAD_BARRIER_SERIAL_THREAD)
|
|
{
|
|
puts ("2nd barrier_wait failed");
|
|
return 1;
|
|
}
|
|
|
|
if (pthread_mutex_lock (m) != 0)
|
|
{
|
|
printf ("3rd mutex_lock failed for %s\n", mas);
|
|
return 1;
|
|
}
|
|
|
|
if (pthread_mutex_unlock (m) != 0)
|
|
{
|
|
printf ("4th mutex_unlock failed for %s\n", mas);
|
|
return 1;
|
|
}
|
|
|
|
/* Elided mutexes don't fail destroy. */
|
|
e = pthread_mutex_destroy (m);
|
|
if (e == 0)
|
|
{
|
|
printf ("2nd mutex_destroy of condvar-used mutex succeeded for %s\n",
|
|
mas);
|
|
return 1;
|
|
}
|
|
if (e != EBUSY)
|
|
{
|
|
printf ("\
|
|
2nd mutex_destroy of condvar-used mutex did not return EBUSY for %s\n",
|
|
mas);
|
|
return 1;
|
|
}
|
|
|
|
if (pthread_cancel (th) != 0)
|
|
{
|
|
puts ("cond_cancel failed");
|
|
return 1;
|
|
}
|
|
|
|
if (pthread_join (th, &r) != 0)
|
|
{
|
|
puts ("join failed");
|
|
return 1;
|
|
}
|
|
if (r != PTHREAD_CANCELED)
|
|
{
|
|
puts ("thread not canceled");
|
|
return 1;
|
|
}
|
|
|
|
if (pthread_mutex_destroy (m) != 0)
|
|
{
|
|
printf ("mutex_destroy after condvar-canceled failed for %s\n", mas);
|
|
return 1;
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
|
|
static int
|
|
do_test (void)
|
|
{
|
|
pthread_mutex_t mm;
|
|
m = &mm;
|
|
|
|
if (pthread_barrier_init (&b, NULL, 2) != 0)
|
|
{
|
|
puts ("barrier_init failed");
|
|
return 1;
|
|
}
|
|
|
|
if (pthread_cond_init (&c, NULL) != 0)
|
|
{
|
|
puts ("cond_init failed");
|
|
return 1;
|
|
}
|
|
|
|
puts ("check normal mutex");
|
|
int res = check_type ("normal", NULL);
|
|
|
|
pthread_mutexattr_t ma;
|
|
if (pthread_mutexattr_init (&ma) != 0)
|
|
{
|
|
puts ("1st mutexattr_init failed");
|
|
return 1;
|
|
}
|
|
if (pthread_mutexattr_settype (&ma, PTHREAD_MUTEX_RECURSIVE) != 0)
|
|
{
|
|
puts ("1st mutexattr_settype failed");
|
|
return 1;
|
|
}
|
|
#ifdef ENABLE_PI
|
|
if (pthread_mutexattr_setprotocol (&ma, PTHREAD_PRIO_INHERIT))
|
|
{
|
|
puts ("1st pthread_mutexattr_setprotocol failed");
|
|
return 1;
|
|
}
|
|
#endif
|
|
puts ("check recursive mutex");
|
|
res |= check_type ("recursive", &ma);
|
|
if (pthread_mutexattr_destroy (&ma) != 0)
|
|
{
|
|
puts ("1st mutexattr_destroy failed");
|
|
return 1;
|
|
}
|
|
|
|
if (pthread_mutexattr_init (&ma) != 0)
|
|
{
|
|
puts ("2nd mutexattr_init failed");
|
|
return 1;
|
|
}
|
|
if (pthread_mutexattr_settype (&ma, PTHREAD_MUTEX_ERRORCHECK) != 0)
|
|
{
|
|
puts ("2nd mutexattr_settype failed");
|
|
return 1;
|
|
}
|
|
#ifdef ENABLE_PI
|
|
if (pthread_mutexattr_setprotocol (&ma, PTHREAD_PRIO_INHERIT))
|
|
{
|
|
puts ("2nd pthread_mutexattr_setprotocol failed");
|
|
return 1;
|
|
}
|
|
#endif
|
|
puts ("check error-checking mutex");
|
|
res |= check_type ("error-checking", &ma);
|
|
if (pthread_mutexattr_destroy (&ma) != 0)
|
|
{
|
|
puts ("2nd mutexattr_destroy failed");
|
|
return 1;
|
|
}
|
|
|
|
return res;
|
|
}
|
|
|
|
#define TEST_FUNCTION do_test ()
|
|
#include "../test-skeleton.c"
|