From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.69]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8DAC736F438 for ; Mon, 12 Oct 2026 13:42:07 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.69 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1791812529; cv=none; b=kJzpZwd3Xj/YO0MD7Sdb65WeLO1wFMJm3zndlG/jTZAzM3BMUfFl6zwTYtvGN1uDhByWpucUd02u/2tZukDtT7IgsKFZRRKNYAw9D+VZ+mahb9/4By5bzGSzxzqngq2iHrZsy0H5LgdK3a6rGB56AlsiOEYqB9YWWBO+VjhPRvk= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1791812529; c=relaxed/simple; bh=Rg6cJAv6ZUUI6IKmwS6DVaUEOkrHublyHQ8IOYSpW4E=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=BK0gNRHIpsVC+FDjBlKyPNFPQnGM1VEFtM6lIXobc7BOr/sqmd0zecRGzko/+jaA9PWoD3t+aTdS/4/8DK3btZJqTRAJtwuLS/c18lQ0QkNijNyGpUEF8QOor3zN1YJ4q30CIxP2TCLksM2VFzdsFCSlAkku3jQDe+MqOB9F8hg= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--elver.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=YAST/aiu; arc=none smtp.client-ip=209.85.221.69 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--elver.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="YAST/aiu" Received: by mail-wr1-f69.google.com with SMTP id ffacd0b85a97d-48c69bdeaacso1550842f8f.0 for ; Mon, 12 Oct 2026 06:42:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1791812526; x=1792417326; darn=lists.linux.dev; h=content-type:cc:to:from:subject:message-id:references:mime-version :in-reply-to:date:from:to:cc:subject:date:message-id:reply-to :content-type; bh=VXSOc9CMrvtsfjOt0Sddq/wNROQxYDyqZfPwUsE1PWU=; b=YAST/aiuqBL5AcgEj0ta7v+fMiriZYsk9Nh3UVScL861nOsYPuMiVwQqPlB6XUnQaT 6/9iTa53oUIZytO1Zp2rCB21IquZKAIIAfjQMI5xvblam+u+2DZSWQ9EDjqvQ88zaIqe tZVWYHA0h2POSTfPr35vnp6pqTYDUzAiS8E/ODhZH6RK0EYmnniOYun+veVZ3gMHlrFt TGomT0wIhBc3rOvurgtvS9EX69Z+cBXCIxNHRfgPaHE63j7qOL3p5oDIR3qZiC3PTgmn S+GmzFP6J7lt0/MDW4fsovjBCUQ3gmKK10pP9nln7g/1vboeQfo5kzmXAJYLsynT7KVo uH6g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1791812526; x=1792417326; h=content-type:cc:to:from:subject:message-id:references:mime-version :in-reply-to:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to:content-type; bh=VXSOc9CMrvtsfjOt0Sddq/wNROQxYDyqZfPwUsE1PWU=; b=fxNenWnRIFrEU5YvXx1F6lTNxDb9xaxs9HoKNHbD/76mxJ2yv+REdyx9H6/+Y7wNuF i1v/MN6XnK50he8bqBPQmhEOhXskTPeZPzRtXf5M5BBDEbrVrh7jnqWZNIkb3+/RCI9R iFCBiBrg24rAw5fEV1uCNfgC/N5xLCoTUX0UvntUQmhZwpE7yKWOcjQgFTD25OE9GZsz q3FZLr3LSFhXemeUVJrCRMLNIrOgjo2d2DHWZ4iIK8GTbSy0oEjZvj4elnMBH3lG4BmQ W3aYsVjXmcylQPiU1gFGeqDsUM2nMdgDhXRs2GWoc7O/N0MMrwzWQ5SaxEFPUFE9ngFN kyhw== X-Forwarded-Encrypted: i=1; AKwUvBxO/22xoKYEg7J4o7GxQ9H+8SQiH1P9baHt4XWQMdwu2vP/G/5/dsFvPThmyFJ739ykmEVW@lists.linux.dev X-Gm-Message-State: AFq9FYJHlUxruYFEPQgvgWBOPjkncyA0KQ9D6fSxCnrKu3PHuNUX13gP oNaxgsy6G0MZxnusdQblB3ZFaY2auuRJuqthXZYPmp2b2l7eKMxMGHy5+lIliWg7pnq077rYI+X ytw== X-Received: from wrvb8.prod.google.com ([2002:a5d:5508:0:b0:48c:4566:c9eb]) (user=elver job=prod-delivery.src-stubby-dispatcher) by 2002:a5d:5590:0:b0:48c:6cdd:ba89 with SMTP id ffacd0b85a97d-48dbaaefa6emr12665508f8f.36.1791812525412; Mon, 12 Oct 2026 06:42:05 -0700 (PDT) Date: Mon, 12 Oct 2026 13:39:15 +0000 In-Reply-To: <20261012134159.912183-1-elver@google.com> Precedence: bulk X-Mailing-List: llvm@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20261012134159.912183-1-elver@google.com> X-Mailer: git-send-email 2.56.0.385.gd3acb90ef8-goog Message-ID: <20261012134159.912183-2-elver@google.com> Subject: [PATCH 2/2] rust: kcsan: add KUnit test for data race detection From: Marco Elver To: elver@google.com, Boqun Feng , Miguel Ojeda , Gary Guo Cc: Alexander Potapenko , kasan-dev@googlegroups.com, linux-kernel@vger.kernel.org, Jonathan Corbet , Shuah Khan , Randy Dunlap , Andrew Morton , Boqun Feng , "=?UTF-8?q?Bj=C3=B6rn=20Roy=20Baron?=" , Benno Lossin , Andreas Hindborg , Alice Ryhl , Trevor Gross , Danilo Krummrich , Daniel Almeida , Tamir Duberstein , Alexandre Courbot , "=?UTF-8?q?Onur=20=C3=96zkan?=" , Nathan Chancellor , Nicolas Schier , Nick Desaulniers , Bill Wendling , Justin Stitt , Asahi Lina , Yury Norov , Eliot Courtney , Joel Fernandes , workflows@vger.kernel.org, linux-doc@vger.kernel.org, rust-for-linux@vger.kernel.org, linux-kbuild@vger.kernel.org, llvm@lists.linux.dev Content-Type: text/plain; charset="UTF-8" Add a minimal KUnit test that checks that KCSAN detects data races in Rust code: two threads concurrently increment a shared counter without synchronization, and a probe on the console tracepoint waits for the KCSAN report (similar to kcsan_test.c): | BUG: KCSAN: data-race in _RNvNtNtCskctMpSfuwL9_6kernel10kcsan_test5tests8racy_inc / _RNvNtNtCskctMpSfuwL9_6kernel10kcsan_test5tests8racy_inc | | read-write to 0xffffffffb751ae28 of 8 bytes by task 116 on cpu 5: | _RNvNtNtCskctMpSfuwL9_6kernel10kcsan_test5tests8racy_inc+0x1c/0x30 | _RNvNtNtCskctMpSfuwL9_6kernel10kcsan_test5tests28kunit_rust_wrapper_data_race+0x28c/0x850 | kunit_try_run_case+0xdf/0x2a0 | kunit_generic_run_threadfn_adapter+0x48/0x80 | kthread+0x234/0x280 | ret_from_fork+0xf8/0x280 | ret_from_fork_asm+0x1a/0x30 | | read-write to 0xffffffffb751ae28 of 8 bytes by task 12 on cpu 3: | _RNvNtNtCskctMpSfuwL9_6kernel10kcsan_test5tests8racy_inc+0x1c/0x30 | _RNvXsb_NtCskctMpSfuwL9_6kernel9workqueueINtNtCs1G77UTwpz6o_4core3pin3PinINtNtNtB7_5alloc4kbox3BoxINtB5_11ClosureWorkNCNvNtNtB7_10kcsan_test5tests9data_races_0ENtNtB1d_9allocator7KmallocEEINtB5_15WorkItemPointerKy0_E3runB7_+0x55/0x120 | process_scheduled_works+0x4cd/0x970 | worker_thread+0x4de/0x6e0 | kthread+0x234/0x280 | ret_from_fork+0xf8/0x280 | ret_from_fork_asm+0x1a/0x30 | | value changed: 0x000000000000022b -> 0x00000000000005a2 | [...] The test is intentionally kept minimal; comprehensive tests of KCSAN's runtime behaviour are in kernel/kcsan/kcsan_test.c. Assisted-by: Antigravity Signed-off-by: Marco Elver --- MAINTAINERS | 1 + rust/bindings/bindings_helper.h | 1 + rust/kernel/Kconfig.test | 11 +++ rust/kernel/kcsan_test.rs | 120 ++++++++++++++++++++++++++++++++ rust/kernel/lib.rs | 2 + 5 files changed, 135 insertions(+) create mode 100644 rust/kernel/kcsan_test.rs diff --git a/MAINTAINERS b/MAINTAINERS index cc3cae2e378b..3fbbfbb31f5d 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -14089,6 +14089,7 @@ F: Documentation/dev-tools/kcsan.rst F: include/linux/kcsan*.h F: kernel/kcsan/ F: lib/Kconfig.kcsan +F: rust/kernel/kcsan_test.rs F: scripts/Makefile.kcsan KDUMP diff --git a/rust/bindings/bindings_helper.h b/rust/bindings/bindings_helper.h index 4b31aa7f432f..b06d5142d6e1 100644 --- a/rust/bindings/bindings_helper.h +++ b/rust/bindings/bindings_helper.h @@ -97,6 +97,7 @@ #include #include #include +#include #include /* diff --git a/rust/kernel/Kconfig.test b/rust/kernel/Kconfig.test index e6a5c7a795f0..caf98a23de76 100644 --- a/rust/kernel/Kconfig.test +++ b/rust/kernel/Kconfig.test @@ -83,4 +83,15 @@ config RUST_BITFIELD_KUNIT_TEST If unsure, say N. +config RUST_KCSAN_KUNIT_TEST + bool "KUnit test for KCSAN instrumentation of Rust code" if !KUNIT_ALL_TESTS + depends on KCSAN && HAVE_KCSAN_RUSTC && TRACEPOINTS + default KUNIT_ALL_TESTS + help + This option enables a KUnit test checking that KCSAN detects data + races in Rust code. The test needs at least 2 CPUs to reliably + observe a data race. + + If unsure, say N. + endif diff --git a/rust/kernel/kcsan_test.rs b/rust/kernel/kcsan_test.rs new file mode 100644 index 000000000000..5ddc9090cd6e --- /dev/null +++ b/rust/kernel/kcsan_test.rs @@ -0,0 +1,120 @@ +// SPDX-License-Identifier: GPL-2.0 + +//! KUnit test checking that KCSAN detects data races in Rust code. + +#[macros::kunit_tests(rust_kcsan)] +mod tests { + use crate::{ + bindings, + error::to_result, + ffi::{c_char, c_void}, + prelude::*, + sync::{ + atomic::{Atomic, Relaxed}, + Arc, Completion, + }, + time::{Delta, Instant, Monotonic}, + types::ScopeGuard, + workqueue, + }; + use core::{cell::UnsafeCell, ptr, slice}; + + struct Racy(UnsafeCell); + + // SAFETY: Not actually safe: unsynchronized concurrent access is the point of this test. + unsafe impl Sync for Racy {} + + static RACY: Racy = Racy(UnsafeCell::new(0)); + + /// Set by [`probe_console`] once KCSAN reported a data race in [`racy_inc`]. + static OBSERVED: Atomic = Atomic::new(false); + + #[inline(never)] + fn racy_inc() { + let p = RACY.0.get(); + // SAFETY: `p` is valid; the data race is intentional. `wrapping_add()` keeps the load and + // store in one basic block, so that the access is instrumented as a compound access (plain + // writes may be assumed atomic with `CONFIG_KCSAN_ASSUME_PLAIN_WRITES_ATOMIC=y`). + unsafe { *p = (*p).wrapping_add(1); } + } + + fn contains(haystack: &[u8], needle: &[u8]) -> bool { + haystack.windows(needle.len()).any(|w| w == needle) + } + + /// Probe for the `console` tracepoint. + /// + /// # Safety + /// + /// `buf` must be non-null and valid for reads of `len` bytes. + unsafe extern "C" fn probe_console(_data: *mut c_void, buf: *const c_char, len: usize) { + // SAFETY: By the safety requirements of this function. + let line = unsafe { slice::from_raw_parts(buf.cast::(), len) }; + + if contains(line, b"BUG: KCSAN: data-race in ") && contains(line, b"racy_inc") { + OBSERVED.store(true, Relaxed); + } + } + + #[pin_data] + struct Ctx { + stop: Atomic, + #[pin] + done: Completion, + } + + #[test] + fn data_race() -> Result { + // Do not pass on a report from a previous run of this suite. + OBSERVED.store(false, Relaxed); + + let ctx = Arc::pin_init( + pin_init!(Ctx { + stop: Atomic::new(false), + done <- Completion::new(), + }), + GFP_KERNEL, + )?; + + // SAFETY: `probe_console` has the signature expected by the `console` tracepoint. Being + // part of the kernel image, it and `OBSERVED` outlive the registration, so there is no + // need to synchronize with in-flight probes after unregistering. + to_result(unsafe { + bindings::tracepoint_probe_register( + &raw mut bindings::__tracepoint_console, + probe_console as *mut c_void, + ptr::null_mut(), + ) + })?; + let _unregister = ScopeGuard::new(|| { + // SAFETY: The probe was registered above. + unsafe { + bindings::tracepoint_probe_unregister( + &raw mut bindings::__tracepoint_console, + probe_console as *mut c_void, + ptr::null_mut(), + ); + } + }); + + let worker = ctx.clone(); + workqueue::system_unbound().try_spawn(GFP_KERNEL, move || { + while !worker.stop.load(Relaxed) { + racy_inc(); + } + worker.done.complete_all(); + })?; + + let start = Instant::::now(); + while !OBSERVED.load(Relaxed) && start.elapsed() < Delta::from_secs(10) { + racy_inc(); + } + + ctx.stop.store(true, Relaxed); + ctx.done.wait_for_completion(); + drop(_unregister); + + assert!(OBSERVED.load(Relaxed)); + Ok(()) + } +} diff --git a/rust/kernel/lib.rs b/rust/kernel/lib.rs index 4d5c96ddc49c..009efda9e7a4 100644 --- a/rust/kernel/lib.rs +++ b/rust/kernel/lib.rs @@ -94,6 +94,8 @@ pub mod iov; pub mod irq; pub mod jump_label; +#[cfg(CONFIG_RUST_KCSAN_KUNIT_TEST)] +mod kcsan_test; #[cfg(CONFIG_KUNIT)] pub mod kunit; pub mod list; -- 2.56.0.385.gd3acb90ef8-goog