rust-for-linux.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Lyude Paul <lyude@redhat.com>
To: rust-for-linux@vger.kernel.org,
	Andreas Hindborg <a.hindborg@kernel.org>,
	linux-kernel@vger.kernel.org
Cc: "Boqun Feng" <boqun.feng@gmail.com>,
	"FUJITA Tomonori" <fujita.tomonori@gmail.com>,
	"Frederic Weisbecker" <frederic@kernel.org>,
	"Thomas Gleixner" <tglx@linutronix.de>,
	"Anna-Maria Behnsen" <anna-maria@linutronix.de>,
	"John Stultz" <jstultz@google.com>,
	"Stephen Boyd" <sboyd@kernel.org>,
	"Miguel Ojeda" <ojeda@kernel.org>,
	"Alex Gaynor" <alex.gaynor@gmail.com>,
	"Gary Guo" <gary@garyguo.net>,
	"Björn Roy Baron" <bjorn3_gh@protonmail.com>,
	"Benno Lossin" <benno.lossin@proton.me>,
	"Alice Ryhl" <aliceryhl@google.com>,
	"Trevor Gross" <tmgross@umich.edu>,
	"Danilo Krummrich" <dakr@kernel.org>
Subject: [PATCH v2 4/8] rust: hrtimer: Add HrTimerClockBase
Date: Tue, 15 Apr 2025 15:48:25 -0400	[thread overview]
Message-ID: <20250415195020.413478-5-lyude@redhat.com> (raw)
In-Reply-To: <20250415195020.413478-1-lyude@redhat.com>

This adds a simple wrapper for the hrtimer_clock_base struct, which can be
obtained from a HrTimerCallbackContext. We'll use this in the next commit to
add a function to acquire the current time for the base clock driving a
hrtimer.

Signed-off-by: Lyude Paul <lyude@redhat.com>

---
V2:
* Convert safety comment to invariant comment in from_raw()
- Add raw_clock_base() and implement clock_base() on HrTimer<T> as well

Signed-off-by: Lyude Paul <lyude@redhat.com>
---
 rust/kernel/time/hrtimer.rs | 50 +++++++++++++++++++++++++++++++++++++
 1 file changed, 50 insertions(+)

diff --git a/rust/kernel/time/hrtimer.rs b/rust/kernel/time/hrtimer.rs
index 507fff67f8ab2..a56c66104f692 100644
--- a/rust/kernel/time/hrtimer.rs
+++ b/rust/kernel/time/hrtimer.rs
@@ -183,6 +183,25 @@ unsafe fn raw_forward(self_ptr: *mut Self, now: Instant, interval: Delta) -> u64
         }
     }
 
+    /// Retrieve the [`HrTimerClockBase`] for a given timer pointer.
+    ///
+    /// # Safety
+    ///
+    /// `self_ptr` must point to a valid `Self`.
+    unsafe fn raw_clock_base<'a>(self_ptr: *const Self) -> &'a HrTimerClockBase {
+        // SAFETY:
+        // - By our safety contract, `self_ptr` always points to a valid `HrTimer<T>`.
+        // - `base` is initialized and points to a valid `hrtimer_clock_base` for as long as
+        //   `HrTimer<T>` is exposed to users.
+        unsafe { HrTimerClockBase::from_raw((*Self::raw_get(self_ptr)).base) }
+    }
+
+    /// Retrieve the [`HrTimerClockBase`] for this [`HrTimer`].
+    pub fn clock_base(&self) -> &HrTimerClockBase {
+        // SAFETY: `self` is an immutable reference and thus always points to a valid `HrTimer`
+        unsafe { Self::raw_clock_base(self) }
+    }
+
     /// Forward the timer expiry so it expires at `duration` after `now`.
     ///
     /// This is mainly useful for timer types that can start off providing a mutable reference (e.g.
@@ -200,6 +219,30 @@ pub fn forward(&mut self, now: Instant, duration: Delta) -> u64 {
     }
 }
 
+/// The timer base for a specific clock.
+///
+/// # Invariants
+///
+/// The layout of this type is equivalent to that of `struct hrtimer_clock_base`.
+#[repr(transparent)]
+pub struct HrTimerClockBase(Opaque<bindings::hrtimer_clock_base>);
+
+impl HrTimerClockBase {
+    /// Retrieve a reference to a [`HrTimerClockBase`] from `ptr`.
+    ///
+    /// # Safety
+    ///
+    /// `ptr` must point to a live `struct hrtimer_clock_base`.
+    unsafe fn from_raw<'a>(ptr: *mut bindings::hrtimer_clock_base) -> &'a Self {
+        // INVARIANT:
+        // - `ptr` is guaranteed to point to a live `struct hrtimer_clock_base` by our safety
+        //   contract.
+        // SAFETY:
+        // - Our data layout is equivalent to said struct via our type invariants.
+        unsafe { &*ptr.cast() }
+    }
+}
+
 /// Implemented by pointer types that point to structs that contain a [`HrTimer`].
 ///
 /// `Self` must be [`Sync`] because it is passed to timer callbacks in another
@@ -542,6 +585,13 @@ pub(crate) unsafe fn from_raw(timer: *mut HrTimer<T>) -> Self {
         Self(unsafe { NonNull::new_unchecked(timer) }, PhantomData)
     }
 
+    /// Get the [`HrTimerClockBase`] for the [`HrTimer`] associated with this
+    /// [`HrTimerCallbackContext`].
+    pub fn clock_base(&self) -> &HrTimerClockBase {
+        // SAFETY: By our type invariants, `self.0` always points to a valid `HrTimer<T>`.
+        unsafe { HrTimer::<T>::raw_clock_base(self.0.as_ptr()) }
+    }
+
     /// Forward the timer expiry so it expires at `duration` after `now`.
     ///
     /// Note that this does not requeue the timer, it simply updates its expiry value. It returns
-- 
2.48.1


  parent reply	other threads:[~2025-04-15 19:51 UTC|newest]

Thread overview: 31+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-04-15 19:48 [PATCH v2 0/8] rust/hrtimer: Various hrtimer + time additions Lyude Paul
2025-04-15 19:48 ` [PATCH v2 1/8] rust: hrtimer: Document the return value for HrTimerHandle::cancel() Lyude Paul
2025-04-23  8:36   ` Andreas Hindborg
2025-04-15 19:48 ` [PATCH v2 2/8] rust: hrtimer: Add HrTimer::raw_forward() and forward() Lyude Paul
2025-04-23 12:13   ` Andreas Hindborg
2025-04-25 20:15     ` Lyude Paul
2025-04-29  9:43       ` Andreas Hindborg
2025-04-29 21:04         ` Lyude Paul
2025-04-23 12:18   ` Andreas Hindborg
2025-04-23 12:57   ` Andreas Hindborg
2025-04-25 21:06     ` Lyude Paul
2025-04-25 21:29       ` Lyude Paul
2025-04-29 10:10         ` Andreas Hindborg
2025-04-15 19:48 ` [PATCH v2 3/8] rust: hrtimer: Add HrTimerCallbackContext and ::forward() Lyude Paul
2025-04-23 12:24   ` Andreas Hindborg
2025-04-15 19:48 ` Lyude Paul [this message]
2025-04-23 12:27   ` [PATCH v2 4/8] rust: hrtimer: Add HrTimerClockBase Andreas Hindborg
2025-04-28 18:22     ` Lyude Paul
2025-04-15 19:48 ` [PATCH v2 5/8] rust: time: Add Instant::from_nanos() Lyude Paul
2025-04-16  9:10   ` FUJITA Tomonori
2025-04-16 18:41     ` Lyude Paul
2025-04-23 12:29   ` Andreas Hindborg
2025-04-29 16:01     ` Lyude Paul
2025-04-29 19:53       ` Miguel Ojeda
2025-04-15 19:48 ` [PATCH v2 6/8] rust: hrtimer: Add HrTimerClockBase::time() Lyude Paul
2025-04-15 19:48 ` [PATCH v2 7/8] rust: hrtimer: Add forward_now() to HrTimer and HrTimerCallbackContext Lyude Paul
2025-04-15 20:17   ` [PATCH v3] " Lyude Paul
2025-04-22 12:18     ` Andreas Hindborg
2025-04-22 19:21       ` Lyude Paul
2025-04-15 19:48 ` [PATCH v2 8/8] rust: hrtimer: Add HrTimer::expires() Lyude Paul
2025-04-23 13:01   ` Andreas Hindborg

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20250415195020.413478-5-lyude@redhat.com \
    --to=lyude@redhat.com \
    --cc=a.hindborg@kernel.org \
    --cc=alex.gaynor@gmail.com \
    --cc=aliceryhl@google.com \
    --cc=anna-maria@linutronix.de \
    --cc=benno.lossin@proton.me \
    --cc=bjorn3_gh@protonmail.com \
    --cc=boqun.feng@gmail.com \
    --cc=dakr@kernel.org \
    --cc=frederic@kernel.org \
    --cc=fujita.tomonori@gmail.com \
    --cc=gary@garyguo.net \
    --cc=jstultz@google.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=ojeda@kernel.org \
    --cc=rust-for-linux@vger.kernel.org \
    --cc=sboyd@kernel.org \
    --cc=tglx@linutronix.de \
    --cc=tmgross@umich.edu \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).