From patchwork Fri Aug 16 00:10:58 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Danilo Krummrich X-Patchwork-Id: 13765297 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id B8924C52D7F for ; Fri, 16 Aug 2024 00:13:57 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 436568D0020; Thu, 15 Aug 2024 20:13:57 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 3E5FB8D0002; Thu, 15 Aug 2024 20:13:57 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 25FE88D0020; Thu, 15 Aug 2024 20:13:57 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 10B878D0002 for ; Thu, 15 Aug 2024 20:13:56 -0400 (EDT) Received: from smtpin26.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id BE779C18BE for ; Fri, 16 Aug 2024 00:13:55 +0000 (UTC) X-FDA: 82456185630.26.1458DF7 Received: from sin.source.kernel.org (sin.source.kernel.org [145.40.73.55]) by imf26.hostedemail.com (Postfix) with ESMTP id 7E98B140012 for ; Fri, 16 Aug 2024 00:13:53 +0000 (UTC) Authentication-Results: imf26.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=kwNSKklA; spf=pass (imf26.hostedemail.com: domain of dakr@kernel.org designates 145.40.73.55 as permitted sender) smtp.mailfrom=dakr@kernel.org; dmarc=pass (policy=none) header.from=kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1723767161; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=YVlRIGjKrky83SwlEBkRFk0JAB1C1NkcTw6dERrOi7A=; b=e22skFtldKs36RAjHrL/7H6uMHuxHG/3lCAbF2kLUh4fZZemihFdwhnCyl7tU3M5c9ARgA sA8YCswrqXKa4XOU7QXCLOhWzAby1oPwslAGAQ244KWOKrZ+4TtuVnVXIzNchkwudKkjW/ gfU5QEtt9+8u7P/zMM6ML5q29WqfQvQ= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1723767161; a=rsa-sha256; cv=none; b=xeiCD06YGwqcHfcKPpV1Z2xmSnUTt8KojfXyWFF8vIRbzCedTNyEgn69VIkHAG+jqEru4E tecpvIL94lk5haCz4+BmcDtpIp1C3QdEaFIQFhXwuyr6NYSdoZO8cRiKtPkXX4INS0mjjM 6GvRpCvG76fjX2o3nZadSq1SxOslKWw= ARC-Authentication-Results: i=1; imf26.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=kwNSKklA; spf=pass (imf26.hostedemail.com: domain of dakr@kernel.org designates 145.40.73.55 as permitted sender) smtp.mailfrom=dakr@kernel.org; dmarc=pass (policy=none) header.from=kernel.org Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by sin.source.kernel.org (Postfix) with ESMTP id DCCB6CE1DAC; Fri, 16 Aug 2024 00:13:50 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 40A05C4AF0E; Fri, 16 Aug 2024 00:13:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1723767230; bh=/IVTEZ8IJyX2uH5PONM0GW+O0B5cMSclqREBcc8U/Lc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=kwNSKklAX7D46eaXLcc20Q1yBOkHDDqt3V5M3ch90Tz8OQZM1PzhcDvZmPwQ8MEXV g2XUaQDGQbyr1dWqY/v4a3ykaDIIDMVnwmecpt3MvhknLI+lu/1Jd3OLL8oM2lVg/D GPFg0MSjL6JCzLe8jEYXEk7HEb0VY7rwM3wkGQ2CzWf4lO/CW5z931rbdtbMmt1m7n Cx9LNPlC5/IdYS2R6ssl7EGS5/Q1ChM2XPXc042ac7xRwJGxAUwTDbAuKpv5tzbBTt WBYWDgbVOd8Y9qqqCpUQiMXlPnSu3I6HBkkDqhgr9XZoTM7hAz6mfwZsFrjPL9mj9Z P1cYZD7OfjjWw== From: Danilo Krummrich To: ojeda@kernel.org, alex.gaynor@gmail.com, wedsonaf@gmail.com, boqun.feng@gmail.com, gary@garyguo.net, bjorn3_gh@protonmail.com, benno.lossin@proton.me, a.hindborg@samsung.com, aliceryhl@google.com, akpm@linux-foundation.org Cc: daniel.almeida@collabora.com, faith.ekstrand@collabora.com, boris.brezillon@collabora.com, lina@asahilina.net, mcanal@igalia.com, zhiw@nvidia.com, cjia@nvidia.com, jhubbard@nvidia.com, airlied@redhat.com, ajanulgu@redhat.com, lyude@redhat.com, linux-kernel@vger.kernel.org, rust-for-linux@vger.kernel.org, linux-mm@kvack.org, Danilo Krummrich Subject: [PATCH v6 16/26] rust: treewide: switch to the kernel `Vec` type Date: Fri, 16 Aug 2024 02:10:58 +0200 Message-ID: <20240816001216.26575-17-dakr@kernel.org> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20240816001216.26575-1-dakr@kernel.org> References: <20240816001216.26575-1-dakr@kernel.org> MIME-Version: 1.0 X-Rspamd-Queue-Id: 7E98B140012 X-Stat-Signature: 4yjqf9ndx9yiuc1mmqcr15n8wa5rxqmr X-Rspamd-Server: rspam09 X-Rspam-User: X-HE-Tag: 1723767233-210316 X-HE-Meta: U2FsdGVkX1+UtAOTPcSoxRm3MVAzb4llv+df8AhB03P83PiUtRWZJwxwqfiJobHQGFAnqPgqUAcYA7X1v70DexgLQ7rY94s1Q0qd2bPNhrOKO6E+WEbKn72CCD5JwTvslTIl7To6+lat+AlngQusLtmgVi94Mk4RSmh3YuvIcGF38IL8Ab4+cWrt6FfaGTZS9iI9GFyIe6Bd+00UwSil65Sz25wOoGD+zq3I64w+yleMIJM1s0VKi0vjInuPo2JGiHeXqENhhVEWiODolgQhgXocQPLVereJpm8xdwUETC2AH17YLFAvpK1LlDmS1aPok2ISdhfHYuJZlGU97u8u+lEgHPgyqJLR2fzOY/P7RLSUnbsb7CWDxAjbCrLoODTMw5+KTGmc2O4wpIHl6R6Htpuymc6n+/YS9rvvf1EnBCD6Qe2/TxSH5DOxPaX0/yyFYalH5KGmglr/4uq2I0LACMTKvGShpQFxvaw6cjU235mVhyU/BHAytK0QTyCJ5kB64O38znlqw65jZlWAEvHmpXgciEoPP/uwAvSr/qC7HVEdv5VAmIr4EWr/7tU/NrfHyINgv28n+zSh5f2MtjTtsur+sFBMN3s0LswAv80vNuGKQnD89qpTDLbjiNma7K368PDYPa+Jh1fcXEyaR5m8KuIIIiDremEPcOhrYqqYA/UWHY1K/5QILbFji88Dr+61lvV0daQ0gLEj+QbQ0PrU0oUPE7xeYb8Y7UvnJlAT/Ye/dRTJF9QjAXrjagaijcEf02mx4O/0UZyhG/bZI6y1smZRyGa5aD/aAL6rrqABlcyccDof/OhD6K/ze+HiquMxfLupwGaAqLv/xi2BqS5DInqe2ehns5QIyTBbPoTzkkb4/H5KPT8VOKwcQZTCyMMs2oCWjbHUH7ObesIg7IEHHT4ytFO7R4UUeTEPkmGHOLohjaGsJPHgHTQPqfzfIb/HLOL1FwvUpvrqK4FXC5c T9nzUe59 hltmLYBpcb00CKcK4yEgEffVGNOyVeI/bwt5zrlA/yGGQdUPYWAtGekjzPAV/oUgsLc23Xx3IfytXHdo00aTQHauM7CeAXxE5cMkWWdYRFpOko5hd/iiwgAM74PkgDObUzRh863dox56SjrRGZyU+2Ly9Tewru1Q/gcG5be9D6FgD3QPDV+rmMYNtZOS6PiK+5XtBlh8yv9i4zF6l30xCuMxS0EfVetpIKEbQUPm+1sMnayJigCuOyAeo3c3fyMUE/PM2fibQhzkxEtLfgt6YFgqPyQznv/JejmudIZ2bXCRmNS717vSudyiaBvI9c3R/HgFC49k02eVD9ys= X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: Now that we got the kernel `Vec` in place, convert all existing `Vec` users to make use of it. Reviewed-by: Alice Ryhl Signed-off-by: Danilo Krummrich Reviewed-by: Benno Lossin --- rust/kernel/str.rs | 12 +++++------- rust/kernel/sync/locked_by.rs | 2 +- rust/kernel/types.rs | 2 +- rust/kernel/uaccess.rs | 17 +++++++---------- rust/macros/lib.rs | 6 +++--- samples/rust/rust_minimal.rs | 4 ++-- 6 files changed, 19 insertions(+), 24 deletions(-) diff --git a/rust/kernel/str.rs b/rust/kernel/str.rs index bb8d4f41475b..209ad1bb1a49 100644 --- a/rust/kernel/str.rs +++ b/rust/kernel/str.rs @@ -2,8 +2,7 @@ //! String representations. -use crate::alloc::{flags::*, vec_ext::VecExt, AllocError}; -use alloc::vec::Vec; +use crate::alloc::{flags::*, AllocError, KVec}; use core::fmt::{self, Write}; use core::ops::{self, Deref, DerefMut, Index}; @@ -790,7 +789,7 @@ fn write_str(&mut self, s: &str) -> fmt::Result { /// assert_eq!(s.is_ok(), false); /// ``` pub struct CString { - buf: Vec, + buf: KVec, } impl CString { @@ -803,7 +802,7 @@ pub fn try_from_fmt(args: fmt::Arguments<'_>) -> Result { let size = f.bytes_written(); // Allocate a vector with the required number of bytes, and write to it. - let mut buf = as VecExt<_>>::with_capacity(size, GFP_KERNEL)?; + let mut buf = KVec::with_capacity(size, GFP_KERNEL)?; // SAFETY: The buffer stored in `buf` is at least of size `size` and is valid for writes. let mut f = unsafe { Formatter::from_buffer(buf.as_mut_ptr(), size) }; f.write_fmt(args)?; @@ -850,10 +849,9 @@ impl<'a> TryFrom<&'a CStr> for CString { type Error = AllocError; fn try_from(cstr: &'a CStr) -> Result { - let mut buf = Vec::new(); + let mut buf = KVec::new(); - as VecExt<_>>::extend_from_slice(&mut buf, cstr.as_bytes_with_nul(), GFP_KERNEL) - .map_err(|_| AllocError)?; + buf.extend_from_slice(cstr.as_bytes_with_nul(), GFP_KERNEL)?; // INVARIANT: The `CStr` and `CString` types have the same invariants for // the string data, and we copied it over without changes. diff --git a/rust/kernel/sync/locked_by.rs b/rust/kernel/sync/locked_by.rs index babc731bd5f6..b94517231fcc 100644 --- a/rust/kernel/sync/locked_by.rs +++ b/rust/kernel/sync/locked_by.rs @@ -43,7 +43,7 @@ /// struct InnerDirectory { /// /// The sum of the bytes used by all files. /// bytes_used: u64, -/// _files: Vec, +/// _files: KVec, /// } /// /// struct Directory { diff --git a/rust/kernel/types.rs b/rust/kernel/types.rs index 234b615662a2..43f6efbe31c6 100644 --- a/rust/kernel/types.rs +++ b/rust/kernel/types.rs @@ -172,7 +172,7 @@ unsafe fn borrow_mut<'a>(_: *const core::ffi::c_void) -> Self::BorrowedMut<'a> { /// # use kernel::types::ScopeGuard; /// fn example3(arg: bool) -> Result { /// let mut vec = -/// ScopeGuard::new_with_data(Vec::new(), |v| pr_info!("vec had {} elements\n", v.len())); +/// ScopeGuard::new_with_data(KVec::new(), |v| pr_info!("vec had {} elements\n", v.len())); /// /// vec.push(10u8, GFP_KERNEL)?; /// if arg { diff --git a/rust/kernel/uaccess.rs b/rust/kernel/uaccess.rs index e9347cff99ab..bc011061de45 100644 --- a/rust/kernel/uaccess.rs +++ b/rust/kernel/uaccess.rs @@ -11,7 +11,6 @@ prelude::*, types::{AsBytes, FromBytes}, }; -use alloc::vec::Vec; use core::ffi::{c_ulong, c_void}; use core::mem::{size_of, MaybeUninit}; @@ -46,7 +45,6 @@ /// every byte in the region. /// /// ```no_run -/// use alloc::vec::Vec; /// use core::ffi::c_void; /// use kernel::error::Result; /// use kernel::uaccess::{UserPtr, UserSlice}; @@ -54,7 +52,7 @@ /// fn bytes_add_one(uptr: UserPtr, len: usize) -> Result<()> { /// let (read, mut write) = UserSlice::new(uptr, len).reader_writer(); /// -/// let mut buf = Vec::new(); +/// let mut buf = KVec::new(); /// read.read_all(&mut buf, GFP_KERNEL)?; /// /// for b in &mut buf { @@ -69,7 +67,6 @@ /// Example illustrating a TOCTOU (time-of-check to time-of-use) bug. /// /// ```no_run -/// use alloc::vec::Vec; /// use core::ffi::c_void; /// use kernel::error::{code::EINVAL, Result}; /// use kernel::uaccess::{UserPtr, UserSlice}; @@ -78,21 +75,21 @@ /// fn is_valid(uptr: UserPtr, len: usize) -> Result { /// let read = UserSlice::new(uptr, len).reader(); /// -/// let mut buf = Vec::new(); +/// let mut buf = KVec::new(); /// read.read_all(&mut buf, GFP_KERNEL)?; /// /// todo!() /// } /// /// /// Returns the bytes behind this user pointer if they are valid. -/// fn get_bytes_if_valid(uptr: UserPtr, len: usize) -> Result> { +/// fn get_bytes_if_valid(uptr: UserPtr, len: usize) -> Result> { /// if !is_valid(uptr, len)? { /// return Err(EINVAL); /// } /// /// let read = UserSlice::new(uptr, len).reader(); /// -/// let mut buf = Vec::new(); +/// let mut buf = KVec::new(); /// read.read_all(&mut buf, GFP_KERNEL)?; /// /// // THIS IS A BUG! The bytes could have changed since we checked them. @@ -130,7 +127,7 @@ pub fn new(ptr: UserPtr, length: usize) -> Self { /// Reads the entirety of the user slice, appending it to the end of the provided buffer. /// /// Fails with [`EFAULT`] if the read happens on a bad address. - pub fn read_all(self, buf: &mut Vec, flags: Flags) -> Result { + pub fn read_all(self, buf: &mut KVec, flags: Flags) -> Result { self.reader().read_all(buf, flags) } @@ -291,9 +288,9 @@ pub fn read(&mut self) -> Result { /// Reads the entirety of the user slice, appending it to the end of the provided buffer. /// /// Fails with [`EFAULT`] if the read happens on a bad address. - pub fn read_all(mut self, buf: &mut Vec, flags: Flags) -> Result { + pub fn read_all(mut self, buf: &mut KVec, flags: Flags) -> Result { let len = self.length; - VecExt::::reserve(buf, len, flags)?; + buf.reserve(len, flags)?; // The call to `try_reserve` was successful, so the spare capacity is at least `len` bytes // long. diff --git a/rust/macros/lib.rs b/rust/macros/lib.rs index c327fe0617c8..a733168d40f9 100644 --- a/rust/macros/lib.rs +++ b/rust/macros/lib.rs @@ -238,7 +238,7 @@ pub fn concat_idents(ts: TokenStream) -> TokenStream { /// #[pin_data] /// struct DriverData { /// #[pin] -/// queue: Mutex>, +/// queue: Mutex>, /// buf: KBox<[u8; 1024 * 1024]>, /// } /// ``` @@ -247,7 +247,7 @@ pub fn concat_idents(ts: TokenStream) -> TokenStream { /// #[pin_data(PinnedDrop)] /// struct DriverData { /// #[pin] -/// queue: Mutex>, +/// queue: Mutex>, /// buf: KBox<[u8; 1024 * 1024]>, /// raw_info: *mut Info, /// } @@ -277,7 +277,7 @@ pub fn pin_data(inner: TokenStream, item: TokenStream) -> TokenStream { /// #[pin_data(PinnedDrop)] /// struct DriverData { /// #[pin] -/// queue: Mutex>, +/// queue: Mutex>, /// buf: KBox<[u8; 1024 * 1024]>, /// raw_info: *mut Info, /// } diff --git a/samples/rust/rust_minimal.rs b/samples/rust/rust_minimal.rs index 2a9eaab62d1c..4aaf117bf8e3 100644 --- a/samples/rust/rust_minimal.rs +++ b/samples/rust/rust_minimal.rs @@ -13,7 +13,7 @@ } struct RustMinimal { - numbers: Vec, + numbers: KVec, } impl kernel::Module for RustMinimal { @@ -21,7 +21,7 @@ fn init(_module: &'static ThisModule) -> Result { pr_info!("Rust minimal sample (init)\n"); pr_info!("Am I built-in? {}\n", !cfg!(MODULE)); - let mut numbers = Vec::new(); + let mut numbers = KVec::new(); numbers.push(72, GFP_KERNEL)?; numbers.push(108, GFP_KERNEL)?; numbers.push(200, GFP_KERNEL)?;