From patchwork Fri Oct 4 15:41:13 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Danilo Krummrich X-Patchwork-Id: 13822620 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 E2264CF884B for ; Fri, 4 Oct 2024 15:42:57 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 6ECEF6B040E; Fri, 4 Oct 2024 11:42:57 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 627AD6B040F; Fri, 4 Oct 2024 11:42:57 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 483046B0410; Fri, 4 Oct 2024 11:42:57 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id 22D526B040E for ; Fri, 4 Oct 2024 11:42:57 -0400 (EDT) Received: from smtpin22.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id D8FA01C7183 for ; Fri, 4 Oct 2024 15:42:56 +0000 (UTC) X-FDA: 82636337952.22.A1067E1 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf13.hostedemail.com (Postfix) with ESMTP id 3084620008 for ; Fri, 4 Oct 2024 15:42:55 +0000 (UTC) Authentication-Results: imf13.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=qKjQ8ZPm; dmarc=pass (policy=quarantine) header.from=kernel.org; spf=pass (imf13.hostedemail.com: domain of dakr@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=dakr@kernel.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1728056552; a=rsa-sha256; cv=none; b=jA+rrdyTXRv6p7MGOy19N3mHMVaolY/GByIsqoNtAdjUXd7co2eKD05PMgZJb2yXs6oT+E mskGwNe1swk4itwGyNStd97+nzK2jMiarTLuWXBHt3O9iWv9v+S6FZJx/0VfTBTffFmfZg 5WNI5JP17gjZ/A64BSUXxs8c0Bni0so= ARC-Authentication-Results: i=1; imf13.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=qKjQ8ZPm; dmarc=pass (policy=quarantine) header.from=kernel.org; spf=pass (imf13.hostedemail.com: domain of dakr@kernel.org designates 139.178.84.217 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=1728056552; 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=JvtvDlqgKJZ9179cz0r9Y+742zJolVW4Wz6RejfGigs=; b=cwQbU/+AcSibsJgRFhfsGBmaaonkfrHR9k09IL8AUH9cAzfdbwF6I1oH2H1HHszfAE84MX M7BjGuDzM80oeCF3I/aDxFnwE4yUt+VfI90I67S7oCnCDxrSnOYdsd7v3U0R4volhxThns S10w4CVFmQuOkANaFK5Olw4gBim2ZDM= Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id 5B64A5C5E95; Fri, 4 Oct 2024 15:42:50 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 4CD91C4CEC7; Fri, 4 Oct 2024 15:42:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1728056574; bh=bmN7ni692A736mVNYrpUELQFpNi/F1V47sEOIzb2Zxc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=qKjQ8ZPmnVtLHqr4nor207d5+lle0HUgclARf5EncF5XP8/iOOzpJ08rCz3Zf3K/q K+XtuJ8Un3vl+Adb3MVI6prusot2SL+Z/UwzTKQLoqlt68BtrM+123fOkwQXTrMhjH 89pD77I6HL94tZs/5aC52cRVLNRIILom+coxCtCDk1R+Aa19I135JJNEoC1pJr39Ar jOyml3k76DlaNKTwO6U9mfO1p/9EVrZug5sZopte54z/yzrBOhwDmvAnReyaZ8g4K/ VepMZe3eyDzdjg5iHBnqXzIHbrRBxVCc7ia98DqMjjvONZjKWXFbGZjnCfAsNdrKVh f/C5KfKLN6ySQ== 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 v9 09/29] rust: alloc: implement `KVmalloc` allocator Date: Fri, 4 Oct 2024 17:41:13 +0200 Message-ID: <20241004154149.93856-10-dakr@kernel.org> X-Mailer: git-send-email 2.46.1 In-Reply-To: <20241004154149.93856-1-dakr@kernel.org> References: <20241004154149.93856-1-dakr@kernel.org> MIME-Version: 1.0 X-Rspam-User: X-Stat-Signature: ss5se6y1rpspmqxfu9jhuewwz89hason X-Rspamd-Queue-Id: 3084620008 X-Rspamd-Server: rspam02 X-HE-Tag: 1728056575-307366 X-HE-Meta: U2FsdGVkX1/Cd5NgbiYy6nqpmy4YXh4pCHPk3SNlWH2L/jvzuGETcwFl8ks5jjEMFHbc29VxUW2X/J2OeKbjXoeWKUqYXA1exrv1eOiJ/4yY1fuG55Qs3nhefWWeOycPOjflamXwTSPKPGzuMOGMDBsECYDDlkovlbViG4xQO8GIcktKDYg1ThcHHz2o/S07OFG783ZMGoF6PVFRXf527YFJj6sXi+AQ8gT91XqZucXVJvmpyAXClcBj1dpqvbmqa1JLHUxXs6S1uvuHpRgDC/cTulSL1IhQGs3mt7nX1jJv6CTe3ueJ3QyBh4hwC+yUgVCpiuqOW2q5zrqt8dxbPMtEnbuypNVK6P1oXv0a52ENJBfmcfuR4OYZErWM3nLijKoSz/npKBfmICk8BppZJszVWPd9m3Y4GBUTcRXh0mY0fymEOsRgFVZbAgslInsWRugJE1WcBX2Q1hS8fyzpPwjlVHdJ/gkdEoaMQh8CmAbqpBuqjLz/tTFuvNglUpJ/U7QYXDgcT3Fk07/6Yc+36dvfuVlBPS2LELn7zlOuRUMiPuxTa3vxbJrG8DHOQg3bB/0NbaP2Fj8pZ1Pb9kQ8539wEbq9EWattZ9GnyB6iuf2hHlxYUeAdLO1psPzKez/4g1N5OZli4NLbbW/CFl81gXTdRp1Z9W2aGQUOgl9y31towxXDkY39XQmDv0oPM4TL1S5WSAEltuSfH8Q11CdxzVrgUrJDYjvlodQOO784Jf8/tJKvjCh+r/MHcCUMi63dASNudzCeX4BhOrjV9ssOq/K3YtasX8oDMaYCGunZV/dk5hgoU8aKQxSY0mBY588tj0QJlL/WnQf7f6AiNUPsfdKxsIJap6Z0H/p/jkA+91+88avOJyB+ygvY5PaqwLa5VOPHoxEoDrB/emo0/z846yFVKjO9x3AxZagBDVAdMbNzqhHKd6C6O8q7TkAghNBHrd17DNl3XEBSOq+A8E bDRzixfW nAbSXfEoy/SpDBB84qp0FhsAawfRtB/+hXvx0JBNPfX7tKmsaAiMeXXFA0Wu2pZ94S0CLEHkLbVslOCy1WuE1Tuf7+5BsMLCEtjZOiCCmASnKmJF/XoJfti7qGlztgmurhUlaon+mN0mxPLuSrnrXlBm9sYC7dJlG475baKMRdyqlGiVWXKPAxYPAptn7143igzqhBp4JcXlaFHie1n2EXwz4aFVj/mfhLp3NDT+7utpIdizD6rglQEXAFV9/9ieev6/n3G8GH34kZHg0V3Pce1tRdSYAzSTNg6CP0DKTfYnWu2w7r4PgV9yhm6P2Vbt3ETX4SfVwwls7/99hwX7ScS3QQO1T7RAmnMGSL/p3FlM9JmtOICi0S9SynIdfwCpofnbz 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 `KVmalloc`, an `Allocator` that tries to allocate memory wth `kmalloc` first and, on failure, falls back to `vmalloc`. All memory allocations made with `KVmalloc` end up in `kvrealloc_noprof()`; all frees in `kvfree()`. Reviewed-by: Alice Ryhl Reviewed-by: Benno Lossin Reviewed-by: Gary Guo Signed-off-by: Danilo Krummrich --- rust/helpers/slab.c | 6 +++++ rust/kernel/alloc/allocator.rs | 36 +++++++++++++++++++++++++++++ rust/kernel/alloc/allocator_test.rs | 1 + 3 files changed, 43 insertions(+) diff --git a/rust/helpers/slab.c b/rust/helpers/slab.c index f043e087f9d6..a842bfbddcba 100644 --- a/rust/helpers/slab.c +++ b/rust/helpers/slab.c @@ -7,3 +7,9 @@ rust_helper_krealloc(const void *objp, size_t new_size, gfp_t flags) { return krealloc(objp, new_size, flags); } + +void * __must_check __realloc_size(2) +rust_helper_kvrealloc(const void *p, size_t size, gfp_t flags) +{ + return kvrealloc(p, size, flags); +} diff --git a/rust/kernel/alloc/allocator.rs b/rust/kernel/alloc/allocator.rs index 5742ce7d0453..d9043ca42ce5 100644 --- a/rust/kernel/alloc/allocator.rs +++ b/rust/kernel/alloc/allocator.rs @@ -34,6 +34,15 @@ /// For more details see [self]. pub struct Vmalloc; +/// The kvmalloc kernel allocator. +/// +/// `KVmalloc` attempts to allocate memory with `Kmalloc` first, but falls back to `Vmalloc` upon +/// failure. This allocator is typically used when the size for the requested allocation is not +/// known and may exceed the capabilities of `Kmalloc`. +/// +/// For more details see [self]. +pub struct KVmalloc; + /// 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. @@ -76,6 +85,9 @@ impl ReallocFunc { // INVARIANT: `vrealloc` satisfies the type invariants. const VREALLOC: Self = Self(bindings::vrealloc); + // INVARIANT: `kvrealloc` satisfies the type invariants. + const KVREALLOC: Self = Self(bindings::kvrealloc); + /// # Safety /// /// This method has the same safety requirements as [`Allocator::realloc`]. @@ -205,6 +217,30 @@ unsafe fn realloc( } } +// 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 KVmalloc { + #[inline] + unsafe fn realloc( + ptr: Option>, + layout: Layout, + old_layout: Layout, + flags: Flags, + ) -> Result, AllocError> { + // TODO: Support alignments larger than PAGE_SIZE. + if layout.align() > bindings::PAGE_SIZE { + pr_warn!("KVmalloc 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::KVREALLOC.call(ptr, layout, old_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 e7bf2982f68f..1b2642c547ec 100644 --- a/rust/kernel/alloc/allocator_test.rs +++ b/rust/kernel/alloc/allocator_test.rs @@ -8,6 +8,7 @@ pub struct Kmalloc; pub type Vmalloc = Kmalloc; +pub type KVmalloc = Kmalloc; unsafe impl Allocator for Kmalloc { unsafe fn realloc(