summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorWaiman Long <Waiman.Long@hp.com>2014-08-06 13:22:02 -0400
committerIngo Molnar <mingo@kernel.org>2014-08-13 10:33:35 +0200
commitae17ea0ec7d8fa64fbb773a52b2df5ba4766bcb8 (patch)
tree1ba62bb20fa9723c9a6af118dd96455d9f9109a4 /lib
parentf0bab73cb539fb803c4d419951e8d28aa4964f8f (diff)
downloadlinux-stable-ae17ea0ec7d8fa64fbb773a52b2df5ba4766bcb8.tar.gz
linux-stable-ae17ea0ec7d8fa64fbb773a52b2df5ba4766bcb8.tar.bz2
linux-stable-ae17ea0ec7d8fa64fbb773a52b2df5ba4766bcb8.zip
locking/selftest: Support queued rwlock
The queued rwlock does not support the use of recursive read-lock in the process context. With changes in the lockdep code to check and disallow recursive read-lock, it is also necessary for the locking selftest to be updated to change the process context recursive read locking results from SUCCESS to FAILURE for rwlock. Signed-off-by: Waiman Long <Waiman.Long@hp.com> Signed-off-by: Peter Zijlstra <peterz@infradead.org> Cc: Maarten Lankhorst <maarten.lankhorst@canonical.com> Cc: Rik van Riel <riel@redhat.com> Cc: Scott J Norton <scott.norton@hp.com> Cc: Fengguang Wu <fengguang.wu@intel.com> Cc: Linus Torvalds <torvalds@linux-foundation.org> Link: http://lkml.kernel.org/r/1407345722-61615-3-git-send-email-Waiman.Long@hp.com Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'lib')
-rw-r--r--lib/locking-selftest.c56
1 files changed, 49 insertions, 7 deletions
diff --git a/lib/locking-selftest.c b/lib/locking-selftest.c
index 872a15a2a637..62af709b2083 100644
--- a/lib/locking-selftest.c
+++ b/lib/locking-selftest.c
@@ -267,19 +267,46 @@ GENERATE_TESTCASE(AA_rsem)
#undef E
/*
- * Special-case for read-locking, they are
- * allowed to recurse on the same lock class:
+ * Special-case for read-locking, they are not allowed to
+ * recurse on the same lock class except under interrupt context:
*/
static void rlock_AA1(void)
{
RL(X1);
- RL(X1); // this one should NOT fail
+ RL(X1); // this one should fail
}
static void rlock_AA1B(void)
{
RL(X1);
- RL(X2); // this one should NOT fail
+ RL(X2); // this one should fail
+}
+
+static void rlock_AHA1(void)
+{
+ RL(X1);
+ HARDIRQ_ENTER();
+ RL(X1); // this one should NOT fail
+ HARDIRQ_EXIT();
+}
+
+static void rlock_AHA1B(void)
+{
+ RL(X1);
+ HARDIRQ_ENTER();
+ RL(X2); // this one should NOT fail
+ HARDIRQ_EXIT();
+}
+
+static void rlock_ASAHA1(void)
+{
+ RL(X1);
+ SOFTIRQ_ENTER();
+ RL(X1); // this one should NOT fail
+ HARDIRQ_ENTER();
+ RL(X1); // this one should NOT fail
+ HARDIRQ_EXIT();
+ SOFTIRQ_EXIT();
}
static void rsem_AA1(void)
@@ -1069,7 +1096,7 @@ static inline void print_testname(const char *testname)
print_testname(desc); \
dotest(name##_spin, FAILURE, LOCKTYPE_SPIN); \
dotest(name##_wlock, FAILURE, LOCKTYPE_RWLOCK); \
- dotest(name##_rlock, SUCCESS, LOCKTYPE_RWLOCK); \
+ dotest(name##_rlock, FAILURE, LOCKTYPE_RWLOCK); \
dotest(name##_mutex, FAILURE, LOCKTYPE_MUTEX); \
dotest(name##_wsem, FAILURE, LOCKTYPE_RWSEM); \
dotest(name##_rsem, FAILURE, LOCKTYPE_RWSEM); \
@@ -1830,14 +1857,14 @@ void locking_selftest(void)
printk(" --------------------------------------------------------------------------\n");
print_testname("recursive read-lock");
printk(" |");
- dotest(rlock_AA1, SUCCESS, LOCKTYPE_RWLOCK);
+ dotest(rlock_AA1, FAILURE, LOCKTYPE_RWLOCK);
printk(" |");
dotest(rsem_AA1, FAILURE, LOCKTYPE_RWSEM);
printk("\n");
print_testname("recursive read-lock #2");
printk(" |");
- dotest(rlock_AA1B, SUCCESS, LOCKTYPE_RWLOCK);
+ dotest(rlock_AA1B, FAILURE, LOCKTYPE_RWLOCK);
printk(" |");
dotest(rsem_AA1B, FAILURE, LOCKTYPE_RWSEM);
printk("\n");
@@ -1856,6 +1883,21 @@ void locking_selftest(void)
dotest(rsem_AA3, FAILURE, LOCKTYPE_RWSEM);
printk("\n");
+ print_testname("recursive rlock with interrupt");
+ printk(" |");
+ dotest(rlock_AHA1, SUCCESS, LOCKTYPE_RWLOCK);
+ printk("\n");
+
+ print_testname("recursive rlock with interrupt #2");
+ printk(" |");
+ dotest(rlock_AHA1B, SUCCESS, LOCKTYPE_RWLOCK);
+ printk("\n");
+
+ print_testname("recursive rlock with interrupt #3");
+ printk(" |");
+ dotest(rlock_ASAHA1, SUCCESS, LOCKTYPE_RWLOCK);
+ printk("\n");
+
printk(" --------------------------------------------------------------------------\n");
/*