]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
locking/lockdep: Add a test for lockdep_set_subclass()
authorAhmed Ehab <bottaawesome633@gmail.com>
Thu, 5 Sep 2024 01:12:20 +0000 (04:12 +0300)
committerBoqun Feng <boqun.feng@gmail.com>
Fri, 18 Oct 2024 04:21:16 +0000 (21:21 -0700)
Add a test case to ensure that no new name string literal will be
created in lockdep_set_subclass(), otherwise a warning will be triggered
in look_up_lock_class(). Add this to catch the problem in the future.

[boqun: Reword the title, replace #if with #ifdef and rename functions
and variables]

Signed-off-by: Ahmed Ehab <bottaawesome633@gmail.com>
Signed-off-by: Boqun Feng <boqun.feng@gmail.com>
Link: https://lore.kernel.org/lkml/20240905011220.356973-1-bottaawesome633@gmail.com/
lib/locking-selftest.c

index 6f6a5fc85b42f58ba5f0e847c1ec43e886fea03e..6e0c019f71b6891c660067ec79de4b817983e663 100644 (file)
@@ -2710,6 +2710,43 @@ static void local_lock_3B(void)
 
 }
 
+#ifdef CONFIG_DEBUG_LOCK_ALLOC
+static inline const char *rw_semaphore_lockdep_name(struct rw_semaphore *rwsem)
+{
+       return rwsem->dep_map.name;
+}
+#else
+static inline const char *rw_semaphore_lockdep_name(struct rw_semaphore *rwsem)
+{
+       return NULL;
+}
+#endif
+
+static void test_lockdep_set_subclass_name(void)
+{
+       const char *name_before = rw_semaphore_lockdep_name(&rwsem_X1);
+       const char *name_after;
+
+       lockdep_set_subclass(&rwsem_X1, 1);
+       name_after = rw_semaphore_lockdep_name(&rwsem_X1);
+       DEBUG_LOCKS_WARN_ON(name_before != name_after);
+}
+
+/*
+ * lockdep_set_subclass() should reuse the existing lock class name instead
+ * of creating a new one.
+ */
+static void lockdep_set_subclass_name_test(void)
+{
+       printk("  --------------------------------------------------------------------------\n");
+       printk("  | lockdep_set_subclass() name test|\n");
+       printk("  -----------------------------------\n");
+
+       print_testname("compare name before and after");
+       dotest(test_lockdep_set_subclass_name, SUCCESS, LOCKTYPE_RWSEM);
+       pr_cont("\n");
+}
+
 static void local_lock_tests(void)
 {
        printk("  --------------------------------------------------------------------------\n");
@@ -2920,6 +2957,8 @@ void locking_selftest(void)
        dotest(hardirq_deadlock_softirq_not_deadlock, FAILURE, LOCKTYPE_SPECIAL);
        pr_cont("\n");
 
+       lockdep_set_subclass_name_test();
+
        if (unexpected_testcase_failures) {
                printk("-----------------------------------------------------------------\n");
                debug_locks = 0;