History

rust: support running Rust documentation tests as KUnit ones

Rust has documentation tests: these are typically examples of usage of any item (e.g. function, struct, module...). They are very convenient because they are just written alongside the documentation. For instance: /// Sums two numbers. /// /// ``` /// assert_eq!(mymod::f(10, 20), 30); /// ``` pub fn f(a: i32, b: i32) -> i32 { a + b } In userspace, the tests are collected and run via `rustdoc`. Using the tool as-is would be useful already, since it allows to compile-test most tests (thus enforcing they are kept in sync with the code they document) and run those that do not depend on in-kernel APIs. However, by transforming the tests into a KUnit test suite, they can also be run inside the kernel. Moreover, the tests get to be compiled as other Rust kernel objects instead of targeting userspace. On top of that, the integration with KUnit means the Rust support gets to reuse the existing testing facilities. For instance, the kernel log would look like: KTAP version 1 1..1 KTAP version 1 # Subtest: rust_doctests_kernel 1..59 # rust_doctest_kernel_build_assert_rs_0.location: rust/kernel/build_assert.rs:13 ok 1 rust_doctest_kernel_build_assert_rs_0 # rust_doctest_kernel_build_assert_rs_1.location: rust/kernel/build_assert.rs:56 ok 2 rust_doctest_kernel_build_assert_rs_1 # rust_doctest_kernel_init_rs_0.location: rust/kernel/init.rs:122 ok 3 rust_doctest_kernel_init_rs_0 ... # rust_doctest_kernel_types_rs_2.location: rust/kernel/types.rs:150 ok 59 rust_doctest_kernel_types_rs_2 # rust_doctests_kernel: pass:59 fail:0 skip:0 total:59 # Totals: pass:59 fail:0 skip:0 total:59 ok 1 rust_doctests_kernel Therefore, add support for running Rust documentation tests in KUnit. Some other notes about the current implementation and support follow. The transformation is performed by a couple scripts written as Rust hostprogs. Tests using the `?` operator are also supported as usual, e.g.: /// ``` /// # use kernel::{spawn_work_item, workqueue}; /// spawn_work_item!(workqueue::system(), || pr_info!("x"))?; /// # Ok::<(), Error>(()) /// ``` The tests are also compiled with Clippy under `CLIPPY=1`, just like normal code, thus also benefitting from extra linting. The names of the tests are currently automatically generated. This allows to reduce the burden for documentation writers, while keeping them fairly stable for bisection. This is an improvement over the `rustdoc`-generated names, which include the line number; but ideally we would like to get `rustdoc` to provide the Rust item path and a number (for multiple examples in a single documented Rust item). In order for developers to easily see from which original line a failed doctests came from, a KTAP diagnostic line is printed to the log, containing the location (file and line) of the original test (i.e. instead of the location in the generated Rust file): # rust_doctest_kernel_types_rs_2.location: rust/kernel/types.rs:150 This line follows the syntax for declaring test metadata in the proposed KTAP v2 spec [1], which may be used for the proposed KUnit test attributes API [2]. Thus hopefully this will make migration easier later on (suggested by David [3]). The original line in that test attribute is figured out by providing an anchor (suggested by Boqun [4]). The original file is found by walking the filesystem, checking directory prefixes to reduce the amount of combinations to check, and it is only done once per file. Ambiguities are detected and reported. A notable difference from KUnit C tests is that the Rust tests appear to assert using the usual `assert!` and `assert_eq!` macros from the Rust standard library (`core`). We provide a custom version that forwards the call to KUnit instead. Importantly, these macros do not require passing context, unlike the KUnit C ones (i.e. `struct kunit *`). This makes them easier to use, and readers of the documentation do not need to care about which testing framework is used. In addition, it may allow us to test third-party code more easily in the future. However, a current limitation is that KUnit does not support assertions in other tasks. Thus we presently simply print an error to the kernel log if an assertion actually failed. This should be revisited to properly fail the test, perhaps saving the context somewhere else, or letting KUnit handle it.

Miguel Ojeda committed 3 years ago

Commit a66d7331 parent ed615fb11 files · +555 −0Browse files

Showing the changes to scripts (4 of 11 files). Show all

Unified · Split

4 files
  1. scripts/.gitignore +2 −0
  2. scripts/Makefile +4 −0
  3. scripts/rustdoc_test_builder.rs +72 −0
  4. scripts/rustdoc_test_gen.rs +260 −0
scripts/.gitignore+2−0
@@ -5,6 +5,8 @@ · 4 unmodified lines
55 /kallsyms
66 /module.lds
77 /recordmcount
8+/rustdoc_test_builder
9+/rustdoc_test_gen
810 /sign-file
911 /sorttable
1012 /target.json
scripts/Makefile+4−0
@@ -9,6 +9,8 @@ hostprogs-always-$(CONFIG_BUILDTIME_TABLE_SORT) += sorttable · 8 unmodified lines
99 hostprogs-always-$(CONFIG_ASN1) += asn1_compiler
1010 hostprogs-always-$(CONFIG_MODULE_SIG_FORMAT) += sign-file
1111 hostprogs-always-$(CONFIG_SYSTEM_EXTRA_CERTIFICATE) += insert-sys-cert
12+hostprogs-always-$(CONFIG_RUST_KERNEL_DOCTESTS) += rustdoc_test_builder
13+hostprogs-always-$(CONFIG_RUST_KERNEL_DOCTESTS) += rustdoc_test_gen
1214 always-$(CONFIG_RUST) += target.json
1315
1416 filechk_rust_target = $< < include/config/auto.conf
@@ -18,6 +20,8 @@ $(obj)/target.json: scripts/generate_rust_target include/config/auto.conf FORCE · 3 unmodified lines
1820
1921 hostprogs += generate_rust_target
2022 generate_rust_target-rust := y
23+rustdoc_test_builder-rust := y
24+rustdoc_test_gen-rust := y
2125
2226 HOSTCFLAGS_sorttable.o = -I$(srctree)/tools/include
2327 HOSTLDLIBS_sorttable = -lpthread
scripts/rustdoc_test_builder.rs+72−0
@@ -0,0 +1,72 @@
1+// SPDX-License-Identifier: GPL-2.0
2+
3+//! Test builder for `rustdoc`-generated tests.
4+//!
5+//! This script is a hack to extract the test from `rustdoc`'s output. Ideally, `rustdoc` would
6+//! have an option to generate this information instead, e.g. as JSON output.
7+//!
8+//! The `rustdoc`-generated test names look like `{file}_{line}_{number}`, e.g.
9+//! `...path_rust_kernel_sync_arc_rs_42_0`. `number` is the "test number", needed in cases like
10+//! a macro that expands into items with doctests is invoked several times within the same line.
11+//!
12+//! However, since these names are used for bisection in CI, the line number makes it not stable
13+//! at all. In the future, we would like `rustdoc` to give us the Rust item path associated with
14+//! the test, plus a "test number" (for cases with several examples per item) and generate a name
15+//! from that. For the moment, we generate ourselves a new name, `{file}_{number}` instead, in
16+//! the `gen` script (done there since we need to be aware of all the tests in a given file).
17+
18+use std::io::Read;
19+
20+fn main() {
21+ let mut stdin = std::io::stdin().lock();
22+ let mut body = String::new();
23+ stdin.read_to_string(&mut body).unwrap();
24+
25+ // Find the generated function name looking for the inner function inside `main()`.
26+ //
27+ // The line we are looking for looks like one of the following:
28+ //
29+ // ```
30+ // fn main() { #[allow(non_snake_case)] fn _doctest_main_rust_kernel_file_rs_28_0() {
31+ // fn main() { #[allow(non_snake_case)] fn _doctest_main_rust_kernel_file_rs_37_0() -> Result<(), impl core::fmt::Debug> {
32+ // ```
33+ //
34+ // It should be unlikely that doctest code matches such lines (when code is formatted properly).
35+ let rustdoc_function_name = body
36+ .lines()
37+ .find_map(|line| {
38+ Some(
39+ line.split_once("fn main() {")?
40+ .1
41+ .split_once("fn ")?
42+ .1
43+ .split_once("()")?
44+ .0,
45+ )
46+ .filter(|x| x.chars().all(|c| c.is_alphanumeric() || c == '_'))
47+ })
48+ .expect("No test function found in `rustdoc`'s output.");
49+
50+ // Qualify `Result` to avoid the collision with our own `Result` coming from the prelude.
51+ let body = body.replace(
52+ &format!("{rustdoc_function_name}() -> Result<(), impl core::fmt::Debug> {{"),
53+ &format!("{rustdoc_function_name}() -> core::result::Result<(), impl core::fmt::Debug> {{"),
54+ );
55+
56+ // For tests that get generated with `Result`, like above, `rustdoc` generates an `unwrap()` on
57+ // the return value to check there were no returned errors. Instead, we use our assert macro
58+ // since we want to just fail the test, not panic the kernel.
59+ //
60+ // We save the result in a variable so that the failed assertion message looks nicer.
61+ let body = body.replace(
62+ &format!("}} {rustdoc_function_name}().unwrap() }}"),
63+ &format!("}} let test_return_value = {rustdoc_function_name}(); assert!(test_return_value.is_ok()); }}"),
64+ );
65+
66+ // Figure out a smaller test name based on the generated function name.
67+ let name = rustdoc_function_name.split_once("_rust_kernel_").unwrap().1;
68+
69+ let path = format!("rust/test/doctests/kernel/{name}");
70+
71+ std::fs::write(path, body.as_bytes()).unwrap();
72+}
scripts/rustdoc_test_gen.rs+260−0
@@ -0,0 +1,260 @@
1+// SPDX-License-Identifier: GPL-2.0
2+
3+//! Generates KUnit tests from saved `rustdoc`-generated tests.
4+//!
5+//! KUnit passes a context (`struct kunit *`) to each test, which should be forwarded to the other
6+//! KUnit functions and macros.
7+//!
8+//! However, we want to keep this as an implementation detail because:
9+//!
10+//! - Test code should not care about the implementation.
11+//!
12+//! - Documentation looks worse if it needs to carry extra details unrelated to the piece
13+//! being described.
14+//!
15+//! - Test code should be able to define functions and call them, without having to carry
16+//! the context.
17+//!
18+//! - Later on, we may want to be able to test non-kernel code (e.g. `core`, `alloc` or
19+//! third-party crates) which likely use the standard library `assert*!` macros.
20+//!
21+//! For this reason, instead of the passed context, `kunit_get_current_test()` is used instead
22+//! (i.e. `current->kunit_test`).
23+//!
24+//! Note that this means other threads/tasks potentially spawned by a given test, if failing, will
25+//! report the failure in the kernel log but will not fail the actual test. Saving the pointer in
26+//! e.g. a `static` per test does not fully solve the issue either, because currently KUnit does
27+//! not support assertions (only expectations) from other tasks. Thus leave that feature for
28+//! the future, which simplifies the code here too. We could also simply not allow `assert`s in
29+//! other tasks, but that seems overly constraining, and we do want to support them, eventually.
30+
31+use std::{
32+ fs,
33+ fs::File,
34+ io::{BufWriter, Read, Write},
35+ path::{Path, PathBuf},
36+};
37+
38+/// Find the real path to the original file based on the `file` portion of the test name.
39+///
40+/// `rustdoc` generated `file`s look like `sync_locked_by_rs`. Underscores (except the last one)
41+/// may represent an actual underscore in a directory/file, or a path separator. Thus the actual
42+/// file might be `sync_locked_by.rs`, `sync/locked_by.rs`, `sync_locked/by.rs` or
43+/// `sync/locked/by.rs`. This function walks the file system to determine which is the real one.
44+///
45+/// This does require that ambiguities do not exist, but that seems fair, especially since this is
46+/// all supposed to be temporary until `rustdoc` gives us proper metadata to build this. If such
47+/// ambiguities are detected, they are diagnosed and the script panics.
48+fn find_real_path<'a>(srctree: &Path, valid_paths: &'a mut Vec<PathBuf>, file: &str) -> &'a str {
49+ valid_paths.clear();
50+
51+ let potential_components: Vec<&str> = file.strip_suffix("_rs").unwrap().split('_').collect();
52+
53+ find_candidates(srctree, valid_paths, Path::new(""), &potential_components);
54+ fn find_candidates(
55+ srctree: &Path,
56+ valid_paths: &mut Vec<PathBuf>,
57+ prefix: &Path,
58+ potential_components: &[&str],
59+ ) {
60+ // The base case: check whether all the potential components left, joined by underscores,
61+ // is a file.
62+ let joined_potential_components = potential_components.join("_") + ".rs";
63+ if srctree
64+ .join("rust/kernel")
65+ .join(prefix)
66+ .join(&joined_potential_components)
67+ .is_file()
68+ {
69+ // Avoid `srctree` here in order to keep paths relative to it in the KTAP output.
70+ valid_paths.push(
71+ Path::new("rust/kernel")
72+ .join(prefix)
73+ .join(joined_potential_components),
74+ );
75+ }
76+
77+ // In addition, check whether each component prefix, joined by underscores, is a directory.
78+ // If not, there is no need to check for combinations with that prefix.
79+ for i in 1..potential_components.len() {
80+ let (components_prefix, components_rest) = potential_components.split_at(i);
81+ let prefix = prefix.join(components_prefix.join("_"));
82+ if srctree.join("rust/kernel").join(&prefix).is_dir() {
83+ find_candidates(srctree, valid_paths, &prefix, components_rest);
84+ }
85+ }
86+ }
87+
88+ assert!(
89+ valid_paths.len() > 0,
90+ "No path candidates found. This is likely a bug in the build system, or some files went \
91+ away while compiling."
92+ );
93+
94+ if valid_paths.len() > 1 {
95+ eprintln!("Several path candidates found:");
96+ for path in valid_paths {
97+ eprintln!(" {path:?}");
98+ }
99+ panic!(
100+ "Several path candidates found, please resolve the ambiguity by renaming a file or \
101+ folder."
102+ );
103+ }
104+
105+ valid_paths[0].to_str().unwrap()
106+}
107+
108+fn main() {
109+ let srctree = std::env::var("srctree").unwrap();
110+ let srctree = Path::new(&srctree);
111+
112+ let mut paths = fs::read_dir("rust/test/doctests/kernel")
113+ .unwrap()
114+ .map(|entry| entry.unwrap().path())
115+ .collect::<Vec<_>>();
116+
117+ // Sort paths.
118+ paths.sort();
119+
120+ let mut rust_tests = String::new();
121+ let mut c_test_declarations = String::new();
122+ let mut c_test_cases = String::new();
123+ let mut body = String::new();
124+ let mut last_file = String::new();
125+ let mut number = 0;
126+ let mut valid_paths: Vec<PathBuf> = Vec::new();
127+ let mut real_path: &str = "";
128+ for path in paths {
129+ // The `name` follows the `{file}_{line}_{number}` pattern (see description in
130+ // `scripts/rustdoc_test_builder.rs`). Discard the `number`.
131+ let name = path.file_name().unwrap().to_str().unwrap().to_string();
132+
133+ // Extract the `file` and the `line`, discarding the `number`.
134+ let (file, line) = name.rsplit_once('_').unwrap().0.rsplit_once('_').unwrap();
135+
136+ // Generate an ID sequence ("test number") for each one in the file.
137+ if file == last_file {
138+ number += 1;
139+ } else {
140+ number = 0;
141+ last_file = file.to_string();
142+
143+ // Figure out the real path, only once per file.
144+ real_path = find_real_path(srctree, &mut valid_paths, file);
145+ }
146+
147+ // Generate a KUnit name (i.e. test name and C symbol) for this test.
148+ //
149+ // We avoid the line number, like `rustdoc` does, to make things slightly more stable for
150+ // bisection purposes. However, to aid developers in mapping back what test failed, we will
151+ // print a diagnostics line in the KTAP report.
152+ let kunit_name = format!("rust_doctest_kernel_{file}_{number}");
153+
154+ // Read the test's text contents to dump it below.
155+ body.clear();
156+ File::open(path).unwrap().read_to_string(&mut body).unwrap();
157+
158+ // Calculate how many lines before `main` function (including the `main` function line).
159+ let body_offset = body
160+ .lines()
161+ .take_while(|line| !line.contains("fn main() {"))
162+ .count()
163+ + 1;
164+
165+ use std::fmt::Write;
166+ write!(
167+ rust_tests,
168+ r#"/// Generated `{name}` KUnit test case from a Rust documentation test.
169+#[no_mangle]
170+pub extern "C" fn {kunit_name}(__kunit_test: *mut kernel::bindings::kunit) {{
171+ /// Overrides the usual [`assert!`] macro with one that calls KUnit instead.
172+ #[allow(unused)]
173+ macro_rules! assert {{
174+ ($cond:expr $(,)?) => {{{{
175+ kernel::kunit_assert!("{kunit_name}", "{real_path}", __DOCTEST_ANCHOR - {line}, $cond);
176+ }}}}
177+ }}
178+
179+ /// Overrides the usual [`assert_eq!`] macro with one that calls KUnit instead.
180+ #[allow(unused)]
181+ macro_rules! assert_eq {{
182+ ($left:expr, $right:expr $(,)?) => {{{{
183+ kernel::kunit_assert_eq!("{kunit_name}", "{real_path}", __DOCTEST_ANCHOR - {line}, $left, $right);
184+ }}}}
185+ }}
186+
187+ // Many tests need the prelude, so provide it by default.
188+ #[allow(unused)]
189+ use kernel::prelude::*;
190+
191+ // Unconditionally print the location of the original doctest (i.e. rather than the location in
192+ // the generated file) so that developers can easily map the test back to the source code.
193+ //
194+ // This information is also printed when assertions fail, but this helps in the successful cases
195+ // when the user is running KUnit manually, or when passing `--raw_output` to `kunit.py`.
196+ //
197+ // This follows the syntax for declaring test metadata in the proposed KTAP v2 spec, which may
198+ // be used for the proposed KUnit test attributes API. Thus hopefully this will make migration
199+ // easier later on.
200+ kernel::kunit::info(format_args!(" # {kunit_name}.location: {real_path}:{line}\n"));
201+
202+ /// The anchor where the test code body starts.
203+ #[allow(unused)]
204+ static __DOCTEST_ANCHOR: i32 = core::line!() as i32 + {body_offset} + 1;
205+ {{
206+ {body}
207+ main();
208+ }}
209+}}
210+
211+"#
212+ )
213+ .unwrap();
214+
215+ write!(c_test_declarations, "void {kunit_name}(struct kunit *);\n").unwrap();
216+ write!(c_test_cases, " KUNIT_CASE({kunit_name}),\n").unwrap();
217+ }
218+
219+ let rust_tests = rust_tests.trim();
220+ let c_test_declarations = c_test_declarations.trim();
221+ let c_test_cases = c_test_cases.trim();
222+
223+ write!(
224+ BufWriter::new(File::create("rust/doctests_kernel_generated.rs").unwrap()),
225+ r#"//! `kernel` crate documentation tests.
226+
227+const __LOG_PREFIX: &[u8] = b"rust_doctests_kernel\0";
228+
229+{rust_tests}
230+"#
231+ )
232+ .unwrap();
233+
234+ write!(
235+ BufWriter::new(File::create("rust/doctests_kernel_generated_kunit.c").unwrap()),
236+ r#"/*
237+ * `kernel` crate documentation tests.
238+ */
239+
240+#include <kunit/test.h>
241+
242+{c_test_declarations}
243+
244+static struct kunit_case test_cases[] = {{
245+ {c_test_cases}
246+ {{ }}
247+}};
248+
249+static struct kunit_suite test_suite = {{
250+ .name = "rust_doctests_kernel",
251+ .test_cases = test_cases,
252+}};
253+
254+kunit_test_suite(test_suite);
255+
256+MODULE_LICENSE("GPL");
257+"#
258+ )
259+ .unwrap();
260+}

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t