rust-for-linux.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
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>,
	"Breno Leitao" <leitao@debian.org>
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 v6 04/18] rust: str: introduce `NullTerminatedFormatter`
Date: Fri, 22 Aug 2025 14:14:40 +0200	[thread overview]
Message-ID: <20250822-rnull-up-v6-16-v6-4-ec65006e2f07@kernel.org> (raw)
In-Reply-To: <20250822-rnull-up-v6-16-v6-0-ec65006e2f07@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.

Reviewed-by: Alice Ryhl <aliceryhl@google.com>
Signed-off-by: Andreas Hindborg <a.hindborg@kernel.org>
---
 rust/kernel/str.rs | 49 +++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 49 insertions(+)

diff --git a/rust/kernel/str.rs b/rust/kernel/str.rs
index 46cdc85dad63..d8326f7bc9c1 100644
--- a/rust/kernel/str.rs
+++ b/rust/kernel/str.rs
@@ -871,6 +871,55 @@ 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
+///
+/// * The first byte of `buffer` is always zero.
+/// * The length of `buffer` is at least 1.
+pub(crate) struct NullTerminatedFormatter<'a> {
+    buffer: &'a mut [u8],
+}
+
+impl<'a> NullTerminatedFormatter<'a> {
+    /// Create a new [`Self`] instance.
+    #[expect(dead_code)]
+    pub(crate) fn new(buffer: &'a mut [u8]) -> Option<NullTerminatedFormatter<'a>> {
+        *(buffer.first_mut()?) = 0;
+
+        // INVARIANT:
+        //  - We wrote zero to the first byte above.
+        //  - If buffer was not at least length 1, `buffer.first_mut()` would return None.
+        Some(Self { 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 zero. By type invariant, buffer length is always at least 1, so no
+        // underflow.
+        if len > self.buffer.len() - 1 {
+            return Err(fmt::Error);
+        }
+
+        let buffer = core::mem::take(&mut self.buffer);
+        // We break the zero start invariant for a short while.
+        buffer[..len].copy_from_slice(bytes);
+        // INVARIANT: We checked above that buffer will have size at least 1 after this assignment.
+        self.buffer = &mut buffer[len..];
+
+        // INVARIANT: We write zero to the first byte of 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



  parent reply	other threads:[~2025-08-22 12:15 UTC|newest]

Thread overview: 38+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-08-22 12:14 [PATCH v6 00/18] rnull: add configfs, remote completion to rnull Andreas Hindborg
2025-08-22 12:14 ` [PATCH v6 01/18] rust: str: normalize imports in `str.rs` Andreas Hindborg
2025-08-27 12:25   ` Daniel Almeida
2025-08-22 12:14 ` [PATCH v6 02/18] rust: str: allow `str::Formatter` to format into `&mut [u8]` Andreas Hindborg
2025-08-22 12:14 ` [PATCH v6 03/18] rust: str: expose `str::{Formatter, RawFormatter}` publicly Andreas Hindborg
2025-08-27 12:57   ` Daniel Almeida
2025-08-22 12:14 ` Andreas Hindborg [this message]
2025-08-27 13:02   ` [PATCH v6 04/18] rust: str: introduce `NullTerminatedFormatter` Daniel Almeida
2025-08-22 12:14 ` [PATCH v6 05/18] rust: str: introduce `kstrtobool` function Andreas Hindborg
2025-08-27 13:10   ` Daniel Almeida
2025-08-22 12:14 ` [PATCH v6 06/18] rust: str: add `bytes_to_bool` helper function Andreas Hindborg
2025-08-27 13:46   ` Daniel Almeida
2025-09-01  8:07     ` Andreas Hindborg
2025-09-01  8:36     ` Alice Ryhl
2025-09-01  8:34   ` Alice Ryhl
2025-09-01 14:40   ` Daniel Almeida
2025-08-22 12:14 ` [PATCH v6 07/18] rust: configfs: re-export `configfs_attrs` from `configfs` module Andreas Hindborg
2025-08-27 13:48   ` Daniel Almeida
2025-08-22 12:14 ` [PATCH v6 08/18] rust: block: normalize imports for `gen_disk.rs` Andreas Hindborg
2025-08-22 12:14 ` [PATCH v6 09/18] rust: block: use `NullTerminatedFormatter` Andreas Hindborg
2025-08-27 13:50   ` Daniel Almeida
2025-08-22 12:14 ` [PATCH v6 10/18] rust: block: remove `RawWriter` Andreas Hindborg
2025-08-22 12:14 ` [PATCH v6 11/18] rust: block: remove trait bound from `mq::Request` definition Andreas Hindborg
2025-08-22 12:14 ` [PATCH v6 12/18] rust: block: add block related constants Andreas Hindborg
2025-08-27 13:52   ` Daniel Almeida
2025-08-22 12:14 ` [PATCH v6 13/18] rnull: move driver to separate directory Andreas Hindborg
2025-08-22 12:14 ` [PATCH v6 14/18] rnull: enable configuration via `configfs` Andreas Hindborg
2025-08-27 14:10   ` Daniel Almeida
2025-08-22 12:14 ` [PATCH v6 15/18] rust: block: add `GenDisk` private data support Andreas Hindborg
2025-08-27 17:52   ` Daniel Almeida
2025-09-01  8:21     ` Andreas Hindborg
2025-08-22 12:14 ` [PATCH v6 16/18] rust: block: mq: fix spelling in a safety comment Andreas Hindborg
2025-08-22 12:14 ` [PATCH v6 17/18] rust: block: add remote completion to `Request` Andreas Hindborg
2025-08-27 18:00   ` Daniel Almeida
2025-08-29 11:12     ` Andreas Hindborg
2025-09-01 14:24       ` Daniel Almeida
2025-08-22 12:14 ` [PATCH v6 18/18] rnull: add soft-irq completion support Andreas Hindborg
2025-08-27 18:02   ` Daniel Almeida

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=20250822-rnull-up-v6-16-v6-4-ec65006e2f07@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=leitao@debian.org \
    --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;
as well as URLs for NNTP newsgroup(s).