From patchwork Thu Aug 1 00:02:17 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Danilo Krummrich X-Patchwork-Id: 13749357 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 005EBC3DA64 for ; Thu, 1 Aug 2024 00:08:37 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 7C49E6B0082; Wed, 31 Jul 2024 20:08:37 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 74C5C6B00B4; Wed, 31 Jul 2024 20:08:37 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 5C5646B00B6; Wed, 31 Jul 2024 20:08:37 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id 3D3FF6B0082 for ; Wed, 31 Jul 2024 20:08:37 -0400 (EDT) Received: from smtpin20.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 04136A5F89 for ; Thu, 1 Aug 2024 00:08:36 +0000 (UTC) X-FDA: 82401740274.20.3CBCDE0 Received: from sin.source.kernel.org (sin.source.kernel.org [145.40.73.55]) by imf23.hostedemail.com (Postfix) with ESMTP id 9FC9714000A for ; Thu, 1 Aug 2024 00:08:34 +0000 (UTC) Authentication-Results: imf23.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=Js2NMZY6; dmarc=pass (policy=none) header.from=kernel.org; spf=pass (imf23.hostedemail.com: domain of dakr@kernel.org designates 145.40.73.55 as permitted sender) smtp.mailfrom=dakr@kernel.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1722470873; a=rsa-sha256; cv=none; b=AUSMQAIZIIG0KWynqmRd0LdRqVO+bReFefsvpH4xoeh0sHOiNazSe2qaiXRafCzSLS5NnB 9x4ww3DKO64f8AkRFiPdbvKuOBUz5BgKjLvS2bds0+UnwpA8EwnoKAv2XO2MDDkryT3hI4 JvRE6fTW+gj3rj5WzsHjbIjKcU/HaWk= ARC-Authentication-Results: i=1; imf23.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=Js2NMZY6; dmarc=pass (policy=none) header.from=kernel.org; spf=pass (imf23.hostedemail.com: domain of dakr@kernel.org designates 145.40.73.55 as permitted sender) smtp.mailfrom=dakr@kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1722470873; 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=UvOfU0R+hg1oth9/zC3aXsxQxeeSoH7BgqFff9j+An8=; b=RDr86MO7jWbC5DDJxWKfVlUOSKeAIVSYFw+JWpCiNEOE3oH7ByLlshssa65dNQE2oYGHR6 BHwCbEAPnIWRxdp5/atk71PPyydFqS8ORRCo46BxsXfC9T3JZRc3ieapbfxZgnUSK4ZiCf z32DsLffN+ARVXTtKzzyFk6roRLlxOs= Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by sin.source.kernel.org (Postfix) with ESMTP id EF277CE11E4; Thu, 1 Aug 2024 00:08:31 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 463FAC4AF0F; Thu, 1 Aug 2024 00:08:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1722470911; bh=OUyFX4Ajg0yzg7q3aN3a+WdxriUzErZ+JXbxE/+fux8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Js2NMZY6KzQF8+HOV/w9yQBdGTLitDFYjSDJAYJkoz0gvQOXybeowYVyKR1HmX4rC BKfFSWgc0PTmCt/CV4FK3bEntTZ43LLG0ANOF7SchZlYZZKOptkJfSAiDe72B0YXsV 8mMM+N3dPxgTdBtUo/UQjSD2CNgJMzvry0fU5GkfQQMFQxw7dSJiGVSd89Loae0/dP LMhti3ixkeUFln9mVriL9OQCtzb+g/0UtXUrob8xfQnApB7ISDqlh147HA//cYwreG BCirXNxiRHFFRXbIZoehuAKavolfU1YGsdHljBv7yH8PJfdxkjSGXJm7yXaBEAmwtS 1t7Q5rYR2JsCg== 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, acurrid@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 v3 18/25] rust: treewide: switch to the kernel `Vec` type Date: Thu, 1 Aug 2024 02:02:17 +0200 Message-ID: <20240801000641.1882-19-dakr@kernel.org> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240801000641.1882-1-dakr@kernel.org> References: <20240801000641.1882-1-dakr@kernel.org> MIME-Version: 1.0 X-Rspamd-Queue-Id: 9FC9714000A X-Rspam-User: X-Rspamd-Server: rspam05 X-Stat-Signature: pek1f5zciu3rmbugwte3eq4xfhy9ofrz X-HE-Tag: 1722470914-357637 X-HE-Meta: U2FsdGVkX18nrrebooVwXEckYUdQeliKmLkEnRB0CJYmBylkU8Ym5jcmuMFzU9e33DnRljnGcgDvCXzFdeLyIKQUW4iff6OhxL0GSGwSS1G3MIdmKYqz4n29aq+RW05hYOJszIXftQBPg0manyozoi3fHrC5mrW/LQsOKBvpfsscwEMb9xqvn5Js0oJgN6cn+3GNGQHuS4ZqAXiyv5bUNVCeHIY8DWL49SaYgYZDTgj5Xi4tfgeQ2Ffr0VgoF6Q/1EaVuiXUpSeKyb/4L2FMZXoUsUIV8LbyiMcQI8V0IiaYhFfo44TI1mr0HubLlYvi+g7YjHa8CaWc28VrUBOX9yJvcpmIS489I7NSnjjyn6XjgnS3IdbMDS53h0eqpVKDES7WdLBxNwfqv2uVDz1LoazXrw/bBYEwHRYqGksZZ3VI2OHE3QLxX5lvDuzJtzt2FuTEBWmQ25Jbiziz0ZgjiZq9LSQfjbYfYuumLOjNqnD5M51wHcYhLzeelH3HYX4DTTYKBxCHDtZ1wc5PTZmQqqoCBJWevf3LpzW61qZYlQ3Sw0w/CRzYH+jNZHV5hR3wpWhkBFMHRcfGx3hAYUEnepbque509RsUn+hCHoEHr9LLWlU9h1gXE2mfSvgcHiRRqv1WChvHBVSq4osp86P0yoyfcfnbAjPFQL2E2dGGKtFOeK2WyYaYta5CeJJyAPqA0W+Bzs9StL7dr3AFvFqlIt7IZ1r56cbYG3YPXWn7q3uoEpo4aIGDvdrDr0b46jUd/ZWVFUbqshut0Vh+s2dp7D2RjIERCES5mRVCChwTKBt0s7dB85nlr3DzGEnYd/qpN7tlQ9dyQcfBRUXQ/oXgUP/6qKvM5X4Yxs97RHWEUSwElxQV/w0/y+7tIHEX4tTLET8VkpYyUIcP/K52gp4Bg7etlE1+7HKEjUkhYTm32AKPLwWhIuqR0q9emj7AcyGd7gYgcDtiEVQR1nd/zhz z9EsugIK PFD6mISJ0P2kcr5fMrVDxF/TZ5C/lt97KK85O3sN8pDn8dJjK+TUwjnlyn/JL5scuyAkuiIyy19X9gR7ZdD/uWUuYy6DtskZ+IM49BXp+NR3R2xxLsh/bYiUtqmWEEUXlmYm+HV9AdIIw7ogW7AJXpjMWU/Q5LZRQe4J6C/BijZ5stp/NDzmRnP1Zcb+kQgiaLGT69nkb/nrCvEDeISI8rLDq5V8wvH0zImdtBOAKMvhtD9B36+3osvZlbk/mzNEm1tK65o4Y6QSl2b1098mNZ6jGlUAItk1x9XObhZVH1Oeb8IKFgOiyfT0kfg== X-Bogosity: Ham, tests=bogofilter, spamicity=0.000002, 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. Signed-off-by: Danilo Krummrich --- rust/kernel/str.rs | 12 +++++------- rust/kernel/sync/locked_by.rs | 2 +- rust/kernel/types.rs | 2 +- rust/kernel/uaccess.rs | 15 ++++++--------- samples/rust/rust_minimal.rs | 4 ++-- 5 files changed, 15 insertions(+), 20 deletions(-) diff --git a/rust/kernel/str.rs b/rust/kernel/str.rs index bb8d4f41475b..0b6ffbade521 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)?; + KVec::extend_from_slice(&mut buf, 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 809653b9d945..1d90d2c68f74 100644 --- a/rust/kernel/types.rs +++ b/rust/kernel/types.rs @@ -158,7 +158,7 @@ unsafe fn from_foreign(_: *const core::ffi::c_void) -> Self {} /// # 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..d19002308636 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,14 +75,14 @@ /// 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); /// } @@ -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)?; + KVec::::reserve(buf, len, flags)?; // The call to `try_reserve` was successful, so the spare capacity is at least `len` bytes // long. 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)?;