rust-for-linux.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Andreas Hindborg <a.hindborg@kernel.org>
To: Miguel Ojeda <ojeda@kernel.org>,
	 Anna-Maria Behnsen <anna-maria@linutronix.de>,
	 Frederic Weisbecker <frederic@kernel.org>,
	 Thomas Gleixner <tglx@linutronix.de>
Cc: "Alex Gaynor" <alex.gaynor@gmail.com>,
	"Boqun Feng" <boqun.feng@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>,
	"Lyude Paul" <lyude@redhat.com>,
	rust-for-linux@vger.kernel.org, linux-kernel@vger.kernel.org,
	"Andreas Hindborg" <a.hindborg@kernel.org>
Subject: [PATCH v3 05/13] rust: hrtimer: allow timer restart from timer handler
Date: Thu, 17 Oct 2024 15:04:32 +0200	[thread overview]
Message-ID: <20241017-hrtimer-v3-v6-12-rc2-v3-5-59a75cbb44da@kernel.org> (raw)
In-Reply-To: <20241017-hrtimer-v3-v6-12-rc2-v3-0-59a75cbb44da@kernel.org>

This patch allows timer handlers to report that they want a timer to be
restarted after the timer handler has finished executing.

Also update the `hrtimer` documentation to showcase the new feature.

Signed-off-by: Andreas Hindborg <a.hindborg@kernel.org>
---
 rust/kernel/hrtimer.rs     | 28 +++++++++++++++++++++++++++-
 rust/kernel/hrtimer/arc.rs |  4 +---
 2 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/rust/kernel/hrtimer.rs b/rust/kernel/hrtimer.rs
index 6427b0450c694105190c8cddea0c768ab195aca2..eeed2afd501b64b94d57cc658616659e28785078 100644
--- a/rust/kernel/hrtimer.rs
+++ b/rust/kernel/hrtimer.rs
@@ -176,7 +176,7 @@ pub trait TimerCallback {
     type CallbackTargetParameter<'a>;
 
     /// Called by the timer logic when the timer fires.
-    fn run(this: Self::CallbackTargetParameter<'_>)
+    fn run(this: Self::CallbackTargetParameter<'_>) -> TimerRestart
     where
         Self: Sized;
 }
@@ -270,6 +270,32 @@ unsafe fn start(self_ptr: *const Self, expires: Ktime) {
     }
 }
 
+/// Restart policy for timers.
+pub enum TimerRestart {
+    /// Timer should not be restarted.
+    NoRestart,
+    /// Timer should be restarted.
+    Restart,
+}
+
+impl From<u32> for TimerRestart {
+    fn from(value: bindings::hrtimer_restart) -> Self {
+        match value {
+            0 => Self::NoRestart,
+            _ => Self::Restart,
+        }
+    }
+}
+
+impl From<TimerRestart> for bindings::hrtimer_restart {
+    fn from(value: TimerRestart) -> Self {
+        match value {
+            TimerRestart::NoRestart => bindings::hrtimer_restart_HRTIMER_NORESTART,
+            TimerRestart::Restart => bindings::hrtimer_restart_HRTIMER_RESTART,
+        }
+    }
+}
+
 /// Use to implement the [`HasTimer<T>`] trait.
 ///
 /// See [`module`] documentation for an example.
diff --git a/rust/kernel/hrtimer/arc.rs b/rust/kernel/hrtimer/arc.rs
index 881de053ecad866a26e46a0123ec2bf38511c2bc..c6283bd0dbb10dbc733c3f4092f107db2f3c5c5f 100644
--- a/rust/kernel/hrtimer/arc.rs
+++ b/rust/kernel/hrtimer/arc.rs
@@ -82,8 +82,6 @@ impl<U> RawTimerCallback for Arc<U>
         // timer. This `U` is contained in an `Arc`.
         let receiver = unsafe { ArcBorrow::from_raw(data_ptr) };
 
-        U::run(receiver);
-
-        bindings::hrtimer_restart_HRTIMER_NORESTART
+        U::run(receiver).into()
     }
 }

-- 
2.46.0



  parent reply	other threads:[~2024-10-17 13:09 UTC|newest]

Thread overview: 32+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-10-17 13:04 [PATCH v3 00/13] hrtimer Rust API Andreas Hindborg
2024-10-17 13:04 ` [PATCH v3 01/13] rust: time: Add Ktime::from_ns() Andreas Hindborg
2024-10-17 13:04 ` [PATCH v3 02/13] rust: hrtimer: introduce hrtimer support Andreas Hindborg
2024-11-07  1:55   ` Thomas Gleixner
2024-11-20 11:41     ` Andreas Hindborg
2024-10-17 13:04 ` [PATCH v3 03/13] rust: sync: add `Arc::as_ptr` Andreas Hindborg
2024-10-17 13:04 ` [PATCH v3 04/13] rust: hrtimer: implement `TimerPointer` for `Arc` Andreas Hindborg
2024-11-13 23:24   ` Lyude Paul
2024-11-20 15:22     ` Andreas Hindborg
2024-11-22 12:36       ` Miguel Ojeda
2024-11-22 16:24         ` Daniel Almeida
2024-12-04 13:41         ` Andreas Hindborg
2024-12-09 21:36           ` Miguel Ojeda
2024-10-17 13:04 ` Andreas Hindborg [this message]
2024-10-20 16:46   ` [PATCH v3 05/13] rust: hrtimer: allow timer restart from timer handler kernel test robot
2024-10-17 13:04 ` [PATCH v3 06/13] rust: hrtimer: add `UnsafeTimerPointer` Andreas Hindborg
2024-11-13 23:27   ` Lyude Paul
2024-11-20 15:25     ` Andreas Hindborg
2024-10-17 13:04 ` [PATCH v3 07/13] rust: hrtimer: implement `UnsafeTimerPointer` for `Pin<&T>` Andreas Hindborg
2024-11-13 23:30   ` Lyude Paul
2024-11-20 15:48     ` Andreas Hindborg
2024-10-17 13:04 ` [PATCH v3 08/13] rust: hrtimer: implement `UnsafeTimerPointer` for `Pin<&mut T>` Andreas Hindborg
2024-11-13 23:33   ` Lyude Paul
2024-10-17 13:04 ` [PATCH v3 09/13] rust: hrtimer: add `hrtimer::ScopedTimerPointer` Andreas Hindborg
2024-10-17 13:04 ` [PATCH v3 10/13] rust: hrtimer: implement `TimerPointer` for `Pin<Box<T>>` Andreas Hindborg
2024-10-17 13:04 ` [PATCH v3 11/13] rust: hrtimer: add `TimerMode` Andreas Hindborg
2024-11-13 23:37   ` Lyude Paul
2024-11-20 15:51     ` Andreas Hindborg
2024-10-17 13:04 ` [PATCH v3 12/13] rust: hrtimer: add clocksource selection through `ClockSource` Andreas Hindborg
2024-10-17 13:04 ` [PATCH v3 13/13] rust: hrtimer: add maintainer entry Andreas Hindborg
2024-11-13 23:39 ` [PATCH v3 00/13] hrtimer Rust API Lyude Paul
2024-11-20 15:58   ` 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=20241017-hrtimer-v3-v6-12-rc2-v3-5-59a75cbb44da@kernel.org \
    --to=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=frederic@kernel.org \
    --cc=gary@garyguo.net \
    --cc=linux-kernel@vger.kernel.org \
    --cc=lyude@redhat.com \
    --cc=ojeda@kernel.org \
    --cc=rust-for-linux@vger.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).