From patchwork Wed Sep 11 22:52:42 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Danilo Krummrich X-Patchwork-Id: 13801179 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 0AF0FEE57DC for ; Wed, 11 Sep 2024 22:55:37 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 997116B0098; Wed, 11 Sep 2024 18:55:36 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 9477A6B0099; Wed, 11 Sep 2024 18:55:36 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 7E8BA6B009A; Wed, 11 Sep 2024 18:55:36 -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 5E8496B0098 for ; Wed, 11 Sep 2024 18:55:36 -0400 (EDT) Received: from smtpin07.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id C5FAF1C5AC3 for ; Wed, 11 Sep 2024 22:55:35 +0000 (UTC) X-FDA: 82553965830.07.C7FC571 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf21.hostedemail.com (Postfix) with ESMTP id 2C6F61C0007 for ; Wed, 11 Sep 2024 22:55:33 +0000 (UTC) Authentication-Results: imf21.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=Trml8k+n; spf=pass (imf21.hostedemail.com: domain of dakr@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=dakr@kernel.org; dmarc=pass (policy=quarantine) header.from=kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1726095229; 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=G4t4ll0XQ/1sZ5Wy32FUdKApuxrJ7TdCMxelFkR6R4s=; b=lwVsjOUEaTdrSSRUbbMzbJ+MP2QKAm8IeEuTNf1VRYDGN9J3qHPbIaQiE9746M+pgzRDtA 6H8cTYUvvAcsW6dw3ysWTxUiCKez6g3MXNdTZR/0Hb5SjgNRggblYolUEywHYST1BpncYt rNhVJg3QuyQ0dZ5RoHlFruYSAl1Yzdo= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1726095229; a=rsa-sha256; cv=none; b=SHwd10fxuichnflo+QADJIeb6F+oD6tXUTDzPGF3XS8GR3n7rE3H/jkTJXUTGeUWpG385A EKJORpLWMC8qU3IB28TBYr+XPNwjaSjaXEYoBvrMuykJxG4REoKOPPIeV/YHd25NwxZSAn NnDj8Ni3/SfoDhxSEEUNzd8ZADo1E2Q= ARC-Authentication-Results: i=1; imf21.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=Trml8k+n; spf=pass (imf21.hostedemail.com: domain of dakr@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=dakr@kernel.org; dmarc=pass (policy=quarantine) 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 BBCF95C0775; Wed, 11 Sep 2024 22:55:29 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0846BC4CEC0; Wed, 11 Sep 2024 22:55:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1726095332; bh=kZOIx3Co/Hq0ECAauxmLflkd+d0Tj2aHN+O0afOlvOc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Trml8k+nqKDeTUNPT+Q0B0wvV+B+DWgxGKE7UnVOvVcv9HfLKATNF6fhsj47h9iXV nrywaauzGj4lgxa7f7xhiOeXOhOa4jhrhk0aJbt2WS6uE25MeEEb7ECReBtdm3z5V+ Ghk+wMz+UjV+GGyGsr2rDdhFuUsui+3bn6x0M3o5H/hSH0WPiIh7e1qQJuC1D7eLkZ NtvqlCiNNBLhQsJxc5teRL1Zt83GIbrLUF67Cp2BFree4q129nsPVzUKeBg55kn5zH Hv2jMnY9qjlGlbH4yr5yCJJreEwShKO/DEWm2xC+eWRG4VjsvB5JBP7aOayJ0bq+ZT zfV95Op4i3MLg== 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 v7 06/26] rust: alloc: implement `Vmalloc` allocator Date: Thu, 12 Sep 2024 00:52:42 +0200 Message-ID: <20240911225449.152928-7-dakr@kernel.org> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20240911225449.152928-1-dakr@kernel.org> References: <20240911225449.152928-1-dakr@kernel.org> MIME-Version: 1.0 X-Rspam-User: X-Rspamd-Server: rspam04 X-Rspamd-Queue-Id: 2C6F61C0007 X-Stat-Signature: o6emg7jwwdh75d45yi5y3bfgph4swujm X-HE-Tag: 1726095333-542022 X-HE-Meta: U2FsdGVkX18MXuxCzD/eQsfjESxe8DzBLCsMDqb0w2BYkzevDKDd5T+U5g9Rz2siKc/ETpJXugc10xhA+bOQ4Cjk8uMyaEu9PDJuXg8SksEaf84UH8Rna3f0bTaWbbVIrEHuGkuaWKvqhktn4yhQfYaYAv7MaTJ4zJOLXFkzFMlnlXhoo+fer/e7YnH6ZwlpZACFsnrpH2hd/OXNX1XdpxoBFcvE4e0RpRtuaqcpFCs7OsH+79aFPd6WpAq+1XRvZrz9EO6OA2dpmxdhe45CtBvLgeWUKsND3IMxuF1c1uuWVWO6XnComGmRKByNwI1ykKN6GRIY/sYz+nH1f03i8VHkCaIydFWk/wAaAC8BK2ycTaYv7wTRy0IMwncifLvb2j+ujhzEBvdwQY1rOnfNLFPCuKfs7FLm+h/mcvCRy38obi88yT5dP0cx/5QuEgtZINw+2OIzaWp4VUU0tRXWXJZMvkZ+JcrB6sSVlN+Im28TyukcSGsWTBccH9kI6hPciwdZ6iPftozWHsPvMPGWf+B2yQqWX95JtRZ80joaJ+4yyrr1RNnAcfaoodSn8uEM/d1HBsf944VPDuW8qDlHEWAT+7BJ5Oy9mFi3SWRPJMT1AVlGke1esnbCBLl1XG1f4lprHXQQfKacivn58wJoXHnobhl28pLvtKBTFY//jxQ3WquI1s9L1FbJ23JEEhBJct26I4Tf7tJAOd2MQ3jXmwOLMXEhZ7gKZ6VxrQ/zm8wNWi06jgejUAEtLPGZiMuXIg8e5M3Z3gicaNq1ruq9sqw+B9PLHnGjmNiBKKNs6bCRVTWvRYiYEXLL5mX1sSZ9HYeMfwG0n4FyHFuRhBKyOWPnl1lFKM40V9e/7sEWYcLC0CfIpuyM2rjqQBdKWcV2+qEW+4xSpYSTu9G23rqlqJ1QPHrrIAmh9co+tzJ7YI2bapsMxqPWkpChRmPYe2g2k0eTOwbX+mPeC0n8RCh pD0GSTTk mQW0t1nxTWFGvgZvKzOdDmxLu5r4baPcY98OCG7bFZipkFdlKQNpCT6WR94RqiuISa+UC7sPCoKRPheQLBXHw/jgveu7uZQ8zRpr+urdRdcXWvnW4rJaMUhdeBubsGWMfK0aauW6l13Rpkvpwg6CjmjRUQ8EkDdu7f1EEhOS32zAfqIRf78rzBn0k3QKhoQ7ra4xiL4NW3M9lW5qCyYwDN5Wx6d7+xVc4BUfkER521I56QQsS23OioAe3iyEwMs/0pA9wN3uf5Lu8cfcHOimxIZ1QJsFoIPPzOAZ9zKRcvohsfNOCyiCVDjJVVxY/gOSU1CdZpzicR00idTw= 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 Reviewed-by: Benno Lossin --- rust/helpers/helpers.c | 1 + rust/helpers/vmalloc.c | 9 ++++++++ rust/kernel/alloc/allocator.rs | 36 +++++++++++++++++++++++++++++ rust/kernel/alloc/allocator_test.rs | 1 + 4 files changed, 47 insertions(+) create mode 100644 rust/helpers/vmalloc.c diff --git a/rust/helpers/helpers.c b/rust/helpers/helpers.c index 30f40149f3a9..20a0c69d5cc7 100644 --- a/rust/helpers/helpers.c +++ b/rust/helpers/helpers.c @@ -22,5 +22,6 @@ #include "spinlock.c" #include "task.c" #include "uaccess.c" +#include "vmalloc.c" #include "wait.c" #include "workqueue.c" diff --git a/rust/helpers/vmalloc.c b/rust/helpers/vmalloc.c new file mode 100644 index 000000000000..80d34501bbc0 --- /dev/null +++ b/rust/helpers/vmalloc.c @@ -0,0 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0 + +#include + +void * __must_check __realloc_size(2) +rust_helper_vrealloc(const void *p, size_t size, gfp_t flags) +{ + return vrealloc(p, size, flags); +} diff --git a/rust/kernel/alloc/allocator.rs b/rust/kernel/alloc/allocator.rs index 7a93442187a1..0f2bc702e8e4 100644 --- a/rust/kernel/alloc/allocator.rs +++ b/rust/kernel/alloc/allocator.rs @@ -15,6 +15,7 @@ use crate::alloc::{AllocError, Allocator}; use crate::bindings; +use crate::pr_warn; /// The contiguous kernel allocator. /// @@ -24,6 +25,15 @@ /// For more details see [self]. pub struct Kmalloc; +/// The virtually contiguous kernel allocator. +/// +/// `Vmalloc` allocates pages from the page level allocator and maps them into the contiguous kernel +/// virtual space. It is typically used for large allocations. The memory allocated with this +/// allocator is not physically contiguous. +/// +/// For more details see [self]. +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. @@ -63,6 +73,9 @@ impl ReallocFunc { // INVARIANT: `krealloc` satisfies the type invariants. const KREALLOC: Self = Self(bindings::krealloc); + // INVARIANT: `vrealloc` satisfies the type invariants. + const VREALLOC: Self = Self(bindings::vrealloc); + /// # Safety /// /// This method has the same safety requirements as [`Allocator::realloc`]. @@ -158,6 +171,29 @@ unsafe fn alloc_zeroed(&self, layout: Layout) -> *mut u8 { } } +// SAFETY: `realloc` delegates to `ReallocFunc::call`, which guarantees that +// - memory remains valid until it is explicitly freed, +// - passing a pointer to a valid memory allocation is OK, +// - `realloc` satisfies the guarantees, since `ReallocFunc::call` has the same. +unsafe impl Allocator for Vmalloc { + #[inline] + unsafe fn realloc( + ptr: Option>, + layout: Layout, + flags: Flags, + ) -> Result, AllocError> { + // 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 { ReallocFunc::VREALLOC.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(