Merge tag 'rust-6.14' of git://git.kernel.org/pub/scm/linux/kernel/git/ojeda/linux
Pull rust updates from Miguel Ojeda:
"Toolchain and infrastructure:
- Finish the move to custom FFI integer types started in the previous
cycle and finally map 'long' to 'isize' and 'char' to 'u8'. Do a
few cleanups on top thanks to that.
- Start to use 'derive(CoercePointee)' on Rust >= 1.84.0.
This is a major milestone on the path to build the kernel using
only stable Rust features. In particular, previously we were using
the unstable features 'coerce_unsized', 'dispatch_from_dyn' and
'unsize', and now we will use the new 'derive_coerce_pointee' one,
which is on track to stabilization. This new feature is a macro
that essentially expands into code that internally uses the
unstable features that we were using before, without having to
expose those.
With it, stable Rust users, including the kernel, will be able to
build custom smart pointers that work with trait objects, e.g.:
fn f(p: &Arc<dyn Display>) {
pr_info!("{p}\n");
}
let a: Arc<dyn Display> = Arc::new(42i32, GFP_KERNEL)?;
let b: Arc<dyn Display> = Arc::new("hello there", GFP_KERNEL)?;
f(&a); // Prints "42".
f(&b); // Prints "hello there".
Together with the 'arbitrary_self_types' feature that we started
using in the previous cycle, using our custom smart pointers like
'Arc' will eventually only rely in stable Rust.
- Introduce 'PROCMACROLDFLAGS' environment variable to allow to link
Rust proc macros using different flags than those used for linking
Rust host programs (e.g. when 'rustc' uses a different C library
than the host programs' one), which Android needs.
- Help kernel builds under macOS with Rust enabled by accomodating
other naming conventions for dynamic libraries (i.e. '.so' vs.
'.dylib') which are used for Rust procedural macros. The actual
support for macOS (i.e. the rest of the pieces needed) is provided
out-of-tree by others, following the policy used for other parts of
the kernel by Kbuild.
- Run Clippy for 'rusttest' code too and clean the bits it spotted.
- Provide Clippy with the minimum supported Rust version to improve
the suggestions it gives.
- Document 'bindgen' 0.71.0 regression.
'kernel' crate:
- 'build_error!': move users of the hidden function to the documented
macro, prevent such uses in the future by moving the function
elsewhere and add the macro to the prelude.
- 'types' module: add improved version of 'ForeignOwnable::borrow_mut'
(which was removed in the past since it was problematic); change
'ForeignOwnable' pointer type to '*mut'.
- 'alloc' module: implement 'Display' for 'Box' and align the 'Debug'
implementation to it; add example (doctest) for 'ArrayLayout::new()'
- 'sync' module: document 'PhantomData' in 'Arc'; use
'NonNull::new_unchecked' in 'ForeignOwnable for Arc' impl.
- 'uaccess' module: accept 'Vec's with different allocators in
'UserSliceReader::read_all'.
- 'workqueue' module: enable run-testing a couple more doctests.
- 'error' module: simplify 'from_errno()'.
- 'block' module: fix formatting in code documentation (a lint to catch
these is being implemented).
- Avoid 'unwrap()'s in doctests, which also improves the examples by
showing how kernel code is supposed to be written.
- Avoid 'as' casts with 'cast{,_mut}' calls which are a bit safer.
And a few other cleanups"
* tag 'rust-6.14' of git://git.kernel.org/pub/scm/linux/kernel/git/ojeda/linux: (32 commits)
kbuild: rust: add PROCMACROLDFLAGS
rust: uaccess: generalize userSliceReader to support any Vec
rust: kernel: add improved version of `ForeignOwnable::borrow_mut`
rust: kernel: reorder `ForeignOwnable` items
rust: kernel: change `ForeignOwnable` pointer to mut
rust: arc: split unsafe block, add missing comment
rust: types: avoid `as` casts
rust: arc: use `NonNull::new_unchecked`
rust: use derive(CoercePointee) on rustc >= 1.84.0
rust: alloc: add doctest for `ArrayLayout::new()`
rust: init: update `stack_try_pin_init` examples
rust: error: import `kernel`'s `LayoutError` instead of `core`'s
rust: str: replace unwraps with question mark operators
rust: page: remove unnecessary helper function from doctest
rust: rbtree: remove unwrap in asserts
rust: init: replace unwraps with question mark operators
rust: use host dylib naming convention to support macOS
rust: add `build_error!` to the prelude
rust: kernel: move `build_error` hidden function to prevent mistakes
rust: use the `build_error!` macro, not the hidden function
...
No related branches found
No related tags found
Showing
- .clippy.toml 2 additions, 0 deletions.clippy.toml
- .gitignore 1 addition, 0 deletions.gitignore
- Documentation/kbuild/kbuild.rst 11 additions, 0 deletionsDocumentation/kbuild/kbuild.rst
- Makefile 3 additions, 2 deletionsMakefile
- drivers/gpu/drm/drm_panic_qr.rs 1 addition, 1 deletiondrivers/gpu/drm/drm_panic_qr.rs
- init/Kconfig 7 additions, 2 deletionsinit/Kconfig
- rust/Makefile 17 additions, 15 deletionsrust/Makefile
- rust/ffi.rs 36 additions, 1 deletionrust/ffi.rs
- rust/kernel/alloc.rs 1 addition, 1 deletionrust/kernel/alloc.rs
- rust/kernel/alloc/kbox.rs 42 additions, 11 deletionsrust/kernel/alloc/kbox.rs
- rust/kernel/alloc/layout.rs 19 additions, 0 deletionsrust/kernel/alloc/layout.rs
- rust/kernel/block/mq/gen_disk.rs 3 additions, 3 deletionsrust/kernel/block/mq/gen_disk.rs
- rust/kernel/block/mq/operations.rs 2 additions, 1 deletionrust/kernel/block/mq/operations.rs
- rust/kernel/build_assert.rs 7 additions, 5 deletionsrust/kernel/build_assert.rs
- rust/kernel/device.rs 2 additions, 2 deletionsrust/kernel/device.rs
- rust/kernel/error.rs 9 additions, 14 deletionsrust/kernel/error.rs
- rust/kernel/firmware.rs 1 addition, 1 deletionrust/kernel/firmware.rs
- rust/kernel/init.rs 24 additions, 6 deletionsrust/kernel/init.rs
- rust/kernel/lib.rs 6 additions, 7 deletionsrust/kernel/lib.rs
- rust/kernel/list/arc.rs 6 additions, 3 deletionsrust/kernel/list/arc.rs
Please register or sign in to comment