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 8/8] rust: hrtimer: Add HrTimer::expires()
Date: Tue, 15 Apr 2025 15:48:29 -0400 [thread overview]
Message-ID: <20250415195020.413478-9-lyude@redhat.com> (raw)
In-Reply-To: <20250415195020.413478-1-lyude@redhat.com>
This adds the ability to read the expiry time of the given timer.
Signed-off-by: Lyude Paul <lyude@redhat.com>
---
V2:
* Convert from Ktime to Instant
* Use read_volatile instead of read and add a FIXME
Signed-off-by: Lyude Paul <lyude@redhat.com>
---
rust/kernel/time/hrtimer.rs | 22 ++++++++++++++++++++--
1 file changed, 20 insertions(+), 2 deletions(-)
diff --git a/rust/kernel/time/hrtimer.rs b/rust/kernel/time/hrtimer.rs
index c84dcdacb4882..b8a74c15e6609 100644
--- a/rust/kernel/time/hrtimer.rs
+++ b/rust/kernel/time/hrtimer.rs
@@ -73,7 +73,10 @@
time::{Delta, Instant},
types::Opaque,
};
-use core::{marker::PhantomData, ptr::NonNull};
+use core::{
+ marker::PhantomData,
+ ptr::{addr_of, NonNull},
+};
use pin_init::PinInit;
/// A timer backed by a C `struct hrtimer`.
@@ -136,7 +139,7 @@ unsafe fn raw_get(this: *const Self) -> *mut bindings::hrtimer {
// SAFETY: The field projection to `timer` does not go out of bounds,
// because the caller of this function promises that `this` points to an
// allocation of at least the size of `Self`.
- unsafe { Opaque::raw_get(core::ptr::addr_of!((*this).timer)) }
+ unsafe { Opaque::raw_get(addr_of!((*this).timer)) }
}
/// Cancel an initialized and potentially running timer.
@@ -225,6 +228,21 @@ pub fn forward(&mut self, now: Instant, duration: Delta) -> u64 {
pub fn forward_now(&mut self, duration: Delta) -> u64 {
self.forward(self.clock_base().time(), duration)
}
+
+ /// 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) -> Instant {
+ // SAFETY: `self` is an immutable reference and thus always points to a valid `HrTimer`.
+ let c_timer_ptr = unsafe { HrTimer::raw_get(self) };
+
+ // SAFETY: There's no actual locking here, a racy read is fine and expected.
+ Instant::from_nanos(unsafe {
+ // FIXME: read_volatile
+ core::ptr::read_volatile(addr_of!((*c_timer_ptr).node.expires))
+ })
+ }
}
/// The timer base for a specific clock.
--
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 ` [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 ` Lyude Paul [this message]
2025-04-23 13:01 ` [PATCH v2 8/8] rust: hrtimer: Add HrTimer::expires() 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-9-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).