From: Gary Guo <gary@garyguo.net>
To: FUJITA Tomonori <fujita.tomonori@gmail.com>
Cc: linux-kernel@vger.kernel.org, Boqun Feng <boqun.feng@gmail.com>,
rust-for-linux@vger.kernel.org, netdev@vger.kernel.org,
andrew@lunn.ch, hkallweit1@gmail.com, tmgross@umich.edu,
ojeda@kernel.org, alex.gaynor@gmail.com,
bjorn3_gh@protonmail.com, benno.lossin@proton.me,
a.hindborg@samsung.com, aliceryhl@google.com,
anna-maria@linutronix.de, frederic@kernel.org,
tglx@linutronix.de, arnd@arndb.de, jstultz@google.com,
sboyd@kernel.org, mingo@redhat.com, peterz@infradead.org,
juri.lelli@redhat.com, vincent.guittot@linaro.org,
dietmar.eggemann@arm.com, rostedt@goodmis.org,
bsegall@google.com, mgorman@suse.de, vschneid@redhat.com
Subject: Re: [PATCH v8 6/7] rust: Add read_poll_timeout functions
Date: Wed, 22 Jan 2025 18:36:12 +0000 [thread overview]
Message-ID: <20250122183612.60f3c62d.gary@garyguo.net> (raw)
In-Reply-To: <20250116044100.80679-7-fujita.tomonori@gmail.com>
On Thu, 16 Jan 2025 13:40:58 +0900
FUJITA Tomonori <fujita.tomonori@gmail.com> wrote:
> Add read_poll_timeout functions which poll periodically until a
> condition is met or a timeout is reached.
>
> C's read_poll_timeout (include/linux/iopoll.h) is a complicated macro
> and a simple wrapper for Rust doesn't work. So this implements the
> same functionality in Rust.
>
> The C version uses usleep_range() while the Rust version uses
> fsleep(), which uses the best sleep method so it works with spans that
> usleep_range() doesn't work nicely with.
>
> Unlike the C version, __might_sleep() is used instead of might_sleep()
> to show proper debug info; the file name and line
> number. might_resched() could be added to match what the C version
> does but this function works without it.
>
> The sleep_before_read argument isn't supported since there is no user
> for now. It's rarely used in the C version.
>
> core::panic::Location::file() doesn't provide a null-terminated string
> so add __might_sleep_precision() helper function, which takes a
> pointer to a string with its length.
>
> read_poll_timeout() can only be used in a nonatomic context. This
> requirement is not checked by these abstractions, but it is intended
> that klint [1] or a similar tool will be used to check it in the
> future.
>
> Link: https://rust-for-linux.com/klint [1]
> Co-developed-by: Boqun Feng <boqun.feng@gmail.com>
> Signed-off-by: Boqun Feng <boqun.feng@gmail.com>
> Signed-off-by: FUJITA Tomonori <fujita.tomonori@gmail.com>
> ---
> include/linux/kernel.h | 2 +
> kernel/sched/core.c | 28 +++++++++++---
> rust/helpers/helpers.c | 1 +
> rust/helpers/kernel.c | 13 +++++++
> rust/kernel/cpu.rs | 13 +++++++
> rust/kernel/error.rs | 1 +
> rust/kernel/io.rs | 5 +++
> rust/kernel/io/poll.rs | 84 ++++++++++++++++++++++++++++++++++++++++++
> rust/kernel/lib.rs | 2 +
> 9 files changed, 144 insertions(+), 5 deletions(-)
> create mode 100644 rust/helpers/kernel.c
> create mode 100644 rust/kernel/cpu.rs
> create mode 100644 rust/kernel/io.rs
> create mode 100644 rust/kernel/io/poll.rs
>
> diff --git a/rust/kernel/io.rs b/rust/kernel/io.rs
> new file mode 100644
> index 000000000000..033f3c4e4adf
> --- /dev/null
> +++ b/rust/kernel/io.rs
> @@ -0,0 +1,5 @@
> +// SPDX-License-Identifier: GPL-2.0
> +
> +//! Input and Output.
> +
> +pub mod poll;
> diff --git a/rust/kernel/io/poll.rs b/rust/kernel/io/poll.rs
> new file mode 100644
> index 000000000000..da8e975d8e50
> --- /dev/null
> +++ b/rust/kernel/io/poll.rs
> @@ -0,0 +1,84 @@
> +// SPDX-License-Identifier: GPL-2.0
> +
> +//! IO polling.
> +//!
> +//! C header: [`include/linux/iopoll.h`](srctree/include/linux/iopoll.h).
> +
> +use crate::{
> + cpu::cpu_relax,
> + error::{code::*, Result},
> + time::{delay::fsleep, Delta, Instant},
> +};
> +
> +use core::panic::Location;
> +
> +/// Polls periodically until a condition is met or a timeout is reached.
> +///
> +/// Public but hidden since it should only be used from public macros.
> +///
> +/// ```rust
> +/// use kernel::io::poll::read_poll_timeout;
> +/// use kernel::time::Delta;
> +/// use kernel::sync::{SpinLock, new_spinlock};
> +///
> +/// let lock = KBox::pin_init(new_spinlock!(()), kernel::alloc::flags::GFP_KERNEL)?;
> +/// let g = lock.lock();
> +/// read_poll_timeout(|| Ok(()), |()| true, Delta::from_micros(42), Delta::from_micros(42));
> +/// drop(g);
> +///
> +/// # Ok::<(), Error>(())
> +/// ```
> +#[track_caller]
> +pub fn read_poll_timeout<Op, Cond, T: Copy>(
I wonder if we can lift the `T: Copy` restriction and have `Cond` take
`&T` instead. I can see this being useful in many cases.
I know that quite often `T` is just an integer so you'd want to pass by
value, but I think almost always `Cond` is a very simple closure so
inlining would take place and they won't make a performance difference.
> + mut op: Op,
> + cond: Cond,
> + sleep_delta: Delta,
> + timeout_delta: Delta,
> +) -> Result<T>
> +where
> + Op: FnMut() -> Result<T>,
> + Cond: Fn(T) -> bool,
> +{
> + let start = Instant::now();
> + let sleep = !sleep_delta.is_zero();
> + let timeout = !timeout_delta.is_zero();
> +
> + might_sleep(Location::caller());
This should only be called if `timeout` is true?
> +
> + let val = loop {
> + let val = op()?;
> + if cond(val) {
> + // Unlike the C version, we immediately return.
> + // We know a condition is met so we don't need to check again.
> + return Ok(val);
> + }
> + if timeout && start.elapsed() > timeout_delta {
> + // Should we return Err(ETIMEDOUT) here instead of call op() again
> + // without a sleep between? But we follow the C version. op() could
> + // take some time so might be worth checking again.
> + break op()?;
Maybe the reason is `ktime_get` can take some time (due to its use of
seqlock and thus may require retrying?) Although this logic breaks down
when `read_poll_timeout_atomic` also has this extra `op(args)` despite
the condition being trivial.
So I really can't convince myself that this additional `op()` call is
needed. I can't think of any case where this behaviour would be
depended on by a driver, so I'd be tempted just to return ETIMEOUT
straight.
Regardless, even if you decide to keep it, you can hoist the `if
cond(val)` block below up or move the `op()` down, given that this is
the only place to break from the loop without returning.
> + }
> + if sleep {
> + fsleep(sleep_delta);
> + }
> + // fsleep() could be busy-wait loop so we always call cpu_relax().
> + cpu_relax();
> + };
> +
> + if cond(val) {
> + Ok(val)
> + } else {
> + Err(ETIMEDOUT)
> + }
> +}
> +
> +fn might_sleep(loc: &Location<'_>) {
> + // SAFETY: FFI call.
> + unsafe {
> + crate::bindings::__might_sleep_precision(
> + loc.file().as_ptr().cast(),
> + loc.file().len() as i32,
> + loc.line() as i32,
> + )
> + }
> +}
> diff --git a/rust/kernel/lib.rs b/rust/kernel/lib.rs
> index 545d1170ee63..c477701b2efa 100644
> --- a/rust/kernel/lib.rs
> +++ b/rust/kernel/lib.rs
> @@ -35,6 +35,7 @@
> pub mod block;
> #[doc(hidden)]
> pub mod build_assert;
> +pub mod cpu;
> pub mod cred;
> pub mod device;
> pub mod error;
> @@ -42,6 +43,7 @@
> pub mod firmware;
> pub mod fs;
> pub mod init;
> +pub mod io;
> pub mod ioctl;
> pub mod jump_label;
> #[cfg(CONFIG_KUNIT)]
next prev parent reply other threads:[~2025-01-22 18:36 UTC|newest]
Thread overview: 64+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-01-16 4:40 [PATCH v8 0/7] rust: Add IO polling FUJITA Tomonori
2025-01-16 4:40 ` [PATCH v8 1/7] rust: time: Add PartialEq/Eq/PartialOrd/Ord trait to Ktime FUJITA Tomonori
2025-01-22 18:38 ` Gary Guo
2025-01-16 4:40 ` [PATCH v8 2/7] rust: time: Introduce Delta type FUJITA Tomonori
2025-01-16 9:36 ` Alice Ryhl
2025-01-16 12:00 ` FUJITA Tomonori
2025-01-16 12:43 ` Miguel Ojeda
2025-01-16 12:43 ` Miguel Ojeda
2025-01-17 0:29 ` FUJITA Tomonori
2025-01-18 12:19 ` Miguel Ojeda
2025-01-22 7:37 ` FUJITA Tomonori
2025-01-22 8:57 ` Miguel Ojeda
2025-01-16 4:40 ` [PATCH v8 3/7] rust: time: Introduce Instant type FUJITA Tomonori
2025-01-16 9:32 ` Alice Ryhl
2025-01-16 12:06 ` FUJITA Tomonori
2025-01-22 12:49 ` FUJITA Tomonori
2025-01-22 12:51 ` Alice Ryhl
2025-01-22 13:46 ` FUJITA Tomonori
2025-01-22 16:58 ` Gary Guo
2025-01-16 12:37 ` Miguel Ojeda
2025-01-16 23:31 ` FUJITA Tomonori
2025-01-18 12:15 ` Miguel Ojeda
2025-01-24 1:50 ` FUJITA Tomonori
[not found] ` <CAKdorCq9R-Agco1LwfRdbRGaK5gkQebb2ks_4sHf2SBCw8PmbA@mail.gmail.com>
2025-01-16 23:17 ` FUJITA Tomonori
2025-01-16 4:40 ` [PATCH v8 4/7] rust: time: Add wrapper for fsleep function FUJITA Tomonori
2025-01-16 9:27 ` Alice Ryhl
2025-01-17 7:53 ` FUJITA Tomonori
2025-01-17 9:01 ` FUJITA Tomonori
2025-01-17 9:13 ` Alice Ryhl
2025-01-17 9:55 ` FUJITA Tomonori
2025-01-17 13:05 ` Alice Ryhl
2025-01-17 14:20 ` FUJITA Tomonori
2025-01-17 14:31 ` Alice Ryhl
2025-01-18 7:57 ` FUJITA Tomonori
2025-01-17 18:59 ` Miguel Ojeda
2025-01-18 8:02 ` FUJITA Tomonori
2025-01-18 12:17 ` Miguel Ojeda
2025-01-22 6:57 ` FUJITA Tomonori
2025-01-22 8:23 ` Alice Ryhl
2025-01-22 10:44 ` FUJITA Tomonori
2025-01-22 10:47 ` Alice Ryhl
2025-01-22 11:27 ` FUJITA Tomonori
2025-01-23 7:03 ` Boqun Feng
2025-01-23 8:40 ` FUJITA Tomonori
2025-01-23 11:03 ` Miguel Ojeda
2025-01-22 10:21 ` Miguel Ojeda
2025-01-23 1:04 ` FUJITA Tomonori
2025-01-22 17:05 ` Gary Guo
2025-01-22 17:06 ` Alice Ryhl
2025-01-23 0:12 ` FUJITA Tomonori
2025-01-16 4:40 ` [PATCH v8 5/7] MAINTAINERS: rust: Add TIMEKEEPING and TIMER abstractions FUJITA Tomonori
2025-01-16 4:40 ` [PATCH v8 6/7] rust: Add read_poll_timeout functions FUJITA Tomonori
2025-01-16 9:45 ` Alice Ryhl
2025-01-16 11:32 ` FUJITA Tomonori
2025-01-16 11:42 ` Alice Ryhl
2025-01-16 11:49 ` FUJITA Tomonori
2025-01-16 11:51 ` Alice Ryhl
2025-01-22 18:36 ` Gary Guo [this message]
2025-01-22 20:14 ` Alice Ryhl
2025-01-23 7:29 ` FUJITA Tomonori
2025-01-23 7:25 ` FUJITA Tomonori
2025-01-16 4:40 ` [PATCH v8 7/7] net: phy: qt2025: Wait until PHY becomes ready FUJITA Tomonori
2025-01-16 8:32 ` Alice Ryhl
2025-01-22 18:37 ` Gary Guo
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=20250122183612.60f3c62d.gary@garyguo.net \
--to=gary@garyguo.net \
--cc=a.hindborg@samsung.com \
--cc=alex.gaynor@gmail.com \
--cc=aliceryhl@google.com \
--cc=andrew@lunn.ch \
--cc=anna-maria@linutronix.de \
--cc=arnd@arndb.de \
--cc=benno.lossin@proton.me \
--cc=bjorn3_gh@protonmail.com \
--cc=boqun.feng@gmail.com \
--cc=bsegall@google.com \
--cc=dietmar.eggemann@arm.com \
--cc=frederic@kernel.org \
--cc=fujita.tomonori@gmail.com \
--cc=hkallweit1@gmail.com \
--cc=jstultz@google.com \
--cc=juri.lelli@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mgorman@suse.de \
--cc=mingo@redhat.com \
--cc=netdev@vger.kernel.org \
--cc=ojeda@kernel.org \
--cc=peterz@infradead.org \
--cc=rostedt@goodmis.org \
--cc=rust-for-linux@vger.kernel.org \
--cc=sboyd@kernel.org \
--cc=tglx@linutronix.de \
--cc=tmgross@umich.edu \
--cc=vincent.guittot@linaro.org \
--cc=vschneid@redhat.com \
/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
all inboxes | Powered by JetHome®