From patchwork Thu Aug 1 00:02:05 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Danilo Krummrich X-Patchwork-Id: 13749345 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 251FEC3DA7F for ; Thu, 1 Aug 2024 00:07:29 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id AA90B6B009B; Wed, 31 Jul 2024 20:07:28 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id A58526B009C; Wed, 31 Jul 2024 20:07:28 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 8D2D76B009D; Wed, 31 Jul 2024 20:07:28 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id 6DF8C6B009B for ; Wed, 31 Jul 2024 20:07:28 -0400 (EDT) Received: from smtpin04.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 2A9F81606F3 for ; Thu, 1 Aug 2024 00:07:28 +0000 (UTC) X-FDA: 82401737376.04.C5FC6D0 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf13.hostedemail.com (Postfix) with ESMTP id 68A6E20005 for ; Thu, 1 Aug 2024 00:07:26 +0000 (UTC) Authentication-Results: imf13.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=f4TjSZqx; spf=pass (imf13.hostedemail.com: domain of dakr@kernel.org designates 139.178.84.217 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=1722470791; 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=y9voaciKr1Vp1HVw452qlJs0DayVYIJbO2RFcmKzf0o=; b=8JcjVTv6izSCaDdq6PNd+hQ+/Udq7TsrS3VdY6PGDETdiX3uhjU877YdF+DTq4HkimS9Rh sXBCCTdR0Dv37GgkkH/eH40GyM8XFNDbKsddywaPt2vc48gXNQQxBWuIgUS+0HKon3E+GT 6IKI+JDVlx6jyX/Zc/vFVtmGwBCYWlA= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1722470791; a=rsa-sha256; cv=none; b=ebmhjaHIjuQBgLNuk0WG1PVRRTvPzEobZKc+DHsKTB6buzY/AJFUR41z0AOs8qzVz8dgFe pc4DI6zOSBxr1z5KKKIu+8dlbMalhuq2LZWqMcaHos/BCZa77qlAsYyc4XClsQ7rVxUPuN q1vW+I66b9pzShW1FSw2/6hlNLDEuw4= ARC-Authentication-Results: i=1; imf13.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=f4TjSZqx; spf=pass (imf13.hostedemail.com: domain of dakr@kernel.org designates 139.178.84.217 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 dfw.source.kernel.org (Postfix) with ESMTP id 954136246A; Thu, 1 Aug 2024 00:07:25 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 45EF5C116B1; Thu, 1 Aug 2024 00:07:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1722470845; bh=GDa7Qic2Pqt1tK9CmgQPCpMbrxajNVkM/PqJ2bN2JNk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=f4TjSZqxqVmzLQvxNTJHLNg7/RlW2OXK4+0dwEJakt3RGW5505QubVI6Z6tVK46Uz IdScThKwTlfahGAF8bxd2o8GA+NrGumvAObrRPSmouCsa+n3vJ87K0RceE6zbnWf1Y jBHcbMPp906rAIQo4+rx0ETiriTvp3abqAFUTqoHz6W9yfIDSiB8wZ2Bcw9jrADOso efQKlU64f3dnheWV1I4rIAf2eKyf/lJxXHMm+g+P2ojV8VqXKx9fB45uTohEkzHerF WDfyIy7gid4U22Aif7zDvnDgluYy+G336U18jsq99ynxVJzxh4tt6QD82N/TQg0yJt acLK8EXntm38w== 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 06/25] rust: alloc: implement `Vmalloc` allocator Date: Thu, 1 Aug 2024 02:02:05 +0200 Message-ID: <20240801000641.1882-7-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: 68A6E20005 X-Stat-Signature: dcg5g8t1tbq7zg1so79wfazazoyufjm6 X-Rspamd-Server: rspam09 X-Rspam-User: X-HE-Tag: 1722470846-315501 X-HE-Meta: U2FsdGVkX1932VNP20YADnb+Qr5yOj+5RuyEQueegjxICM86Ufz9WlN4pzmp136odi1esTNgMIHq1wzasnJXUHdOmyOwGIFtMwkdfhcMT+yzof/TnPGPMhfWLYBSHMz+xESMXYs5fsz63UiYg0SHSDjEgP4P7m3LFbUtf5bqMXLp1UQIEeUcrvWG1+54w+5TD58YxGEjZdR9tJzCl1zv6e3rnHpDKBd9ThuhUBcJi9WEjT+R2FwouD1JMFq8zNUOYt//UjFOctWk4cNb6ze1CY1k+Voh1Eoq0eBI/8jOIrpRPiLqGIGxFLTdt7ujKvg3gVFv408IitcZKsobpyPI1co8dwiJuddrygE7fSF5ByOs8tSDr5OWhccPwzR9FPzhOAcu5YEAEHX86kOH+NdK5cVCEjQmxWaX4HluGXmX4o3VngaIjHYAgHjpj9E0C8tv6UptvqOrFh9qu3I8K0pgZd0GBA1J69GuyLO6mzNCYe+nA7aTHaOdgiw5qsxmIa3wG2VPC5eM0oAEyyMyN/qTTth9+2Hbuu8Z0blMozOq3rVFwdyFzKIH0vFKVBfqHg0QTr0t7zheTD/GvfDi+wHZcZ9mdjT92UnYVuKaiB19Ib8+tXua53r7ESPSUkRbmiFfKq/8a76FGGmqI7Ua27GgcWybH4aJJgoLkp5qdW8hPuYq3dMxPR/8JDbyGKT+48aHRqI5kIny/eo32Tm2s5TDaq0zxmcYilVaAvwKBavTPxJPg/qsp7ZURjXzrB2A34CqNW9BPCBjYfuX8kURWMwD5zOQnhT+uMz42I1lYA10fc9QrjIY0KYphyxS56WQw/yIrmE5pxMB+me6Z/Df8Ev0/3qDpUTNBaR1HggpbP6dEw4+sjuM3MAmW1HtRYhDRq7vqYFurIdG3/3n+dEhfBS+kXNejFwgCOX1UyAFmC0Hc8dSjnHyjWx+T5F0WyQ6onHDBSe8FkMJXuAzacWspMQ mRTGumVB uIirwwBaRGySc5zt1S3m8Zn6gx4SabQV//2J9aDjno3mWSC0NYzQrOYzta40+U9fxKxrACYUELJs/TO508PlUwZMwY8peSKp578cEiB4WvDwbISaVl7mmtqX3W2y6DURDrDMhTMYTQ47BewXDDrgPvfmWEVSBmNTXVuCTJET57aT4c0TP4n5qfCVBHJDCIsAPFXjfpMFpskQhMO7+goj/LsvK00yocth4PvgckGZK7+cI7xNBeCoYHYEiw3Qr1TI6XpmoZ4yV5MymNZlT9f2cY+DfG2hTpdWRzdVUBjCutYuuXLHerwGdutrokw== 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: Implement `Allocator` for `Vmalloc`, the kernel's virtually contiguous allocator, typically used for larger objects, (much) larger than page size. All memory allocations made with `Vmalloc` end up in `vrealloc()`. Signed-off-by: Danilo Krummrich Reviewed-by: Alice Ryhl --- rust/helpers.c | 8 ++++++++ rust/kernel/alloc/allocator.rs | 24 ++++++++++++++++++++++++ rust/kernel/alloc/allocator_test.rs | 1 + 3 files changed, 33 insertions(+) diff --git a/rust/helpers.c b/rust/helpers.c index 92d3c03ae1bd..4c628986f0c9 100644 --- a/rust/helpers.c +++ b/rust/helpers.c @@ -33,6 +33,7 @@ #include #include #include +#include #include #include @@ -200,6 +201,13 @@ rust_helper_krealloc(const void *objp, size_t new_size, gfp_t flags) } EXPORT_SYMBOL_GPL(rust_helper_krealloc); +void * __must_check __realloc_size(2) +rust_helper_vrealloc(const void *p, size_t size, gfp_t flags) +{ + return vrealloc(p, size, flags); +} +EXPORT_SYMBOL_GPL(rust_helper_vrealloc); + /* * `bindgen` binds the C `size_t` type as the Rust `usize` type, so we can * use it in contexts where Rust expects a `usize` like slice (array) indices. diff --git a/rust/kernel/alloc/allocator.rs b/rust/kernel/alloc/allocator.rs index 397ae5bcc043..e9a3d0694f41 100644 --- a/rust/kernel/alloc/allocator.rs +++ b/rust/kernel/alloc/allocator.rs @@ -16,6 +16,12 @@ /// `bindings::krealloc`. pub struct Kmalloc; +/// The virtually contiguous kernel allocator. +/// +/// The vmalloc allocator allocates pages from the page level allocator and maps them into the +/// contiguous kernel virtual space. +pub struct Vmalloc; + /// Returns a proper size to alloc a new object aligned to `new_layout`'s alignment. fn aligned_size(new_layout: Layout) -> usize { // Customized layouts from `Layout::from_size_align()` can have size < align, so pad first. @@ -58,6 +64,10 @@ fn krealloc() -> Self { Self(bindings::krealloc) } + fn vrealloc() -> Self { + Self(bindings::vrealloc) + } + // SAFETY: `call` has the exact same safety requirements as `Allocator::realloc`. unsafe fn call( &self, @@ -136,6 +146,20 @@ unsafe fn alloc_zeroed(&self, layout: Layout) -> *mut u8 { } } +unsafe impl Allocator for Vmalloc { + unsafe fn realloc( + ptr: Option>, + layout: Layout, + flags: Flags, + ) -> Result, AllocError> { + let realloc = ReallocFunc::vrealloc(); + + // SAFETY: If not `None`, `ptr` is guaranteed to point to valid memory, which was previously + // allocated with this `Allocator`. + unsafe { realloc.call(ptr, layout, flags) } + } +} + #[global_allocator] static ALLOCATOR: Kmalloc = Kmalloc; diff --git a/rust/kernel/alloc/allocator_test.rs b/rust/kernel/alloc/allocator_test.rs index 4785efc474a7..e7bf2982f68f 100644 --- a/rust/kernel/alloc/allocator_test.rs +++ b/rust/kernel/alloc/allocator_test.rs @@ -7,6 +7,7 @@ use core::ptr::NonNull; pub struct Kmalloc; +pub type Vmalloc = Kmalloc; unsafe impl Allocator for Kmalloc { unsafe fn realloc(