asgardius/android_kernel_motorola_sm6225
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

locking/selftest: Support queued rwlock

Browse source 
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>
This commit is contained in:
Waiman Long 2014-08-06 13:22:02 -04:00 committed by Ingo Molnar
parent f0bab73cb5
commit ae17ea0ec7
1 changed files with 49 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

56
lib/locking-selftest.c
View file

@ -267,19 +267,46 @@ GENERATE_TESTCASE(AA_rsem)
#undef E #undef E
/* /*
* Special-case for read-locking, they are * Special-case for read-locking, they are not allowed to
* allowed to recurse on the same lock class: * recurse on the same lock class except under interrupt context:
*/ */
static void rlock_AA1(void) static void rlock_AA1(void)
{ {
RL(X1); RL(X1);
RL(X1); // this one should NOT fail RL(X1); // this one should fail
} }
static void rlock_AA1B(void) static void rlock_AA1B(void)
{ {
RL(X1); 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) static void rsem_AA1(void)
@ -1069,7 +1096,7 @@ static inline void print_testname(const char *testname)
print_testname(desc); \ print_testname(desc); \
dotest(name##_spin, FAILURE, LOCKTYPE_SPIN); \ dotest(name##_spin, FAILURE, LOCKTYPE_SPIN); \
dotest(name##_wlock, FAILURE, LOCKTYPE_RWLOCK); \ 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##_mutex, FAILURE, LOCKTYPE_MUTEX); \
dotest(name##_wsem, FAILURE, LOCKTYPE_RWSEM); \ dotest(name##_wsem, FAILURE, LOCKTYPE_RWSEM); \
dotest(name##_rsem, FAILURE, LOCKTYPE_RWSEM); \ dotest(name##_rsem, FAILURE, LOCKTYPE_RWSEM); \
@ -1830,14 +1857,14 @@ void locking_selftest(void)
printk(" --------------------------------------------------------------------------\n"); printk(" --------------------------------------------------------------------------\n");
print_testname("recursive read-lock"); print_testname("recursive read-lock");
printk(" |"); printk(" |");
dotest(rlock_AA1, SUCCESS, LOCKTYPE_RWLOCK); dotest(rlock_AA1, FAILURE, LOCKTYPE_RWLOCK);
printk(" |"); printk(" |");
dotest(rsem_AA1, FAILURE, LOCKTYPE_RWSEM); dotest(rsem_AA1, FAILURE, LOCKTYPE_RWSEM);
printk("\n"); printk("\n");
print_testname("recursive read-lock #2"); print_testname("recursive read-lock #2");
printk(" |"); printk(" |");
dotest(rlock_AA1B, SUCCESS, LOCKTYPE_RWLOCK); dotest(rlock_AA1B, FAILURE, LOCKTYPE_RWLOCK);
printk(" |"); printk(" |");
dotest(rsem_AA1B, FAILURE, LOCKTYPE_RWSEM); dotest(rsem_AA1B, FAILURE, LOCKTYPE_RWSEM);
printk("\n"); printk("\n");
@ -1856,6 +1883,21 @@ void locking_selftest(void)
dotest(rsem_AA3, FAILURE, LOCKTYPE_RWSEM); dotest(rsem_AA3, FAILURE, LOCKTYPE_RWSEM);
printk("\n"); 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"); printk(" --------------------------------------------------------------------------\n");
/* /*