Commit cd3a56ac authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'rust-fixes-6.14-3' of git://git.kernel.org/pub/scm/linux/kernel/git/ojeda/linux 

Pull rust fixes from Miguel Ojeda:
 "Toolchain and infrastructure:

   - Disallow BTF generation with Rust + LTO

   - Improve rust-analyzer support

  'kernel' crate:

   - 'init' module: remove 'Zeroable' implementation for a couple types
     that should not have it

   - 'alloc' module: fix macOS failure in host test by satisfying POSIX
     alignment requirement

   - Add missing '\n's to 'pr_*!()' calls

  And a couple other minor cleanups"

* tag 'rust-fixes-6.14-3' of git://git.kernel.org/pub/scm/linux/kernel/git/ojeda/linux:
  scripts: generate_rust_analyzer: add uapi crate
  scripts: generate_rust_analyzer: add missing include_dirs
  scripts: generate_rust_analyzer: add missing macros deps
  rust: Disallow BTF generation with Rust + LTO
  rust: task: fix `SAFETY` comment in `Task::wake_up`
  rust: workqueue: add missing newline to pr_info! examples
  rust: sync: add missing newline in locked_by log example
  rust: init: add missing newline to pr_info! calls
  rust: error: add missing newline to pr_warn! calls
  rust: docs: add missing newline to printing macro examples
  rust: alloc: satisfy POSIX alignment requirement
  rust: init: fix `Zeroable` implementation for `Option<NonNull<T>>` and `Option<KBox<T>>`
  rust: remove leftover mentions of the `alloc` crate
parents eb88e6bf a1eb95d6

Documentation/rust/quick-start.rst

+1 −1
Original line number Diff line number Diff line
@@ -145,7 +145,7 @@ Rust standard library source 
****************************



The Rust standard library source is required because the build system will

cross-compile ``core`` and ``alloc``.

cross-compile ``core``.



If ``rustup`` is being used, run::

Documentation/rust/testing.rst

+1 −1
Original line number Diff line number Diff line
@@ -97,7 +97,7 @@ operator are also supported as usual, e.g.: 


	/// ```

	/// # use kernel::{spawn_work_item, workqueue};

	/// spawn_work_item!(workqueue::system(), || pr_info!("x"))?;

	/// spawn_work_item!(workqueue::system(), || pr_info!("x\n"))?;

	/// # Ok::<(), Error>(())

	/// ```

init/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -1973,7 +1973,7 @@ config RUST 
	depends on !MODVERSIONS || GENDWARFKSYMS

	depends on !GCC_PLUGIN_RANDSTRUCT

	depends on !RANDSTRUCT

	depends on !DEBUG_INFO_BTF || PAHOLE_HAS_LANG_EXCLUDE

	depends on !DEBUG_INFO_BTF || (PAHOLE_HAS_LANG_EXCLUDE && !LTO)

	depends on !CFI_CLANG || HAVE_CFI_ICALL_NORMALIZE_INTEGERS_RUSTC

	select CFI_ICALL_NORMALIZE_INTEGERS if CFI_CLANG

	depends on !CALL_PADDING || RUSTC_VERSION >= 108100

rust/kernel/alloc/allocator_test.rs

+18 −0
Original line number Diff line number Diff line
@@ -62,6 +62,24 @@ unsafe fn realloc( 
            ));

        }



        // ISO C (ISO/IEC 9899:2011) defines `aligned_alloc`:

        //

        // > The value of alignment shall be a valid alignment supported by the implementation

        // [...].

        //

        // As an example of the "supported by the implementation" requirement, POSIX.1-2001 (IEEE

        // 1003.1-2001) defines `posix_memalign`:

        //

        // > The value of alignment shall be a power of two multiple of sizeof (void *).

        //

        // and POSIX-based implementations of `aligned_alloc` inherit this requirement. At the time

        // of writing, this is known to be the case on macOS (but not in glibc).

        //

        // Satisfy the stricter requirement to avoid spurious test failures on some platforms.

        let min_align = core::mem::size_of::<*const crate::ffi::c_void>();

        let layout = layout.align_to(min_align).map_err(|_| AllocError)?;

        let layout = layout.pad_to_align();



        // SAFETY: Returns either NULL or a pointer to a memory allocation that satisfies or

        // exceeds the given size and alignment requirements.

        let dst = unsafe { libc_aligned_alloc(layout.align(), layout.size()) } as *mut u8;

rust/kernel/error.rs

+1 −1
Original line number Diff line number Diff line
@@ -107,7 +107,7 @@ pub fn from_errno(errno: crate::ffi::c_int) -> Error { 
        } else {

            // TODO: Make it a `WARN_ONCE` once available.

            crate::pr_warn!(

                "attempted to create `Error` with out of range `errno`: {}",

                "attempted to create `Error` with out of range `errno`: {}\n",

                errno

            );

            code::EINVAL