From: Andreas Hindborg <a.hindborg@kernel.org>
To: "Boqun Feng" <boqun.feng@gmail.com>,
"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" <lossin@kernel.org>,
"Alice Ryhl" <aliceryhl@google.com>,
"Trevor Gross" <tmgross@umich.edu>,
"Danilo Krummrich" <dakr@kernel.org>,
"Jens Axboe" <axboe@kernel.dk>
Cc: linux-block@vger.kernel.org, rust-for-linux@vger.kernel.org,
linux-kernel@vger.kernel.org,
Andreas Hindborg <a.hindborg@kernel.org>
Subject: [PATCH v3 05/16] rust: str: introduce `NullTerminatedFormatter`
Date: Fri, 11 Jul 2025 13:43:06 +0200 [thread overview]
Message-ID: <20250711-rnull-up-v6-16-v3-5-3a262b4e2921@kernel.org> (raw)
In-Reply-To: <20250711-rnull-up-v6-16-v3-0-3a262b4e2921@kernel.org>
Add `NullTerminatedFormatter`, a formatter that writes a null terminated
string to an array or slice buffer. Because this type needs to manage the
trailing null marker, the existing formatters cannot be used to implement
this type.
Signed-off-by: Andreas Hindborg <a.hindborg@kernel.org>
---
rust/kernel/str.rs | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 50 insertions(+)
diff --git a/rust/kernel/str.rs b/rust/kernel/str.rs
index b1bc584803b0..c58925438c6e 100644
--- a/rust/kernel/str.rs
+++ b/rust/kernel/str.rs
@@ -838,6 +838,56 @@ fn write_str(&mut self, s: &str) -> fmt::Result {
}
}
+/// A mutable reference to a byte buffer where a string can be written into.
+///
+/// The buffer will be automatically null terminated after the last written character.
+///
+/// # Invariants
+///
+/// `buffer` is always null terminated.
+pub(crate) struct NullTerminatedFormatter<'a> {
+ buffer: &'a mut [u8],
+}
+
+impl<'a> NullTerminatedFormatter<'a> {
+ /// Create a new [`Self`] instance.
+ pub(crate) fn new(buffer: &'a mut [u8]) -> Option<NullTerminatedFormatter<'a>> {
+ *(buffer.first_mut()?) = 0;
+
+ // INVARIANT: We null terminated the buffer above.
+ Some(Self { buffer })
+ }
+
+ #[expect(dead_code)]
+ pub(crate) fn from_array<const N: usize>(
+ buffer: &'a mut [crate::ffi::c_char; N],
+ ) -> Option<NullTerminatedFormatter<'a>> {
+ Self::new(buffer)
+ }
+}
+
+impl Write for NullTerminatedFormatter<'_> {
+ fn write_str(&mut self, s: &str) -> fmt::Result {
+ let bytes = s.as_bytes();
+ let len = bytes.len();
+
+ // We want space for a null terminator. Buffer length is always at least 1, so no overflow.
+ if len > self.buffer.len() - 1 {
+ return Err(fmt::Error);
+ }
+
+ let buffer = core::mem::take(&mut self.buffer);
+ // We break the null termination invariant for a short while.
+ buffer[..len].copy_from_slice(bytes);
+ self.buffer = &mut buffer[len..];
+
+ // INVARIANT: We null terminate the buffer.
+ self.buffer[0] = 0;
+
+ Ok(())
+ }
+}
+
/// An owned string that is guaranteed to have exactly one `NUL` byte, which is at the end.
///
/// Used for interoperability with kernel APIs that take C strings.
--
2.47.2
next prev parent reply other threads:[~2025-07-11 11:43 UTC|newest]
Thread overview: 56+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-07-11 11:43 [PATCH v3 00/16] rnull: add configfs, remote completion to rnull Andreas Hindborg
2025-07-11 11:43 ` [PATCH v3 01/16] rust: str: normalize imports in `str.rs` Andreas Hindborg
2025-08-06 12:59 ` Daniel Almeida
2025-07-11 11:43 ` [PATCH v3 02/16] rust: str: allow `str::Formatter` to format into `&mut [u8]` Andreas Hindborg
2025-07-15 9:34 ` Alice Ryhl
2025-08-06 13:05 ` Daniel Almeida
2025-08-06 14:32 ` Andreas Hindborg
2025-07-11 11:43 ` [PATCH v3 03/16] rust: str: expose `str::Formatter::new` publicly Andreas Hindborg
2025-07-15 9:35 ` Alice Ryhl
2025-08-06 13:06 ` Daniel Almeida
2025-07-11 11:43 ` [PATCH v3 04/16] rust: str: make `RawFormatter::bytes_written` public Andreas Hindborg
2025-07-15 9:36 ` Alice Ryhl
2025-08-06 9:43 ` Andreas Hindborg
2025-08-06 13:07 ` Daniel Almeida
2025-07-11 11:43 ` Andreas Hindborg [this message]
2025-07-15 9:40 ` [PATCH v3 05/16] rust: str: introduce `NullTerminatedFormatter` Alice Ryhl
2025-08-06 10:07 ` Andreas Hindborg
2025-08-06 13:15 ` Daniel Almeida
2025-08-06 14:47 ` Andreas Hindborg
2025-07-11 11:43 ` [PATCH v3 06/16] rust: block: normalize imports for `gen_disk.rs` Andreas Hindborg
2025-08-06 13:18 ` Daniel Almeida
2025-08-06 14:51 ` Andreas Hindborg
2025-08-06 15:31 ` Daniel Almeida
2025-08-07 7:12 ` Andreas Hindborg
2025-07-11 11:43 ` [PATCH v3 07/16] rust: block: use `NullTerminatedFormatter` Andreas Hindborg
2025-07-15 9:41 ` Alice Ryhl
2025-08-06 13:22 ` Daniel Almeida
2025-08-06 13:24 ` Daniel Almeida
2025-08-06 14:54 ` Andreas Hindborg
2025-07-11 11:43 ` [PATCH v3 08/16] rust: block: remove `RawWriter` Andreas Hindborg
2025-07-15 9:42 ` Alice Ryhl
2025-08-06 13:25 ` Daniel Almeida
2025-07-11 11:43 ` [PATCH v3 09/16] rust: block: remove trait bound from `mq::Request` definition Andreas Hindborg
2025-08-06 17:20 ` Daniel Almeida
2025-07-11 11:43 ` [PATCH v3 10/16] rust: block: add block related constants Andreas Hindborg
2025-07-15 9:44 ` Alice Ryhl
2025-08-06 10:28 ` Andreas Hindborg
2025-08-06 17:27 ` Daniel Almeida
2025-08-07 7:26 ` Andreas Hindborg
2025-07-11 11:43 ` [PATCH v3 11/16] rnull: move driver to separate directory Andreas Hindborg
2025-07-15 9:44 ` Alice Ryhl
2025-08-06 17:28 ` Daniel Almeida
2025-07-11 11:43 ` [PATCH v3 12/16] rnull: enable configuration via `configfs` Andreas Hindborg
2025-07-15 9:47 ` Alice Ryhl
2025-08-07 9:50 ` Andreas Hindborg
2025-08-06 19:35 ` Daniel Almeida
2025-08-07 8:02 ` Andreas Hindborg
2025-07-11 11:43 ` [PATCH v3 13/16] rust: block: add `GenDisk` private data support Andreas Hindborg
2025-07-15 9:51 ` Alice Ryhl
2025-08-07 9:57 ` Andreas Hindborg
2025-07-11 11:43 ` [PATCH v3 14/16] rust: block: mq: fix spelling in a safety comment Andreas Hindborg
2025-07-15 9:51 ` Alice Ryhl
2025-07-11 11:43 ` [PATCH v3 15/16] rust: block: add remote completion to `Request` Andreas Hindborg
2025-07-15 9:52 ` Alice Ryhl
2025-07-11 11:43 ` [PATCH v3 16/16] rnull: add soft-irq completion support Andreas Hindborg
2025-07-15 9:54 ` Alice Ryhl
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=20250711-rnull-up-v6-16-v3-5-3a262b4e2921@kernel.org \
--to=a.hindborg@kernel.org \
--cc=alex.gaynor@gmail.com \
--cc=aliceryhl@google.com \
--cc=axboe@kernel.dk \
--cc=bjorn3_gh@protonmail.com \
--cc=boqun.feng@gmail.com \
--cc=dakr@kernel.org \
--cc=gary@garyguo.net \
--cc=linux-block@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=lossin@kernel.org \
--cc=ojeda@kernel.org \
--cc=rust-for-linux@vger.kernel.org \
--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
all inboxes | Powered by JetHome®