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 6/8] rust: hrtimer: Add HrTimerClockBase::time()
Date: Tue, 15 Apr 2025 15:48:27 -0400 [thread overview]
Message-ID: <20250415195020.413478-7-lyude@redhat.com> (raw)
In-Reply-To: <20250415195020.413478-1-lyude@redhat.com>
This adds a wrapper for the get_time() callback contained within a
hrtimer_clock_base struct. We'll use this in the next commit in order to
implement HrTimerCallbackContext::forward_now().
Signed-off-by: Lyude Paul <lyude@redhat.com>
---
V2:
* Convert from Ktime to Instant
* Don't forget to make HrTimerClockBase::time() pub
Signed-off-by: Lyude Paul <lyude@redhat.com>
---
rust/kernel/time.rs | 1 -
rust/kernel/time/hrtimer.rs | 10 ++++++++++
2 files changed, 10 insertions(+), 1 deletion(-)
diff --git a/rust/kernel/time.rs b/rust/kernel/time.rs
index 545963140f180..a9a29dd80fc28 100644
--- a/rust/kernel/time.rs
+++ b/rust/kernel/time.rs
@@ -84,7 +84,6 @@ pub(crate) fn as_nanos(self) -> i64 {
self.inner
}
- #[expect(unused)]
#[inline]
pub(crate) fn from_nanos(nanos: i64) -> Self {
Self {
diff --git a/rust/kernel/time/hrtimer.rs b/rust/kernel/time/hrtimer.rs
index a56c66104f692..4da1e72e016d1 100644
--- a/rust/kernel/time/hrtimer.rs
+++ b/rust/kernel/time/hrtimer.rs
@@ -241,6 +241,16 @@ unsafe fn from_raw<'a>(ptr: *mut bindings::hrtimer_clock_base) -> &'a Self {
// - Our data layout is equivalent to said struct via our type invariants.
unsafe { &*ptr.cast() }
}
+
+ /// Retrieve the current time from this [`HrTimerClockBase`].
+ pub fn time(&self) -> Instant {
+ // SAFETY: This callback is initialized to a valid NonNull function for as long as this type
+ // is exposed to users.
+ let get_time_fn = unsafe { (*self.0.get()).get_time.unwrap_unchecked() };
+
+ // SAFETY: This FFI function has no special requirements
+ Instant::from_nanos(unsafe { get_time_fn() })
+ }
}
/// Implemented by pointer types that point to structs that contain a [`HrTimer`].
--
2.48.1
next prev 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 ` [PATCH v2 4/8] rust: hrtimer: Add HrTimerClockBase Lyude Paul
2025-04-23 12:27 ` 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 ` Lyude Paul [this message]
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-7-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).