From: botta633 <bottaawesome633@gmail.com>
To: linux-kernel@vger.kernel.org
Cc: Peter Zijlstra <peterz@infradead.org>,
Ingo Molnar <mingo@redhat.com>, Will Deacon <will@kernel.org>,
Waiman Long <longman@redhat.com>,
Boqun Feng <boqun.feng@gmail.com>,
linux-ext4@vger.kernel.org, syzkaller@googlegroups.com,
syzbot+7f4a6f7f7051474e40ad@syzkaller.appspotmail.com,
stable@vger.kernel.org
Subject: [PATCH 2/2] ext4: Testing lock class and subclass got the same name pointer
Date: Sun, 14 Jul 2024 08:14:27 +0300 [thread overview]
Message-ID: <20240714051427.114044-2-bottaawesome633@gmail.com> (raw)
In-Reply-To: <20240714051427.114044-1-bottaawesome633@gmail.com>
Checking if the lockdep_map->name will change when setting the subclass.
It shouldn't change so that the lock class and subclass will have the same name
Reported-by: <syzbot+7f4a6f7f7051474e40ad@syzkaller.appspotmail.com>
Fixes: fd5e3f5fe27
Cc: <stable@vger.kernel.org>
Signed-off-by: botta633 <bottaawesome633@gmail.com>
---
lib/locking-selftest.c | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
diff --git a/lib/locking-selftest.c b/lib/locking-selftest.c
index 6f6a5fc85b42..1d7885205f36 100644
--- a/lib/locking-selftest.c
+++ b/lib/locking-selftest.c
@@ -2710,12 +2710,24 @@ static void local_lock_3B(void)
}
+static void class_subclass_X1_name(void)
+{
+ const char *name_before_subclass = rwsem_X1.dep_map.name;
+ const char *name_after_subclass;
+
+ WARN_ON(!rwsem_X1.dep_map.name);
+ lockdep_set_subclass(&rwsem_X1, 1);
+ WARN_ON(name_before_subclass != name_after_subclass);
+}
+
static void local_lock_tests(void)
{
printk(" --------------------------------------------------------------------------\n");
printk(" | local_lock tests |\n");
printk(" ---------------------\n");
+ init_class_X(&lock_X1, &rwlock_X1, &mutex_X1, &rwsem_X1);
+
print_testname("local_lock inversion 2");
dotest(local_lock_2, SUCCESS, LOCKTYPE_LL);
pr_cont("\n");
@@ -2727,6 +2739,10 @@ static void local_lock_tests(void)
print_testname("local_lock inversion 3B");
dotest(local_lock_3B, FAILURE, LOCKTYPE_LL);
pr_cont("\n");
+
+ print_testname("Class and subclass");
+ dotest(class_subclass_X1_name, SUCCESS, LOCKTYPE_RWSEM);
+ pr_cont("\n");
}
static void hardirq_deadlock_softirq_not_deadlock(void)
--
2.45.2
next prev parent reply other threads:[~2024-07-14 2:18 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-07-14 5:14 [PATCH v2 1/2] ext4: Forcing subclasses to have same name pointer as their parent class botta633
2024-07-14 5:14 ` botta633 [this message]
2024-07-14 22:00 ` [PATCH 2/2] ext4: Testing lock class and subclass got the same name pointer Boqun Feng
2024-07-14 21:22 ` [PATCH v2 1/2] ext4: Forcing subclasses to have same name pointer as their parent class Waiman Long
[not found] ` <CA+6bSasRZ7HRURZcSPEsAyDtNDdx+7UGwuXRG+Dw0Gqo+vs9Ew@mail.gmail.com>
2024-07-14 21:41 ` Boqun Feng
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240714051427.114044-2-bottaawesome633@gmail.com \
--to=bottaawesome633@gmail.com \
--cc=boqun.feng@gmail.com \
--cc=linux-ext4@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=longman@redhat.com \
--cc=mingo@redhat.com \
--cc=peterz@infradead.org \
--cc=stable@vger.kernel.org \
--cc=syzbot+7f4a6f7f7051474e40ad@syzkaller.appspotmail.com \
--cc=syzkaller@googlegroups.com \
--cc=will@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox