Commit 2c815938 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'rust-fixes-6.9' of https://github.com/Rust-for-Linux/linux 

Pull Rust fixes from Miguel Ojeda:

 - Soundness: make internal functions generated by the 'module!' macro
   inaccessible, do not implement 'Zeroable' for 'Infallible' and
   require 'Send' for the 'Module' trait.

 - Build: avoid errors with "empty" files and workaround 'rustdoc' ICE.

 - Kconfig: depend on '!CFI_CLANG' and avoid selecting 'CONSTRUCTORS'.

 - Code docs: remove non-existing key from 'module!' macro example.

 - Docs: trivial rendering fix in arch table.

* tag 'rust-fixes-6.9' of https://github.com/Rust-for-Linux/linux:
  rust: remove `params` from `module` macro example
  kbuild: rust: force `alloc` extern to allow "empty" Rust files
  kbuild: rust: remove unneeded `@rustc_cfg` to avoid ICE
  rust: kernel: require `Send` for `Module` implementations
  rust: phy: implement `Send` for `Registration`
  rust: make mutually exclusive with CFI_CLANG
  rust: macros: fix soundness issue in `module!` macro
  rust: init: remove impl Zeroable for Infallible
  docs: rust: fix improper rendering in Arch Support page
  rust: don't select CONSTRUCTORS
parents 57865f39 19843452

Documentation/rust/arch-support.rst

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ support corresponds to ``S`` values in the ``MAINTAINERS`` file. 
Architecture   Level of support  Constraints

=============  ================  ==============================================

``arm64``      Maintained        Little Endian only.

``loongarch``  Maintained        -

``loongarch``  Maintained        \-

``um``         Maintained        ``x86_64`` only.

``x86``        Maintained        ``x86_64`` only.

=============  ================  ==============================================

init/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -1899,11 +1899,11 @@ config RUST 
	bool "Rust support"

	depends on HAVE_RUST

	depends on RUST_IS_AVAILABLE

	depends on !CFI_CLANG

	depends on !MODVERSIONS

	depends on !GCC_PLUGINS

	depends on !RANDSTRUCT

	depends on !DEBUG_INFO_BTF || PAHOLE_HAS_LANG_EXCLUDE

	select CONSTRUCTORS

	help

	  Enables Rust support in the kernel.

rust/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -175,7 +175,6 @@ quiet_cmd_rustdoc_test_kernel = RUSTDOC TK $< 
	mkdir -p $(objtree)/$(obj)/test/doctests/kernel; \

	OBJTREE=$(abspath $(objtree)) \

	$(RUSTDOC) --test $(rust_flags) \

		@$(objtree)/include/generated/rustc_cfg \

		-L$(objtree)/$(obj) --extern alloc --extern kernel \

		--extern build_error --extern macros \

		--extern bindings --extern uapi \

rust/kernel/init.rs

+9 −2
Original line number Diff line number Diff line
@@ -1292,8 +1292,15 @@ macro_rules! impl_zeroable { 
    i8, i16, i32, i64, i128, isize,

    f32, f64,



    // SAFETY: These are ZSTs, there is nothing to zero.

    {<T: ?Sized>} PhantomData<T>, core::marker::PhantomPinned, Infallible, (),

    // Note: do not add uninhabited types (such as `!` or `core::convert::Infallible`) to this list;

    // creating an instance of an uninhabited type is immediate undefined behavior. For more on

    // uninhabited/empty types, consult The Rustonomicon:

    // <https://doc.rust-lang.org/stable/nomicon/exotic-sizes.html#empty-types>. The Rust Reference

    // also has information on undefined behavior:

    // <https://doc.rust-lang.org/stable/reference/behavior-considered-undefined.html>.

    //

    // SAFETY: These are inhabited ZSTs; there is nothing to zero and a valid value exists.

    {<T: ?Sized>} PhantomData<T>, core::marker::PhantomPinned, (),



    // SAFETY: Type is allowed to take any value, including all zeros.

    {<T>} MaybeUninit<T>,

rust/kernel/lib.rs

+1 −1
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ 
/// The top level entrypoint to implementing a kernel module.

///

/// For any teardown or cleanup operations, your type may implement [`Drop`].

pub trait Module: Sized + Sync {

pub trait Module: Sized + Sync + Send {

    /// Called at module initialization time.

    ///

    /// Use this method to perform whatever setup or registration your module