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 2/8] rust: hrtimer: Add HrTimer::raw_forward() and forward()
Date: Tue, 15 Apr 2025 15:48:23 -0400 [thread overview]
Message-ID: <20250415195020.413478-3-lyude@redhat.com> (raw)
In-Reply-To: <20250415195020.413478-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.
Since we can only retrieve a &mut reference to an HrTimer<T> in contexts
where it is not possible for the timer to be accessed by others or
currently executing (e.g. a UniqueArc), a &mut is actually enough of a
guarantee to safely fulfill the C API requirements here.
Signed-off-by: Lyude Paul <lyude@redhat.com>
---
rust/kernel/time/hrtimer.rs | 36 +++++++++++++++++++++++++++++++++++-
1 file changed, 35 insertions(+), 1 deletion(-)
diff --git a/rust/kernel/time/hrtimer.rs b/rust/kernel/time/hrtimer.rs
index bfe0e25f5abd0..aadae8666f7ea 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,36 @@ 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`.
+ 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())
+ }
+ }
+
+ /// 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.
+ /// `Pin<Box<…>>`) before the timer is started.
+ ///
+ /// Note that this does not requeue the timer, it simply updates its expiry value. It returns
+ /// the number of overruns that have occurred as a result of the expiry change.
+ pub fn forward(&mut self, now: Instant, duration: Delta) -> u64 {
+ // SAFETY:
+ // - Self is a mutable reference and thus always points to a valid `HrTimer`
+ // - The only way we could hold a mutable reference to a `HrTimer<T>` is if we have
+ // exclusive access to it, which means the timer is either idle or we're within the
+ // timer callback context - fulfilling the requirements of the C API.
+ unsafe { Self::raw_forward(self, now, duration) }
+ }
}
/// 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:50 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 ` Lyude Paul [this message]
2025-04-23 12:13 ` [PATCH v2 2/8] rust: hrtimer: Add HrTimer::raw_forward() and forward() 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 ` [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-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.