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 2/7] rust: hrtimer: Add HrTimer::raw_forward() and forward()
Date: Tue, 29 Apr 2025 17:44:38 -0400 [thread overview]
Message-ID: <20250429214752.1637859-3-lyude@redhat.com> (raw)
In-Reply-To: <20250429214752.1637859-1-lyude@redhat.com>
Within the hrtimer API there are quite a number of functions that can only
be safely called from one of two contexts:
* When we have exclusive access to the hrtimer and the timer is not active.
* When we're within the hrtimer's callback context as it is being executed.
This commit adds bindings for hrtimer_forward() for the first such context,
along with HrTimer::raw_forward() for later use in implementing the
hrtimer_forward() in the latter context.
Signed-off-by: Lyude Paul <lyude@redhat.com>
---
V4:
* Fix the safety contract for raw_forward()
* Require Pin<&mut Self>, not &mut self
* Drop incorrect UniquePin example
* Rewrite documentation a bit (re: Andreas)
Signed-off-by: Lyude Paul <lyude@redhat.com>
---
rust/kernel/time/hrtimer.rs | 44 ++++++++++++++++++++++++++++++++++++-
1 file changed, 43 insertions(+), 1 deletion(-)
diff --git a/rust/kernel/time/hrtimer.rs b/rust/kernel/time/hrtimer.rs
index ef96c7e2c21ff..76caf9fae8170 100644
--- a/rust/kernel/time/hrtimer.rs
+++ b/rust/kernel/time/hrtimer.rs
@@ -68,7 +68,11 @@
//! `start` operation.
use super::ClockId;
-use crate::{prelude::*, time::Instant, types::Opaque};
+use crate::{
+ prelude::*,
+ time::{Delta, Instant},
+ types::Opaque,
+};
use core::marker::PhantomData;
use pin_init::PinInit;
@@ -164,6 +168,44 @@ pub(crate) unsafe fn raw_cancel(this: *const Self) -> bool {
// handled on the C side.
unsafe { bindings::hrtimer_cancel(c_timer_ptr) != 0 }
}
+
+ /// Forward the timer expiry for a given timer pointer.
+ ///
+ /// # Safety
+ ///
+ /// - `self_ptr` must point to a valid `Self`.
+ /// - The caller must either have exclusive access to the data pointed at by `self_ptr`, or be
+ /// within the context of the timer callback.
+ #[inline]
+ unsafe fn raw_forward(self_ptr: *mut Self, now: Instant, interval: Delta) -> u64 {
+ // SAFETY:
+ // * The C API requirements for this function are fulfilled by our safety contract.
+ // * `self_ptr` is guaranteed to point to a valid `Self` via our safety contract
+ unsafe {
+ bindings::hrtimer_forward(Self::raw_get(self_ptr), now.as_nanos(), interval.as_nanos())
+ }
+ }
+
+ /// Conditionally forward the timer.
+ ///
+ /// If the timer expires after `now`, this function does nothing and returns 0. If the timer
+ /// expired at or before `now`, this function forwards the timer by `interval` until the timer
+ /// expires after `now` and then returns the number of times the timer was forwarded by
+ /// `interval`.
+ ///
+ /// This function is mainly useful for timer types which can provide exclusive access to the
+ /// timer when the timer is not running. For forwarding the timer from within the timer callback
+ /// context, see [`HrTimerCallbackContext::forward()`].
+ ///
+ /// Returns the number of overruns that occurred as a result of the timer expiry change.
+ pub fn forward(self: Pin<&mut Self>, now: Instant, interval: Delta) -> u64 {
+ // SAFETY:
+ // - `raw_forward` does not move `self`.
+ // - Self is a mutable reference and thus always points to a valid `HrTimer`
+ // - The only way that we could hold a mutable reference to `HrTimer<T>` is if we have
+ // exclusive access to it - fulfilling the requirements of the C API.
+ unsafe { Self::raw_forward(self.get_unchecked_mut(), now, interval) }
+ }
}
/// Implemented by pointer types that point to structs that contain a [`HrTimer`].
--
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 ` Lyude Paul [this message]
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 ` [PATCH v4 5/7] rust: hrtimer: Add HrTimer::raw_cb_time() Lyude Paul
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-3-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.