summaryrefslogtreecommitdiffstats
path: root/openmp/runtime/test/lock
diff options
context:
space:
mode:
authorJonathan Peyton <jonathan.l.peyton@intel.com>2017-11-01 19:44:42 +0000
committerJonathan Peyton <jonathan.l.peyton@intel.com>2017-11-01 19:44:42 +0000
commit3d18a37ca9bbbbd9f785d648a1fc602f07d5c6d1 (patch)
tree86cc4441f5311826689e7fbe5488fc1aaed8fa92 /openmp/runtime/test/lock
parent435151ad753d6a76ef09af3803c510a1bcf9fde9 (diff)
downloadbcm5719-llvm-3d18a37ca9bbbbd9f785d648a1fc602f07d5c6d1.tar.gz
bcm5719-llvm-3d18a37ca9bbbbd9f785d648a1fc602f07d5c6d1.zip
[OpenMP] Fix race condition in omp_init_lock
This is a partial fix for bug 34050. This prevents callers of omp_set_lock (which does not hold __kmp_global_lock) from ever seeing an uninitialized version of __kmp_i_lock_table.table. It does not solve a use-after-free race condition if omp_set_lock obtains a pointer to __kmp_i_lock_table.table before it is updated and then attempts to dereference afterwards. That race is far less likely and can be handled in a separate patch. The unit test usually segfaults on the current trunk revision. It passes with the patch. Patch by Adam Azarchs Differential Revision: https://reviews.llvm.org/D39439 llvm-svn: 317115
Diffstat (limited to 'openmp/runtime/test/lock')
-rw-r--r--openmp/runtime/test/lock/omp_init_lock.c42
1 files changed, 42 insertions, 0 deletions
diff --git a/openmp/runtime/test/lock/omp_init_lock.c b/openmp/runtime/test/lock/omp_init_lock.c
new file mode 100644
index 00000000000..24b60d1ab6b
--- /dev/null
+++ b/openmp/runtime/test/lock/omp_init_lock.c
@@ -0,0 +1,42 @@
+// RUN: %libomp-compile-and-run
+#include "omp_testsuite.h"
+#include <stdio.h>
+
+// This should be slightly less than KMP_I_LOCK_CHUNK, which is 1024
+#define LOCKS_PER_ITER 1000
+#define ITERATIONS (REPETITIONS + 1)
+
+// This tests concurrently using locks on one thread while initializing new
+// ones on another thread. This exercises the global lock pool.
+int test_omp_init_lock() {
+ int i;
+ omp_lock_t lcks[ITERATIONS * LOCKS_PER_ITER];
+#pragma omp parallel for schedule(static) num_threads(NUM_TASKS)
+ for (i = 0; i < ITERATIONS; i++) {
+ int j;
+ omp_lock_t *my_lcks = &lcks[i * LOCKS_PER_ITER];
+ for (j = 0; j < LOCKS_PER_ITER; j++) {
+ omp_init_lock(&my_lcks[j]);
+ }
+ for (j = 0; j < LOCKS_PER_ITER * 100; j++) {
+ omp_set_lock(&my_lcks[j % LOCKS_PER_ITER]);
+ omp_unset_lock(&my_lcks[j % LOCKS_PER_ITER]);
+ }
+ }
+ // Wait until all repititions are done. The test is exercising growth of
+ // the global lock pool, which does not shrink when no locks are allocated.
+ {
+ int j;
+ for (j = 0; j < ITERATIONS * LOCKS_PER_ITER; j++) {
+ omp_destroy_lock(&lcks[j]);
+ }
+ }
+
+ return 0;
+}
+
+int main() {
+ // No use repeating this test, since it's exercising a private global pool
+ // which is not reset between test iterations.
+ return test_omp_init_lock();
+}
OpenPOWER on IntegriCloud