From patchwork Mon Aug 5 15:19:25 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Danilo Krummrich X-Patchwork-Id: 13753715 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 5BF8DC3DA7F for ; Mon, 5 Aug 2024 15:20:53 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id EA45A6B0099; Mon, 5 Aug 2024 11:20:52 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id E53A76B009A; Mon, 5 Aug 2024 11:20:52 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id CF46F6B009B; Mon, 5 Aug 2024 11:20:52 -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 B187F6B0099 for ; Mon, 5 Aug 2024 11:20:52 -0400 (EDT) Received: from smtpin04.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 562F7C03A4 for ; Mon, 5 Aug 2024 15:20:52 +0000 (UTC) X-FDA: 82418554344.04.16F6B92 Received: from sin.source.kernel.org (sin.source.kernel.org [145.40.73.55]) by imf02.hostedemail.com (Postfix) with ESMTP id CC4A080023 for ; Mon, 5 Aug 2024 15:20:49 +0000 (UTC) Authentication-Results: imf02.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=oXd667Z+; spf=pass (imf02.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=1722871220; 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=HAWPC78t7ZfsguX4kMtAamoZNbSBLp7VjKGba3QNS+c=; b=Al5ZvdYk87YkBlcr915OqG3EXTW1NjwBdnY+rAVrs8aeDqLMKUQlaEW6xHSe0np39zu6da jn5nh4JB26s5CKPxne6vHNiBFH1GleQGDyTJmR1/+8HUoUJOuqJ6DoP8siBzoKg1JDQ1/p 2CChn0v+dEKefCvqKQgLsthV8fssDD8= ARC-Authentication-Results: i=1; imf02.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=oXd667Z+; spf=pass (imf02.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-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1722871220; a=rsa-sha256; cv=none; b=PIIztRKsy8n6JdLUUefh/jAO6PAESyM1U+3JHNwfkmP2lkWkwKBQsCGGydkdewtnZnosQ2 raXxqxJKTVoozZ4sh7pkXHcyQR1UBI/pDnV6fr6B/XBYPoa1e5/zGx+fvKLg3+IeOxQPcq FX9ed8gVsUtwv1ZGSZkJ9NZyBfh1Ass= Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by sin.source.kernel.org (Postfix) with ESMTP id F35E4CE0ACC; Mon, 5 Aug 2024 15:20:46 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 8143FC4AF10; Mon, 5 Aug 2024 15:20:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1722871246; bh=pL/2tk9r+RNw9Wnwj5An+62HaTNk3XqGiHLSI686pwI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=oXd667Z+v76rsJOSJiwugYw609RU4d6zvS4IpyxU3I92MkwzAqckdCues4v2T1H3A vkNdhCTwWgRMUDvgFaBOa4CrrpzOesoJFqdWJ6s5Ur+j1mSjOVvnC6CHSRNSy02wF8 1vz1ux3aD2y8DiGsV6Qy6v9tyQP7p4fpsN4M8C4TPWzqAxiQ5Ghaigs4Ib6+QGFBDY HwBY/mF2ukc7pbEUUFvR6HJnpCx4dqW2N7+r/MBeru8bfevLcarBnon3YJlxnqLRVo OFkXc6ZGL7uSiXg29DTUz8afCaANoREEuu2D9NqxQ8XEIYAb8hSoHDax9s9v8CgShz wB6sBGnyImjxg== 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 v4 06/28] rust: alloc: implement `Vmalloc` allocator Date: Mon, 5 Aug 2024 17:19:25 +0200 Message-ID: <20240805152004.5039-7-dakr@kernel.org> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240805152004.5039-1-dakr@kernel.org> References: <20240805152004.5039-1-dakr@kernel.org> MIME-Version: 1.0 X-Rspamd-Server: rspam03 X-Rspam-User: X-Rspamd-Queue-Id: CC4A080023 X-Stat-Signature: yjtoushx47fab6nehtqx45azo11z98z5 X-HE-Tag: 1722871249-199535 X-HE-Meta: U2FsdGVkX1+3WJsC30uxX1Aib4WzQeIkwcT76iyfWwAK72zXjYjkqStH0ik7LsgqWJ2+nOQtjYbBm3yZb7kRr+ONlY+7URHmnLlP50mpm9Q1eHdtKI9DxbB76rS29+xy+nl8S1CFJ2RQu1Y0YRSTeya0NkzgxISf9/xWyqOvdPvtjk7cOWkWYn+hZ0ovGdPGe78gqnH0NFApg0N+Q2lyV9uMhhyfRjobhPJ/04vNazrroChURtgLRJKJZe7QHUF0AuTxyzezoVmj6QjsX+POCM1o+s0qYhJCZ7xHVPkqxeU1r74lIGFN9FDEN9nzvr2utSdvjYgkUJ08r+a/DfF9ZlL08vwzCeX2yzUZC+BlmSvkDKYWHISAI4tkfsPuQ4JYhhaZd/PLB8hNszroPIAQ6LQ0K1yeqdlEr95psIstowJNRz2Om526xLLTZkYGbP5vZp8D/5HxPbu5olE4D06Y67ASTdJBbq0bj568v/4YJggs6kz9mexTR1O6853wa8/nUk3rRRAhJi1tVFwhK0IfMB76QbuaJ2OldVTH9q4VXwkirQSbqVCdpf7lhzwUS9Ek6wIID/Z9z6f1OILfa4x7oZX6OdSNqqy9SeAa2x3935oPQXFoH9AGSweTMphV+oqn24p6RaA12mFSTvyKygrKsZfOtWrt5Q+WyHVbKEgaXbAaj8lZa5uCwJjJuMGjlTdS8Hcn+x2PY7gXAejEmeOduZCNR3pkExlBHYkKf14u9weq1KOhVF9LQ+6tSBe+efZ8WQws1O33fn6DWfoq3och4J+Z25eqfAvarP7kqxOvkIb6k+c5tGPsNSZsx2H6AwFShSLBE8DQHFHB+FaolR66f78qCWWWa8rHV6ldtVJB+Dj0/U6gs8HRu0eWisKRrQAxS072N0P4a4oFcF/gw/K3EkfiC3YIxv+24L0tUmphUyuYh5Xknm3D1Q+AydvOb0ihzDJtwdRJ4y/Lp9v4OPg 1k8OM3mD hEcw6UWeznD4P4O48ccWLECHCSKBVjpe60UAs5FpDUspj0SDaC8FvJR/m88zwOxu3LuuwPNcTLnN7y5o67FGQfRUUeZf76WMUZFhXeGEJ8ZSjol9u5LM1ZmcY5+C6W4csjdAAdIPH1+iCsZ/eaCephD3Yu9b4vmhvhZFOiixBr0XYCSlpJgMnQg6Uhl4EAY+TR/ZPtpMksgtHzRHkAmYVrWDyvSlvlW0L0etKhJ8nux1xb4fZsN97QOJ1fkp3jZxqbSzakzir1b3mmAsW0ZRn2Cvd4ZVBmYNS67BHpgwZR1z3ZwSsnWBA6ezL9RsLOblM640NRSVM5vzMjsQ= 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()`. Reviewed-by: Alice Ryhl Signed-off-by: Danilo Krummrich --- rust/helpers.c | 7 +++++++ rust/kernel/alloc/allocator.rs | 32 +++++++++++++++++++++++++++++ rust/kernel/alloc/allocator_test.rs | 1 + 3 files changed, 40 insertions(+) diff --git a/rust/helpers.c b/rust/helpers.c index 9f7275493365..7406943f887d 100644 --- a/rust/helpers.c +++ b/rust/helpers.c @@ -33,6 +33,7 @@ #include #include #include +#include #include #include @@ -199,6 +200,12 @@ void *rust_helper_krealloc(const void *objp, size_t new_size, gfp_t flags) } EXPORT_SYMBOL_GPL(rust_helper_krealloc); +void *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 c6ad1dd59dd0..bb55895cbd03 100644 --- a/rust/kernel/alloc/allocator.rs +++ b/rust/kernel/alloc/allocator.rs @@ -9,6 +9,7 @@ use crate::alloc::{AllocError, Allocator}; use crate::bindings; +use crate::pr_warn; /// The contiguous kernel allocator. /// @@ -16,6 +17,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. @@ -61,6 +68,11 @@ fn krealloc() -> Self { Self(bindings::krealloc) } + // INVARIANT: `vrealloc` satisfies the type invariants. + fn vrealloc() -> Self { + Self(bindings::vrealloc) + } + /// # Safety /// /// This method has the exact same safety requirements as `Allocator::realloc`. @@ -141,6 +153,26 @@ 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(); + + // TODO: Support alignments larger than PAGE_SIZE. + if layout.align() > bindings::PAGE_SIZE { + pr_warn!("Vmalloc does not support alignments larger than PAGE_SIZE yet.\n"); + return Err(AllocError); + } + + // 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(