Commit d398a68e authored by Peter Zijlstra's avatar Peter Zijlstra
Browse files

Merge tag 'rust-sched.2025.06.24' of... 

Merge tag 'rust-sched.2025.06.24' of git://git.kernel.org/pub/scm/linux/kernel/git/boqun/linux

 into sched/core

Rust task & schedule changes for v6.17:

- Make Task, CondVar and PollCondVar methods inline to avoid unnecessary
  function calls

- Add might_sleep() support for Rust code: Rust's "#[track_caller]"
  mechanism is used so that Rust's might_sleep() doesn't need to be
  defined as a macro

Signed-off-by: default avatarPeter Zijlstra <peterz@infradead.org>

# -----BEGIN PGP SIGNATURE-----
#
# iQEzBAABCAAdFiEEj5IosQTPz8XU1wRHSXnow7UH+rgFAmhbLOgACgkQSXnow7UH
# +riscwf/e/+KmJTox5/JOqs6yxxQdCHMaGnMK62E5AII7NsiUI8+XB9z6efzCMmy
# kS2W7aCmBZX67Y1B/xRL/ArHMBAJBi/CrCedZJcmzfB9aMa4Lj4mgiPkbUXkxE6Q
# F5CDQK21ftu+0Q7Hhlq92ec17ZWodOvNxCFBBmjtQqUvBzj0dY45jcG7brs+N+1Z
# t9UO3YokzukNqpIXTpG0HFP+XNafWWCgn9iIQ44lRxIaAoPI44uJjh1OXLTrZ1M9
# EMWYIrsY3b71Im78l6pzr+UOzJdJLI+QCBiz7ySLYz3kZ5dEfFdJOsumbc0G8A69
# VSGDFPEbJxZYuMxrH0E44XmxH4rJdA==
# =gD/Y
# -----END PGP SIGNATURE-----
# gpg: Signature made Wed 25 Jun 2025 12:55:36 AM CEST
# gpg:                using RSA key 8F9228B104CFCFC5D4D704474979E8C3B507FAB8
# gpg: Can't check signature: No public key
parents 5bc34be4 7e611710

init/Kconfig

+3 −0
Original line number Diff line number Diff line
@@ -142,6 +142,9 @@ config RUSTC_HAS_SPAN_FILE 
config RUSTC_HAS_UNNECESSARY_TRANSMUTES

	def_bool RUSTC_VERSION >= 108800



config RUSTC_HAS_FILE_WITH_NUL

	def_bool RUSTC_VERSION >= 108900



config PAHOLE_VERSION

	int

	default $(shell,$(srctree)/scripts/pahole-version.sh $(PAHOLE))

rust/helpers/task.c

+6 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0



#include <linux/kernel.h>

#include <linux/sched/task.h>



void rust_helper_might_resched(void)

{

	might_resched();

}



struct task_struct *rust_helper_get_current(void)

{

	return current;

rust/kernel/lib.rs

+48 −0
Original line number Diff line number Diff line
@@ -40,6 +40,10 @@ 
#![cfg_attr(not(CONFIG_RUSTC_HAS_COERCE_POINTEE), feature(coerce_unsized))]

#![cfg_attr(not(CONFIG_RUSTC_HAS_COERCE_POINTEE), feature(dispatch_from_dyn))]

#![cfg_attr(not(CONFIG_RUSTC_HAS_COERCE_POINTEE), feature(unsize))]

//

// `feature(file_with_nul)` is expected to become stable. Before Rust 1.89.0, it did not exist, so

// enable it conditionally.

#![cfg_attr(CONFIG_RUSTC_HAS_FILE_WITH_NUL, feature(file_with_nul))]



// Ensure conditional compilation based on the kernel configuration works;

// otherwise we may silently break things like initcall handling.
@@ -274,3 +278,47 @@ macro_rules! asm { 
        ::core::arch::asm!( $($asm)*, $($rest)* )

    };

}



/// Gets the C string file name of a [`Location`].

///

/// If `file_with_nul()` is not available, returns a string that warns about it.

///

/// [`Location`]: core::panic::Location

///

/// # Examples

///

/// ```

/// # use kernel::file_from_location;

///

/// #[track_caller]

/// fn foo() {

///     let caller = core::panic::Location::caller();

///

///     // Output:

///     // - A path like "rust/kernel/example.rs" if file_with_nul() is available.

///     // - "<Location::file_with_nul() not supported>" otherwise.

///     let caller_file = file_from_location(caller);

///

///     // Prints out the message with caller's file name.

///     pr_info!("foo() called in file {caller_file:?}\n");

///

///     # if cfg!(CONFIG_RUSTC_HAS_FILE_WITH_NUL) {

///     #     assert_eq!(Ok(caller.file()), caller_file.to_str());

///     # }

/// }

///

/// # foo();

/// ```

#[inline]

pub fn file_from_location<'a>(loc: &'a core::panic::Location<'a>) -> &'a core::ffi::CStr {

    #[cfg(CONFIG_RUSTC_HAS_FILE_WITH_NUL)]

    {

        loc.file_with_nul()

    }



    #[cfg(not(CONFIG_RUSTC_HAS_FILE_WITH_NUL))]

    {

        let _ = loc;

        c"<Location::file_with_nul() not supported>"

    }

}

rust/kernel/sync/condvar.rs

+3 −0
Original line number Diff line number Diff line
@@ -216,6 +216,7 @@ fn notify(&self, count: c_int) { 
    /// This method behaves like `notify_one`, except that it hints to the scheduler that the

    /// current thread is about to go to sleep, so it should schedule the target thread on the same

    /// CPU.

    #[inline]

    pub fn notify_sync(&self) {

        // SAFETY: `wait_queue_head` points to valid memory.

        unsafe { bindings::__wake_up_sync(self.wait_queue_head.get(), TASK_NORMAL) };
@@ -225,6 +226,7 @@ pub fn notify_sync(&self) { 
    ///

    /// This is not 'sticky' in the sense that if no thread is waiting, the notification is lost

    /// completely (as opposed to automatically waking up the next waiter).

    #[inline]

    pub fn notify_one(&self) {

        self.notify(1);

    }
@@ -233,6 +235,7 @@ pub fn notify_one(&self) { 
    ///

    /// This is not 'sticky' in the sense that if no thread is waiting, the notification is lost

    /// completely (as opposed to automatically waking up the next waiter).

    #[inline]

    pub fn notify_all(&self) {

        self.notify(0);

    }

rust/kernel/sync/poll.rs

+1 −0
Original line number Diff line number Diff line
@@ -107,6 +107,7 @@ fn deref(&self) -> &CondVar { 


#[pinned_drop]

impl PinnedDrop for PollCondVar {

    #[inline]

    fn drop(self: Pin<&mut Self>) {

        // Clear anything registered using `register_wait`.

        //