mirror of
https://github.com/raspberrypi/linux.git
synced 2025-12-06 18:09:56 +00:00
Pull Rust updates from Miguel Ojeda:
"Toolchain and infrastructure:
- Extract the 'pin-init' API from the 'kernel' crate and make it into
a standalone crate.
In order to do this, the contents are rearranged so that they can
easily be kept in sync with the version maintained out-of-tree that
other projects have started to use too (or plan to, like QEMU).
This will reduce the maintenance burden for Benno, who will now
have his own sub-tree, and will simplify future expected changes
like the move to use 'syn' to simplify the implementation.
- Add '#[test]'-like support based on KUnit.
We already had doctests support based on KUnit, which takes the
examples in our Rust documentation and runs them under KUnit.
Now, we are adding the beginning of the support for "normal" tests,
similar to those the '#[test]' tests in userspace Rust. For
instance:
#[kunit_tests(my_suite)]
mod tests {
#[test]
fn my_test() {
assert_eq!(1 + 1, 2);
}
}
Unlike with doctests, the 'assert*!'s do not map to the KUnit
assertion APIs yet.
- Check Rust signatures at compile time for functions called from C
by name.
In particular, introduce a new '#[export]' macro that can be placed
in the Rust function definition. It will ensure that the function
declaration on the C side matches the signature on the Rust
function:
#[export]
pub unsafe extern "C" fn my_function(a: u8, b: i32) -> usize {
// ...
}
The macro essentially forces the compiler to compare the types of
the actual Rust function and the 'bindgen'-processed C signature.
These cases are rare so far. In the future, we may consider
introducing another tool, 'cbindgen', to generate C headers
automatically. Even then, having these functions explicitly marked
may be a good idea anyway.
- Enable the 'raw_ref_op' Rust feature: it is already stable, and
allows us to use the new '&raw' syntax, avoiding a couple macros.
After everyone has migrated, we will disallow the macros.
- Pass the correct target to 'bindgen' on Usermode Linux.
- Fix 'rusttest' build in macOS.
'kernel' crate:
- New 'hrtimer' module: add support for setting up intrusive timers
without allocating when starting the timer. Add support for
'Pin<Box<_>>', 'Arc<_>', 'Pin<&_>' and 'Pin<&mut _>' as pointer
types for use with timer callbacks. Add support for setting clock
source and timer mode.
- New 'dma' module: add a simple DMA coherent allocator abstraction
and a test sample driver.
- 'list' module: make the linked list 'Cursor' point between
elements, rather than at an element, which is more convenient to us
and allows for cursors to empty lists; and document it with
examples of how to perform common operations with the provided
methods.
- 'str' module: implement a few traits for 'BStr' as well as the
'strip_prefix()' method.
- 'sync' module: add 'Arc::as_ptr'.
- 'alloc' module: add 'Box::into_pin'.
- 'error' module: extend the 'Result' documentation, including a few
examples on different ways of handling errors, a warning about
using methods that may panic, and links to external documentation.
'macros' crate:
- 'module' macro: add the 'authors' key to support multiple authors.
The original key will be kept until everyone has migrated.
Documentation:
- Add error handling sections.
MAINTAINERS:
- Add Danilo Krummrich as reviewer of the Rust "subsystem".
- Add 'RUST [PIN-INIT]' entry with Benno Lossin as maintainer. It has
its own sub-tree.
- Add sub-tree for 'RUST [ALLOC]'.
- Add 'DMA MAPPING HELPERS DEVICE DRIVER API [RUST]' entry with
Abdiel Janulgue as primary maintainer. It will go through the
sub-tree of the 'RUST [ALLOC]' entry.
- Add 'HIGH-RESOLUTION TIMERS [RUST]' entry with Andreas Hindborg as
maintainer. It has its own sub-tree.
And a few other cleanups and improvements"
* tag 'rust-6.15' of git://git.kernel.org/pub/scm/linux/kernel/git/ojeda/linux: (71 commits)
rust: dma: add `Send` implementation for `CoherentAllocation`
rust: macros: fix `make rusttest` build on macOS
rust: block: refactor to use `&raw mut`
rust: enable `raw_ref_op` feature
rust: uaccess: name the correct function
rust: rbtree: fix comments referring to Box instead of KBox
rust: hrtimer: add maintainer entry
rust: hrtimer: add clocksource selection through `ClockId`
rust: hrtimer: add `HrTimerMode`
rust: hrtimer: implement `HrTimerPointer` for `Pin<Box<T>>`
rust: alloc: add `Box::into_pin`
rust: hrtimer: implement `UnsafeHrTimerPointer` for `Pin<&mut T>`
rust: hrtimer: implement `UnsafeHrTimerPointer` for `Pin<&T>`
rust: hrtimer: add `hrtimer::ScopedHrTimerPointer`
rust: hrtimer: add `UnsafeHrTimerPointer`
rust: hrtimer: allow timer restart from timer handler
rust: str: implement `strip_prefix` for `BStr`
rust: str: implement `AsRef<BStr>` for `[u8]` and `BStr`
rust: str: implement `Index` for `BStr`
rust: str: implement `PartialEq` for `BStr`
...
198 lines
6.2 KiB
Python
Executable File
198 lines
6.2 KiB
Python
Executable File
#!/usr/bin/env python3
|
|
# SPDX-License-Identifier: GPL-2.0
|
|
"""generate_rust_analyzer - Generates the `rust-project.json` file for `rust-analyzer`.
|
|
"""
|
|
|
|
import argparse
|
|
import json
|
|
import logging
|
|
import os
|
|
import pathlib
|
|
import subprocess
|
|
import sys
|
|
|
|
def args_crates_cfgs(cfgs):
|
|
crates_cfgs = {}
|
|
for cfg in cfgs:
|
|
crate, vals = cfg.split("=", 1)
|
|
crates_cfgs[crate] = vals.replace("--cfg", "").split()
|
|
|
|
return crates_cfgs
|
|
|
|
def generate_crates(srctree, objtree, sysroot_src, external_src, cfgs):
|
|
# Generate the configuration list.
|
|
cfg = []
|
|
with open(objtree / "include" / "generated" / "rustc_cfg") as fd:
|
|
for line in fd:
|
|
line = line.replace("--cfg=", "")
|
|
line = line.replace("\n", "")
|
|
cfg.append(line)
|
|
|
|
# Now fill the crates list -- dependencies need to come first.
|
|
#
|
|
# Avoid O(n^2) iterations by keeping a map of indexes.
|
|
crates = []
|
|
crates_indexes = {}
|
|
crates_cfgs = args_crates_cfgs(cfgs)
|
|
|
|
def append_crate(display_name, root_module, deps, cfg=[], is_workspace_member=True, is_proc_macro=False):
|
|
crate = {
|
|
"display_name": display_name,
|
|
"root_module": str(root_module),
|
|
"is_workspace_member": is_workspace_member,
|
|
"is_proc_macro": is_proc_macro,
|
|
"deps": [{"crate": crates_indexes[dep], "name": dep} for dep in deps],
|
|
"cfg": cfg,
|
|
"edition": "2021",
|
|
"env": {
|
|
"RUST_MODFILE": "This is only for rust-analyzer"
|
|
}
|
|
}
|
|
if is_proc_macro:
|
|
proc_macro_dylib_name = subprocess.check_output(
|
|
[os.environ["RUSTC"], "--print", "file-names", "--crate-name", display_name, "--crate-type", "proc-macro", "-"],
|
|
stdin=subprocess.DEVNULL,
|
|
).decode('utf-8').strip()
|
|
crate["proc_macro_dylib_path"] = f"{objtree}/rust/{proc_macro_dylib_name}"
|
|
crates_indexes[display_name] = len(crates)
|
|
crates.append(crate)
|
|
|
|
def append_sysroot_crate(
|
|
display_name,
|
|
deps,
|
|
cfg=[],
|
|
):
|
|
append_crate(
|
|
display_name,
|
|
sysroot_src / display_name / "src" / "lib.rs",
|
|
deps,
|
|
cfg,
|
|
is_workspace_member=False,
|
|
)
|
|
|
|
# NB: sysroot crates reexport items from one another so setting up our transitive dependencies
|
|
# here is important for ensuring that rust-analyzer can resolve symbols. The sources of truth
|
|
# for this dependency graph are `(sysroot_src / crate / "Cargo.toml" for crate in crates)`.
|
|
append_sysroot_crate("core", [], cfg=crates_cfgs.get("core", []))
|
|
append_sysroot_crate("alloc", ["core"])
|
|
append_sysroot_crate("std", ["alloc", "core"])
|
|
append_sysroot_crate("proc_macro", ["core", "std"])
|
|
|
|
append_crate(
|
|
"compiler_builtins",
|
|
srctree / "rust" / "compiler_builtins.rs",
|
|
[],
|
|
)
|
|
|
|
append_crate(
|
|
"macros",
|
|
srctree / "rust" / "macros" / "lib.rs",
|
|
["std", "proc_macro"],
|
|
is_proc_macro=True,
|
|
)
|
|
|
|
append_crate(
|
|
"build_error",
|
|
srctree / "rust" / "build_error.rs",
|
|
["core", "compiler_builtins"],
|
|
)
|
|
|
|
append_crate(
|
|
"pin_init_internal",
|
|
srctree / "rust" / "pin-init" / "internal" / "src" / "lib.rs",
|
|
[],
|
|
cfg=["kernel"],
|
|
is_proc_macro=True,
|
|
)
|
|
|
|
append_crate(
|
|
"pin_init",
|
|
srctree / "rust" / "pin-init" / "src" / "lib.rs",
|
|
["core", "pin_init_internal", "macros"],
|
|
cfg=["kernel"],
|
|
)
|
|
|
|
def append_crate_with_generated(
|
|
display_name,
|
|
deps,
|
|
):
|
|
append_crate(
|
|
display_name,
|
|
srctree / "rust"/ display_name / "lib.rs",
|
|
deps,
|
|
cfg=cfg,
|
|
)
|
|
crates[-1]["env"]["OBJTREE"] = str(objtree.resolve(True))
|
|
crates[-1]["source"] = {
|
|
"include_dirs": [
|
|
str(srctree / "rust" / display_name),
|
|
str(objtree / "rust")
|
|
],
|
|
"exclude_dirs": [],
|
|
}
|
|
|
|
append_crate_with_generated("bindings", ["core"])
|
|
append_crate_with_generated("uapi", ["core"])
|
|
append_crate_with_generated("kernel", ["core", "macros", "build_error", "pin-init", "bindings", "uapi"])
|
|
|
|
def is_root_crate(build_file, target):
|
|
try:
|
|
return f"{target}.o" in open(build_file).read()
|
|
except FileNotFoundError:
|
|
return False
|
|
|
|
# Then, the rest outside of `rust/`.
|
|
#
|
|
# We explicitly mention the top-level folders we want to cover.
|
|
extra_dirs = map(lambda dir: srctree / dir, ("samples", "drivers"))
|
|
if external_src is not None:
|
|
extra_dirs = [external_src]
|
|
for folder in extra_dirs:
|
|
for path in folder.rglob("*.rs"):
|
|
logging.info("Checking %s", path)
|
|
name = path.name.replace(".rs", "")
|
|
|
|
# Skip those that are not crate roots.
|
|
if not is_root_crate(path.parent / "Makefile", name) and \
|
|
not is_root_crate(path.parent / "Kbuild", name):
|
|
continue
|
|
|
|
logging.info("Adding %s", name)
|
|
append_crate(
|
|
name,
|
|
path,
|
|
["core", "kernel"],
|
|
cfg=cfg,
|
|
)
|
|
|
|
return crates
|
|
|
|
def main():
|
|
parser = argparse.ArgumentParser()
|
|
parser.add_argument('--verbose', '-v', action='store_true')
|
|
parser.add_argument('--cfgs', action='append', default=[])
|
|
parser.add_argument("srctree", type=pathlib.Path)
|
|
parser.add_argument("objtree", type=pathlib.Path)
|
|
parser.add_argument("sysroot", type=pathlib.Path)
|
|
parser.add_argument("sysroot_src", type=pathlib.Path)
|
|
parser.add_argument("exttree", type=pathlib.Path, nargs="?")
|
|
args = parser.parse_args()
|
|
|
|
logging.basicConfig(
|
|
format="[%(asctime)s] [%(levelname)s] %(message)s",
|
|
level=logging.INFO if args.verbose else logging.WARNING
|
|
)
|
|
|
|
# Making sure that the `sysroot` and `sysroot_src` belong to the same toolchain.
|
|
assert args.sysroot in args.sysroot_src.parents
|
|
|
|
rust_project = {
|
|
"crates": generate_crates(args.srctree, args.objtree, args.sysroot_src, args.exttree, args.cfgs),
|
|
"sysroot": str(args.sysroot),
|
|
}
|
|
|
|
json.dump(rust_project, sys.stdout, sort_keys=True, indent=4)
|
|
|
|
if __name__ == "__main__":
|
|
main()
|