Merge commit 'v3.14' into next

10 files changed, 144 insertions, 0 deletions

diff --git a/tools/lib/lockdep/tests/AA.c b/tools/lib/lockdep/tests/AA.c
new file mode 100644
index 000000000000..0f782ff404ac
--- /dev/null
+++ b/tools/lib/lockdep/tests/AA.c
@@ -0,0 +1,13 @@
+#include <liblockdep/mutex.h>
+
+void main(void)
+{
+        pthread_mutex_t a, b;
+
+        pthread_mutex_init(&a, NULL);
+        pthread_mutex_init(&b, NULL);
+
+        pthread_mutex_lock(&a);
+        pthread_mutex_lock(&b);
+        pthread_mutex_lock(&a);
+}
diff --git a/tools/lib/lockdep/tests/ABBA.c b/tools/lib/lockdep/tests/ABBA.c
new file mode 100644
index 000000000000..07f0e29d5485
--- /dev/null
+++ b/tools/lib/lockdep/tests/ABBA.c
@@ -0,0 +1,13 @@
+#include <liblockdep/mutex.h>
+#include "common.h"
+
+void main(void)
+{
+        pthread_mutex_t a, b;
+
+        pthread_mutex_init(&a, NULL);
+        pthread_mutex_init(&b, NULL);
+
+        LOCK_UNLOCK_2(a, b);
+        LOCK_UNLOCK_2(b, a);
+}
diff --git a/tools/lib/lockdep/tests/ABBCCA.c b/tools/lib/lockdep/tests/ABBCCA.c
new file mode 100644
index 000000000000..843db09ac666
--- /dev/null
+++ b/tools/lib/lockdep/tests/ABBCCA.c
@@ -0,0 +1,15 @@
+#include <liblockdep/mutex.h>
+#include "common.h"
+
+void main(void)
+{
+        pthread_mutex_t a, b, c;
+
+        pthread_mutex_init(&a, NULL);
+        pthread_mutex_init(&b, NULL);
+        pthread_mutex_init(&c, NULL);
+
+        LOCK_UNLOCK_2(a, b);
+        LOCK_UNLOCK_2(b, c);
+        LOCK_UNLOCK_2(c, a);
+}
diff --git a/tools/lib/lockdep/tests/ABBCCDDA.c b/tools/lib/lockdep/tests/ABBCCDDA.c
new file mode 100644
index 000000000000..33620e268f85
--- /dev/null
+++ b/tools/lib/lockdep/tests/ABBCCDDA.c
@@ -0,0 +1,17 @@
+#include <liblockdep/mutex.h>
+#include "common.h"
+
+void main(void)
+{
+        pthread_mutex_t a, b, c, d;
+
+        pthread_mutex_init(&a, NULL);
+        pthread_mutex_init(&b, NULL);
+        pthread_mutex_init(&c, NULL);
+        pthread_mutex_init(&d, NULL);
+
+        LOCK_UNLOCK_2(a, b);
+        LOCK_UNLOCK_2(b, c);
+        LOCK_UNLOCK_2(c, d);
+        LOCK_UNLOCK_2(d, a);
+}
diff --git a/tools/lib/lockdep/tests/ABCABC.c b/tools/lib/lockdep/tests/ABCABC.c
new file mode 100644
index 000000000000..3fee51e3a68a
--- /dev/null
+++ b/tools/lib/lockdep/tests/ABCABC.c
@@ -0,0 +1,15 @@
+#include <liblockdep/mutex.h>
+#include "common.h"
+
+void main(void)
+{
+        pthread_mutex_t a, b, c;
+
+        pthread_mutex_init(&a, NULL);
+        pthread_mutex_init(&b, NULL);
+        pthread_mutex_init(&c, NULL);
+
+        LOCK_UNLOCK_2(a, b);
+        LOCK_UNLOCK_2(c, a);
+        LOCK_UNLOCK_2(b, c);
+}
diff --git a/tools/lib/lockdep/tests/ABCDBCDA.c b/tools/lib/lockdep/tests/ABCDBCDA.c
new file mode 100644
index 000000000000..427ba562c75b
--- /dev/null
+++ b/tools/lib/lockdep/tests/ABCDBCDA.c
@@ -0,0 +1,17 @@
+#include <liblockdep/mutex.h>
+#include "common.h"
+
+void main(void)
+{
+        pthread_mutex_t a, b, c, d;
+
+        pthread_mutex_init(&a, NULL);
+        pthread_mutex_init(&b, NULL);
+        pthread_mutex_init(&c, NULL);
+        pthread_mutex_init(&d, NULL);
+
+        LOCK_UNLOCK_2(a, b);
+        LOCK_UNLOCK_2(c, d);
+        LOCK_UNLOCK_2(b, c);
+        LOCK_UNLOCK_2(d, a);
+}
diff --git a/tools/lib/lockdep/tests/ABCDBDDA.c b/tools/lib/lockdep/tests/ABCDBDDA.c
new file mode 100644
index 000000000000..680c6cf3e919
--- /dev/null
+++ b/tools/lib/lockdep/tests/ABCDBDDA.c
@@ -0,0 +1,17 @@
+#include <liblockdep/mutex.h>
+#include "common.h"
+
+void main(void)
+{
+        pthread_mutex_t a, b, c, d;
+
+        pthread_mutex_init(&a, NULL);
+        pthread_mutex_init(&b, NULL);
+        pthread_mutex_init(&c, NULL);
+        pthread_mutex_init(&d, NULL);
+
+        LOCK_UNLOCK_2(a, b);
+        LOCK_UNLOCK_2(c, d);
+        LOCK_UNLOCK_2(b, d);
+        LOCK_UNLOCK_2(d, a);
+}
diff --git a/tools/lib/lockdep/tests/WW.c b/tools/lib/lockdep/tests/WW.c
new file mode 100644
index 000000000000..d44f77d71029
--- /dev/null
+++ b/tools/lib/lockdep/tests/WW.c
@@ -0,0 +1,13 @@
+#include <liblockdep/rwlock.h>
+
+void main(void)
+{
+        pthread_rwlock_t a, b;
+
+        pthread_rwlock_init(&a, NULL);
+        pthread_rwlock_init(&b, NULL);
+
+        pthread_rwlock_wrlock(&a);
+        pthread_rwlock_rdlock(&b);
+        pthread_rwlock_wrlock(&a);
+}
diff --git a/tools/lib/lockdep/tests/common.h b/tools/lib/lockdep/tests/common.h
new file mode 100644
index 000000000000..d89e94d47d86
--- /dev/null
+++ b/tools/lib/lockdep/tests/common.h
@@ -0,0 +1,12 @@
+#ifndef _LIBLOCKDEP_TEST_COMMON_H
+#define _LIBLOCKDEP_TEST_COMMON_H
+
+#define LOCK_UNLOCK_2(a, b)                     \
+        do {                                    \
+                pthread_mutex_lock(&(a));       \
+                pthread_mutex_lock(&(b));       \
+                pthread_mutex_unlock(&(b));     \
+                pthread_mutex_unlock(&(a));     \
+        } while(0)
+
+#endif
diff --git a/tools/lib/lockdep/tests/unlock_balance.c b/tools/lib/lockdep/tests/unlock_balance.c
new file mode 100644
index 000000000000..0bc62de686f7
--- /dev/null
+++ b/tools/lib/lockdep/tests/unlock_balance.c
@@ -0,0 +1,12 @@
+#include <liblockdep/mutex.h>
+
+void main(void)
+{
+        pthread_mutex_t a;
+
+        pthread_mutex_init(&a, NULL);
+
+        pthread_mutex_lock(&a);
+        pthread_mutex_unlock(&a);
+        pthread_mutex_unlock(&a);
+}