Messages in this thread Patch in this message | | | From | Waiman Long <> | Subject | [PATCH v5 2/2] locking-selftest: Support queue rwlock | Date | Thu, 26 Jun 2014 13:39:11 -0400 |
| |
The queue 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 when queue rwlock is configured, 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 queue rwlock.
Signed-off-by: Waiman Long <Waiman.Long@hp.com> --- lib/locking-selftest.c | 16 +++++++++++++--- 1 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/lib/locking-selftest.c b/lib/locking-selftest.c index 872a15a..0ba8816 100644 --- a/lib/locking-selftest.c +++ b/lib/locking-selftest.c @@ -940,6 +940,16 @@ GENERATE_PERMUTATIONS_3_EVENTS(irq_read_recursion_soft) init_rwsem(&rwsem_##x); \ } while (0) +/* + * If queue rwlock is used, recursive read-lock is not allowed in the + * process context. It is allowed in the interrupt context. + */ +#ifdef CONFIG_QUEUE_RWLOCK +#define RRLOCK_RESULT FAILURE +#else +#define RRLOCK_RESULT SUCCESS +#endif + static void reset_locks(void) { local_irq_disable(); @@ -1069,7 +1079,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, RRLOCK_RESULT, LOCKTYPE_RWLOCK); \ dotest(name##_mutex, FAILURE, LOCKTYPE_MUTEX); \ dotest(name##_wsem, FAILURE, LOCKTYPE_RWSEM); \ dotest(name##_rsem, FAILURE, LOCKTYPE_RWSEM); \ @@ -1830,14 +1840,14 @@ void locking_selftest(void) printk(" --------------------------------------------------------------------------\n"); print_testname("recursive read-lock"); printk(" |"); - dotest(rlock_AA1, SUCCESS, LOCKTYPE_RWLOCK); + dotest(rlock_AA1, RRLOCK_RESULT, 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, RRLOCK_RESULT, LOCKTYPE_RWLOCK); printk(" |"); dotest(rsem_AA1B, FAILURE, LOCKTYPE_RWSEM); printk("\n"); -- 1.7.1
| |