From: Boqun Feng <boqun.feng@gmail.com>
To: Peter Zijlstra <peterz@infradead.org>
Cc: "Wedson Almeida Filho" <wedsonaf@gmail.com>,
rust-for-linux@vger.kernel.org, "Miguel Ojeda" <ojeda@kernel.org>,
"Alex Gaynor" <alex.gaynor@gmail.com>,
"Boqun Feng" <boqun.feng@gmail.com>,
"Gary Guo" <gary@garyguo.net>,
"Björn Roy Baron" <bjorn3_gh@protonmail.com>,
linux-kernel@vger.kernel.org,
"Wedson Almeida Filho" <walmeida@microsoft.com>,
"Ingo Molnar" <mingo@redhat.com>, "Will Deacon" <will@kernel.org>,
"Waiman Long" <longman@redhat.com>
Subject: [DRAFT 2/2] locking/selftest: Add AA deadlock selftest for Mutex and SpinLock
Date: Thu, 30 Mar 2023 11:51:03 -0700 [thread overview]
Message-ID: <20230330185103.1444086-2-boqun.feng@gmail.com> (raw)
In-Reply-To: <20230330185103.1444086-1-boqun.feng@gmail.com>
Signed-off-by: Boqun Feng <boqun.feng@gmail.com>
---
lib/locking-selftest.c | 3 +-
lib/rust_locking_selftest.rs | 99 ++++++++++++++++++++++++++++++++++++
2 files changed, 101 insertions(+), 1 deletion(-)
diff --git a/lib/locking-selftest.c b/lib/locking-selftest.c
index 9ef3ad92bc47..a4830e3cc998 100644
--- a/lib/locking-selftest.c
+++ b/lib/locking-selftest.c
@@ -60,6 +60,7 @@ __setup("debug_locks_verbose=", setup_debug_locks_verbose);
#define LOCKTYPE_RTMUTEX 0x20
#define LOCKTYPE_LL 0x40
#define LOCKTYPE_SPECIAL 0x80
+#define LOCKTYPE_RUST 0x100
static struct ww_acquire_ctx t, t2;
static struct ww_mutex o, o2, o3;
@@ -1427,7 +1428,7 @@ static int testcase_successes;
static int expected_testcase_failures;
static int unexpected_testcase_failures;
-static void dotest(void (*testcase_fn)(void), int expected, int lockclass_mask)
+void dotest(void (*testcase_fn)(void), int expected, int lockclass_mask)
{
int saved_preempt_count = preempt_count();
#ifdef CONFIG_PREEMPT_RT
diff --git a/lib/rust_locking_selftest.rs b/lib/rust_locking_selftest.rs
index 61560a2f3c6b..c050edf2ac9a 100644
--- a/lib/rust_locking_selftest.rs
+++ b/lib/rust_locking_selftest.rs
@@ -2,11 +2,110 @@
//! Selftests for Rust locking APIs.
+use kernel::pr_cont;
use kernel::prelude::*;
const __LOG_PREFIX: &[u8] = b"locking selftest\0";
+extern "C" {
+ fn dotest(
+ testcase_fn: extern "C" fn(),
+ expected: core::ffi::c_int,
+ lockclass_mask: core::ffi::c_int,
+ );
+}
+
+/// Same as the definition in lib/locking-selftest.c
+#[allow(dead_code)]
+enum Expectation {
+ Failure = 0,
+ Success = 1,
+ Timeout = 2,
+}
+
+trait LockTest {
+ const EXPECTED: Expectation;
+ const MASK: i32;
+
+ fn test();
+}
+
+extern "C" fn bridge<T: LockTest>() {
+ T::test();
+}
+
+fn test<T: LockTest>() {
+ pr_cont!("\n");
+ pr_cont!("{}: ", core::any::type_name::<T>());
+ unsafe {
+ dotest(bridge::<T>, T::EXPECTED as core::ffi::c_int, T::MASK);
+ }
+ pr_cont!("\n");
+}
+
+struct SpinLockAATest;
+
+impl LockTest for SpinLockAATest {
+ const EXPECTED: Expectation = Expectation::Failure;
+ const MASK: i32 = 0x100; // TODO
+
+ fn test() {
+ use kernel::static_lock_class;
+ use kernel::sync::SpinLock;
+ use kernel::{c_str, stack_pin_init};
+
+ let key = static_lock_class!();
+ let name = c_str!("A1");
+
+ stack_pin_init!(
+ let a1 = SpinLock::new(0, name, key)
+ );
+
+ stack_pin_init!(
+ let a2 = SpinLock::new(0, name, key)
+ );
+
+ let a1 = a1.unwrap();
+ let a2 = a2.unwrap();
+
+ let _x = a1.lock();
+ let _y = a2.lock();
+ }
+}
+
+struct MutexAATest;
+
+impl LockTest for MutexAATest {
+ const EXPECTED: Expectation = Expectation::Failure;
+ const MASK: i32 = 0x100; // TODO
+
+ fn test() {
+ use kernel::static_lock_class;
+ use kernel::sync::Mutex;
+ use kernel::{c_str, stack_pin_init};
+
+ let key = static_lock_class!();
+ let name = c_str!("A1");
+
+ stack_pin_init!(
+ let a1 = Mutex::new(0, name, key)
+ );
+
+ stack_pin_init!(
+ let a2 = Mutex::new(0, name, key)
+ );
+
+ let a1 = a1.unwrap();
+ let a2 = a2.unwrap();
+
+ let _x = a1.lock();
+ let _y = a2.lock();
+ }
+}
+
/// Entry point for tests.
#[no_mangle]
pub extern "C" fn rust_locking_test() {
pr_info!("Selftests for Rust locking APIs");
+ test::<SpinLockAATest>();
+ test::<MutexAATest>();
}
--
2.39.2
next prev parent reply other threads:[~2023-03-30 18:52 UTC|newest]
Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-03-30 4:39 [PATCH 01/13] rust: sync: introduce `LockClassKey` Wedson Almeida Filho
2023-03-30 4:39 ` [PATCH 02/13] rust: sync: introduce `Lock` and `Guard` Wedson Almeida Filho
2023-03-30 4:39 ` [PATCH 03/13] rust: lock: introduce `Mutex` Wedson Almeida Filho
2023-03-30 13:01 ` Peter Zijlstra
2023-03-30 18:47 ` Boqun Feng
2023-03-30 18:51 ` [DRAFT 1/2] locking/selftest: Add test infrastructure for Rust locking APIs Boqun Feng
2023-03-30 18:51 ` Boqun Feng [this message]
2023-03-30 18:56 ` [PATCH 03/13] rust: lock: introduce `Mutex` Boqun Feng
2023-04-03 8:20 ` Peter Zijlstra
2023-04-03 13:50 ` Wedson Almeida Filho
2023-04-03 15:25 ` Gary Guo
2023-04-03 15:44 ` Boqun Feng
2023-04-03 14:04 ` Boqun Feng
2023-03-30 4:39 ` [PATCH 04/13] locking/spinlock: introduce spin_lock_init_with_key Wedson Almeida Filho
2023-03-30 4:39 ` [PATCH 05/13] rust: lock: introduce `SpinLock` Wedson Almeida Filho
2023-03-30 4:39 ` [PATCH 06/13] rust: lock: add support for `Lock::lock_irqsave` Wedson Almeida Filho
2023-03-30 4:39 ` [PATCH 07/13] rust: lock: implement `IrqSaveBackend` for `SpinLock` Wedson Almeida Filho
2023-03-30 4:39 ` [PATCH 08/13] rust: introduce `ARef` Wedson Almeida Filho
2023-03-30 14:17 ` Gary Guo
2023-03-30 4:39 ` [PATCH 09/13] rust: add basic `Task` Wedson Almeida Filho
2023-03-30 4:39 ` [PATCH 10/13] rust: introduce `Task::current` Wedson Almeida Filho
2023-03-31 2:47 ` Gary Guo
2023-03-31 7:32 ` Alice Ryhl
2023-04-01 4:09 ` Wedson Almeida Filho
2023-04-01 7:01 ` Gary Guo
2023-03-30 4:39 ` [PATCH 11/13] rust: lock: add `Guard::do_unlocked` Wedson Almeida Filho
2023-03-30 4:39 ` [PATCH 12/13] rust: sync: introduce `CondVar` Wedson Almeida Filho
2023-03-30 12:52 ` Peter Zijlstra
2023-03-30 14:43 ` Wedson Almeida Filho
2023-03-30 12:59 ` Peter Zijlstra
2023-03-30 14:56 ` Wedson Almeida Filho
2023-04-03 8:59 ` Peter Zijlstra
2023-04-03 13:35 ` Wedson Almeida Filho
2023-03-30 4:39 ` [PATCH 13/13] rust: sync: introduce `LockedBy` Wedson Almeida Filho
2023-03-30 11:28 ` Benno Lossin
2023-03-30 11:45 ` Benno Lossin
2023-03-30 21:04 ` Wedson Almeida Filho
2023-03-30 21:10 ` Benno Lossin
2023-03-30 20:44 ` Wedson Almeida Filho
2023-03-30 11:10 ` [PATCH 01/13] rust: sync: introduce `LockClassKey` Gary Guo
2023-03-31 7:28 ` Alice Ryhl
2023-04-05 17:42 ` Wedson Almeida Filho
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=20230330185103.1444086-2-boqun.feng@gmail.com \
--to=boqun.feng@gmail.com \
--cc=alex.gaynor@gmail.com \
--cc=bjorn3_gh@protonmail.com \
--cc=gary@garyguo.net \
--cc=linux-kernel@vger.kernel.org \
--cc=longman@redhat.com \
--cc=mingo@redhat.com \
--cc=ojeda@kernel.org \
--cc=peterz@infradead.org \
--cc=rust-for-linux@vger.kernel.org \
--cc=walmeida@microsoft.com \
--cc=wedsonaf@gmail.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
all inboxes | Powered by JetHome®