mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2026-02-28 19:06:51 +01:00
Pull rust updates from Miguel Ojeda:
"Toolchain and infrastructure:
- Add '__rust_helper' annotation to the C helpers
This is needed to inline these helpers into Rust code
- Remove imports available via the prelude, treewide
This was possible thanks to a new lint in Klint that Gary has
implemented -- more Klint-related changes, including initial
upstream support, are coming
- Deduplicate pin-init flags
'kernel' crate:
- Add support for calling a function exactly once with the new
'do_once_lite!' macro (and 'OnceLite' type)
Based on this, add 'pr_*_once!' macros to print only once
- Add 'impl_flags!' macro for defining common bitflags operations:
impl_flags!(
/// Represents multiple permissions.
#[derive(Debug, Clone, Default, Copy, PartialEq, Eq)]
pub struct Permissions(u32);
/// Represents a single permission.
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
pub enum Permission {
/// Read permission.
Read = 1 << 0,
/// Write permission.
Write = 1 << 1,
/// Execute permission.
Execute = 1 << 2,
}
);
let mut f: Permissions = Permission::Read | Permission::Write;
assert!(f.contains(Permission::Read));
assert!(!f.contains(Permission::Execute));
f |= Permission::Execute;
assert!(f.contains(Permission::Execute));
let f2: Permissions = Permission::Write | Permission::Execute;
assert!((f ^ f2).contains(Permission::Read));
assert!(!(f ^ f2).contains(Permission::Write));
- 'bug' module: support 'CONFIG_DEBUG_BUGVERBOSE_DETAILED' in the
'warn_on!' macro in order to show the evaluated condition alongside
the file path:
------------[ cut here ]------------
WARNING: [val == 1] linux/samples/rust/rust_minimal.rs:27 at ...
Modules linked in: rust_minimal(+)
- Add safety module with 'unsafe_precondition_assert!' macro,
currently a wrapper for 'debug_assert!', intended to mark the
validation of safety preconditions where possible:
/// # Safety
///
/// The caller must ensure that `index` is less than `N`.
unsafe fn set_unchecked(&mut self, index: usize, value: T) {
unsafe_precondition_assert!(
index < N,
"set_unchecked() requires index ({index}) < N ({N})"
);
...
}
- Add instructions to 'build_assert!' documentation requesting to
always inline functions when used with function arguments
- 'ptr' module: replace 'build_assert!' with a 'const' one
- 'rbtree' module: reduce unsafe blocks on pointer derefs
- 'transmute' module: implement 'FromBytes' and 'AsBytes' for
inhabited ZSTs, and use it in Nova
- More treewide replacements of 'c_str!' with C string literals
'macros' crate:
- Rewrite most procedural macros ('module!', 'concat_idents!',
'#[export]', '#[vtable]', '#[kunit_tests]') to use the 'syn'
parsing library which we introduced last cycle, with better
diagnostics
This also allows to support '#[cfg]' properly in the '#[vtable]'
macro, to support arbitrary types in 'module!' macro (not just an
identifier) and to remove several custom parsing helpers we had
- Use 'quote!' from the recently vendored 'quote' library and remove
our custom one
The vendored one also allows us to avoid quoting '"' and '{}'
inside the template anymore and editors can now highlight it. In
addition, it improves robustness as it eliminates the need for
string quoting and escaping
- Use 'pin_init::zeroed()' to simplify KUnit code
'pin-init' crate:
- Rewrite all procedural macros ('[pin_]init!', '#[pin_data]',
'#[pinned_drop]', 'derive([Maybe]Zeroable)') to use the 'syn'
parsing library which we introduced last cycle, with better
diagnostics
- Implement 'InPlaceWrite' for '&'static mut MaybeUninit<T>'. This
enables users to use external allocation mechanisms such as
'static_cell'
- Support tuple structs in 'derive([Maybe]Zeroable)'
- Support attributes on fields in '[pin_]init!' (such as
'#[cfg(...)]')
- Add a '#[default_error(<type>)]' attribute to '[pin_]init!' to
override the default error (when no '? Error' is specified)
- Support packed structs in '[pin_]init!' with
'#[disable_initialized_field_access]'
- Remove 'try_[pin_]init!' in favor of merging their feature with
'[pin_]init!'. Update the kernel's own 'try_[pin_]init!' macros to
use the 'default_error' attribute
- Correct 'T: Sized' bounds to 'T: ?Sized' in the generated
'PinnedDrop' check by '#[pin_data]'
Documentation:
- Conclude the Rust experiment
MAINTAINERS:
- Add "RUST [RUST-ANALYZER]" entry for the rust-analyzer support.
Tamir and Jesung will take care of it. They have both been active
around it for a while. The new tree will flow through the Rust one
- Add Gary as maintainer for "RUST [PIN-INIT]"
- Update Boqun and Tamir emails to their kernel.org accounts
And a few other cleanups and improvements"
* tag 'rust-6.20-7.0' of git://git.kernel.org/pub/scm/linux/kernel/git/ojeda/linux: (59 commits)
rust: safety: introduce `unsafe_precondition_assert!` macro
rust: add `impl_flags!` macro for defining common bitflag operations
rust: print: Add pr_*_once macros
rust: bug: Support DEBUG_BUGVERBOSE_DETAILED option
rust: print: Add support for calling a function exactly once
rust: kbuild: deduplicate pin-init flags
gpu: nova-core: remove imports available via prelude
rust: clk: replace `kernel::c_str!` with C-Strings
MAINTAINERS: Update my email address to @kernel.org
rust: macros: support `#[cfg]` properly in `#[vtable]` macro.
rust: kunit: use `pin_init::zeroed` instead of custom null value
rust: macros: rearrange `#[doc(hidden)]` in `module!` macro
rust: macros: allow arbitrary types to be used in `module!` macro
rust: macros: convert `#[kunit_tests]` macro to use `syn`
rust: macros: convert `concat_idents!` to use `syn`
rust: macros: convert `#[export]` to use `syn`
rust: macros: use `quote!` for `module!` macro
rust: macros: use `syn` to parse `module!` macro
rust: macros: convert `#[vtable]` macro to use `syn`
rust: macros: use `quote!` from vendored crate
...
249 lines
8.3 KiB
Python
Executable File
249 lines
8.3 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.split()
|
|
|
|
return crates_cfgs
|
|
|
|
def generate_crates(srctree, objtree, sysroot_src, external_src, cfgs, core_edition):
|
|
# 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, edition="2021"):
|
|
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": edition,
|
|
"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,
|
|
# Miguel Ojeda writes:
|
|
#
|
|
# > ... in principle even the sysroot crates may have different
|
|
# > editions.
|
|
# >
|
|
# > For instance, in the move to 2024, it seems all happened at once
|
|
# > in 1.87.0 in these upstream commits:
|
|
# >
|
|
# > 0e071c2c6a58 ("Migrate core to Rust 2024")
|
|
# > f505d4e8e380 ("Migrate alloc to Rust 2024")
|
|
# > 0b2489c226c3 ("Migrate proc_macro to Rust 2024")
|
|
# > 993359e70112 ("Migrate std to Rust 2024")
|
|
# >
|
|
# > But in the previous move to 2021, `std` moved in 1.59.0, while
|
|
# > the others in 1.60.0:
|
|
# >
|
|
# > b656384d8398 ("Update stdlib to the 2021 edition")
|
|
# > 06a1c14d52a8 ("Switch all libraries to the 2021 edition")
|
|
#
|
|
# Link: https://lore.kernel.org/all/CANiq72kd9bHdKaAm=8xCUhSHMy2csyVed69bOc4dXyFAW4sfuw@mail.gmail.com/
|
|
#
|
|
# At the time of writing all rust versions we support build the
|
|
# sysroot crates with the same edition. We may need to relax this
|
|
# assumption if future edition moves span multiple rust versions.
|
|
edition=core_edition,
|
|
)
|
|
|
|
# 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",
|
|
["core"],
|
|
)
|
|
|
|
append_crate(
|
|
"proc_macro2",
|
|
srctree / "rust" / "proc-macro2" / "lib.rs",
|
|
["core", "alloc", "std", "proc_macro"],
|
|
cfg=crates_cfgs["proc_macro2"],
|
|
)
|
|
|
|
append_crate(
|
|
"quote",
|
|
srctree / "rust" / "quote" / "lib.rs",
|
|
["core", "alloc", "std", "proc_macro", "proc_macro2"],
|
|
cfg=crates_cfgs["quote"],
|
|
edition="2018",
|
|
)
|
|
|
|
append_crate(
|
|
"syn",
|
|
srctree / "rust" / "syn" / "lib.rs",
|
|
["std", "proc_macro", "proc_macro2", "quote"],
|
|
cfg=crates_cfgs["syn"],
|
|
)
|
|
|
|
append_crate(
|
|
"macros",
|
|
srctree / "rust" / "macros" / "lib.rs",
|
|
["std", "proc_macro", "proc_macro2", "quote", "syn"],
|
|
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",
|
|
["std", "proc_macro", "proc_macro2", "quote", "syn"],
|
|
cfg=["kernel"],
|
|
is_proc_macro=True,
|
|
)
|
|
|
|
append_crate(
|
|
"pin_init",
|
|
srctree / "rust" / "pin-init" / "src" / "lib.rs",
|
|
["core", "compiler_builtins", "pin_init_internal", "macros"],
|
|
cfg=["kernel"],
|
|
)
|
|
|
|
append_crate(
|
|
"ffi",
|
|
srctree / "rust" / "ffi.rs",
|
|
["core", "compiler_builtins"],
|
|
)
|
|
|
|
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", "ffi", "pin_init"])
|
|
append_crate_with_generated("uapi", ["core", "ffi", "pin_init"])
|
|
append_crate_with_generated("kernel", ["core", "macros", "build_error", "pin_init", "ffi", "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", "pin_init"],
|
|
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("core_edition")
|
|
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
|
|
)
|
|
|
|
rust_project = {
|
|
"crates": generate_crates(args.srctree, args.objtree, args.sysroot_src, args.exttree, args.cfgs, args.core_edition),
|
|
"sysroot": str(args.sysroot),
|
|
}
|
|
|
|
json.dump(rust_project, sys.stdout, sort_keys=True, indent=4)
|
|
|
|
if __name__ == "__main__":
|
|
main()
|