[DRAFT 1/2] locking/selftest: Add test infrastructure for Rust locking APIs
From: Boqun Feng
Date: Thu Mar 30 2023 - 14:52:12 EST
Signed-off-by: Boqun Feng <boqun.feng@xxxxxxxxx>
---
MAINTAINERS | 1 +
lib/Makefile | 3 +++
lib/locking-selftest.c | 9 +++++++++
lib/rust_locking_selftest.rs | 12 ++++++++++++
4 files changed, 25 insertions(+)
create mode 100644 lib/rust_locking_selftest.rs
diff --git a/MAINTAINERS b/MAINTAINERS
index 8d5bc223f305..c1878e18f98a 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -12060,6 +12060,7 @@ F: include/linux/seqlock.h
F: include/linux/spinlock*.h
F: kernel/locking/
F: lib/locking*.[ch]
+F: lib/rust-locking-selftest.rs
X: kernel/locking/locktorture.c
LOGICAL DISK MANAGER SUPPORT (LDM, Windows 2000/XP/Vista Dynamic Disks)
diff --git a/lib/Makefile b/lib/Makefile
index baf2821f7a00..940374c08edd 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -148,6 +148,9 @@ obj-$(CONFIG_GENERIC_PCI_IOMAP) += pci_iomap.o
obj-$(CONFIG_HAS_IOMEM) += iomap_copy.o devres.o
obj-$(CONFIG_CHECK_SIGNATURE) += check_signature.o
obj-$(CONFIG_DEBUG_LOCKING_API_SELFTESTS) += locking-selftest.o
+ifdef CONFIG_RUST
+obj-$(CONFIG_DEBUG_LOCKING_API_SELFTESTS) += rust_locking_selftest.o
+endif
lib-y += logic_pio.o
diff --git a/lib/locking-selftest.c b/lib/locking-selftest.c
index 8d24279fad05..9ef3ad92bc47 100644
--- a/lib/locking-selftest.c
+++ b/lib/locking-selftest.c
@@ -2854,6 +2854,11 @@ static void hardirq_deadlock_softirq_not_deadlock(void)
HARDIRQ_ENABLE();
}
+#ifdef CONFIG_RUST
+void rust_locking_test(void);
+#else
+#define rust_locking_test()
+#endif
void locking_selftest(void)
{
/*
@@ -3010,6 +3015,10 @@ void locking_selftest(void)
printk("---------------------------------\n");
debug_locks = 1;
}
+
+ /* Rust locking API tests */
+ rust_locking_test();
+
lockdep_set_selftest_task(NULL);
debug_locks_silent = 0;
}
diff --git a/lib/rust_locking_selftest.rs b/lib/rust_locking_selftest.rs
new file mode 100644
index 000000000000..61560a2f3c6b
--- /dev/null
+++ b/lib/rust_locking_selftest.rs
@@ -0,0 +1,12 @@
+// SPDX-License-Identifier: GPL-2.0
+
+//! Selftests for Rust locking APIs.
+
+use kernel::prelude::*;
+const __LOG_PREFIX: &[u8] = b"locking selftest\0";
+
+/// Entry point for tests.
+#[no_mangle]
+pub extern "C" fn rust_locking_test() {
+ pr_info!("Selftests for Rust locking APIs");
+}
--
2.39.2