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 v4 5/7] rust: hrtimer: Add HrTimer::raw_cb_time()
Date: Tue, 29 Apr 2025 17:44:41 -0400 [thread overview]
Message-ID: <20250429214752.1637859-6-lyude@redhat.com> (raw)
In-Reply-To: <20250429214752.1637859-1-lyude@redhat.com>
This is a simple private unsafe wrapper for retrieving the current time
according to the hrtimer_clock_base struct for a given timer. This will be
used for implementing functions such as forward_now(), which rely on
retrieving the current time from the hrtimer's clock base.
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
V4:
- Drop HrTimerClockBase entirely, reword commit as this is now about adding
raw_cb_time()
Signed-off-by: Lyude Paul <lyude@redhat.com>
---
rust/kernel/time.rs | 1 -
rust/kernel/time/hrtimer.rs | 24 ++++++++++++++++++++++++
2 files changed, 24 insertions(+), 1 deletion(-)
diff --git a/rust/kernel/time.rs b/rust/kernel/time.rs
index 6dcb65ed954db..ce6a991ce7583 100644
--- a/rust/kernel/time.rs
+++ b/rust/kernel/time.rs
@@ -89,7 +89,6 @@ pub(crate) fn as_nanos(self) -> i64 {
/// # Safety
///
/// The caller promises that `nanos` is in the range from 0 to `KTIME_MAX`.
- #[expect(unused)]
#[inline]
pub(crate) unsafe fn from_nanos(nanos: i64) -> Self {
// INVARIANT: Our safety contract ensures that `nanos` is in the range from 0 to
diff --git a/rust/kernel/time/hrtimer.rs b/rust/kernel/time/hrtimer.rs
index b0304b2cf2da9..80270e14daafd 100644
--- a/rust/kernel/time/hrtimer.rs
+++ b/rust/kernel/time/hrtimer.rs
@@ -186,6 +186,30 @@ unsafe fn raw_forward(self_ptr: *mut Self, now: Instant, interval: Delta) -> u64
}
}
+ /// Retrieve the current time according to the `struct hrtimer_clock_base` for `self_ptr`.
+ ///
+ /// # Safety
+ ///
+ /// - `self_ptr` must point to a valid `Self`.
+ /// - The caller must ensure that the `hrtimer_clock_base` cannot possibly change in the context
+ /// this function is being called in. This means either exclusive access to `self_ptr` is
+ /// required, or we must be from within the timer callback context of `self_ptr`.
+ #[expect(unused)]
+ unsafe fn raw_cb_time(self_ptr: *const Self) -> Instant {
+ // SAFETY: We're guaranteed `self_ptr` points to a valid `Self` by our safety contract.
+ let clock_base = unsafe { (*Self::raw_get(self_ptr)).base };
+
+ // SAFETY: The C API guarantees that `get_time` is initialized to a valid function pointer
+ // for as long as we expose hrtimers to users.
+ let get_time_fn = unsafe { (*clock_base).get_time.unwrap_unchecked() };
+
+ // SAFETY:
+ // - get_time_fn() returns a ktime_t, so we're guaranteed its return value is between `0`
+ // and `KTIME_MAX`.
+ // - get_time_fn() itself has no special requirements.
+ unsafe { Instant::from_nanos(get_time_fn()) }
+ }
+
/// Conditionally forward the timer.
///
/// If the timer expires after `now`, this function does nothing and returns 0. If the timer
--
2.48.1
next prev parent reply other threads:[~2025-04-29 21:48 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <uDRgFf0z0zgsF9FjOhqYPxDz5GJ4qv3yoszl15s6FR2nJT7hiAPGdf51jBy8BfC3GeEvJ9BxI3cU7Sjd5J-lOA==@protonmail.internalid>
2025-04-29 21:44 ` [PATCH v4 0/7] rust/hrtimer: Various hrtimer + time additions Lyude Paul
2025-04-29 21:44 ` [PATCH v4 1/7] rust: hrtimer: Document the return value for HrTimerHandle::cancel() Lyude Paul
2025-04-29 21:44 ` [PATCH v4 2/7] rust: hrtimer: Add HrTimer::raw_forward() and forward() Lyude Paul
2025-04-29 21:44 ` [PATCH v4 3/7] rust: hrtimer: Add HrTimerCallbackContext and ::forward() Lyude Paul
2025-04-29 21:44 ` [PATCH v4 4/7] rust: time: Add Instant::from_nanos() Lyude Paul
2025-04-29 21:44 ` Lyude Paul [this message]
2025-04-29 21:44 ` [PATCH v4 6/7] rust: hrtimer: Add forward_now() to HrTimer and HrTimerCallbackContext Lyude Paul
2025-04-29 21:44 ` [PATCH v4 7/7] rust: hrtimer: Add HrTimer::expires() Lyude Paul
2025-05-07 18:29 ` [PATCH v4 0/7] rust/hrtimer: Various hrtimer + time additions 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=20250429214752.1637859-6-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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.