Commit 4b014749 authored by Lyude Paul's avatar Lyude Paul Committed by Andreas Hindborg
Browse files

rust: hrtimer: Add HrTimer::expires() 



Add a simple callback for retrieving the current expiry time for an
HrTimer. In rvkms, we use the HrTimer expiry value in order to calculate
the approximate vblank timestamp during each emulated vblank interrupt.

Signed-off-by: default avatarLyude Paul <lyude@redhat.com>
Reviewed-by: default avatarAndreas Hindborg <a.hindborg@kernel.org>
Link: https://lore.kernel.org/r/20250821193259.964504-8-lyude@redhat.com


Signed-off-by: default avatarAndreas Hindborg <a.hindborg@kernel.org>
parent 583802cc

rust/kernel/time.rs

+0 −1
Original line number Diff line number Diff line
@@ -211,7 +211,6 @@ pub(crate) fn as_nanos(&self) -> i64 { 
    /// # Safety

    ///

    /// The caller promises that `ktime` is in the range from 0 to `KTIME_MAX`.

    #[expect(unused)]

    #[inline]

    pub(crate) unsafe fn from_ktime(ktime: bindings::ktime_t) -> Self {

        debug_assert!(ktime >= 0);

rust/kernel/time/hrtimer.rs

+23 −0
Original line number Diff line number Diff line
@@ -223,6 +223,29 @@ pub fn forward_now(self: Pin<&mut Self>, interval: Delta) -> u64 
    {

        self.forward(HrTimerInstant::<T>::now(), interval)

    }



    /// Return the time expiry for this [`HrTimer`].

    ///

    /// This value should only be used as a snapshot, as the actual expiry time could change after

    /// this function is called.

    pub fn expires(&self) -> HrTimerInstant<T>

    where

        T: HasHrTimer<T>,

    {

        // SAFETY: `self` is an immutable reference and thus always points to a valid `HrTimer`.

        let c_timer_ptr = unsafe { HrTimer::raw_get(self) };



        // SAFETY:

        // - Timers cannot have negative ktime_t values as their expiration time.

        // - There's no actual locking here, a racy read is fine and expected

        unsafe {

            Instant::from_ktime(

                // This `read_volatile` is intended to correspond to a READ_ONCE call.

                // FIXME(read_once): Replace with `read_once` when available on the Rust side.

                core::ptr::read_volatile(&raw const ((*c_timer_ptr).node.expires)),

            )

        }

    }

}



/// Implemented by pointer types that point to structs that contain a [`HrTimer`].