From patchwork Tue Oct 1 14:59:38 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Danilo Krummrich X-Patchwork-Id: 13818222 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 D03E9CEACD5 for ; Tue, 1 Oct 2024 15:00:36 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 5E371280090; Tue, 1 Oct 2024 11:00:36 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 5931D280068; Tue, 1 Oct 2024 11:00:36 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 40D91280090; Tue, 1 Oct 2024 11:00:36 -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 2155F280068 for ; Tue, 1 Oct 2024 11:00:36 -0400 (EDT) Received: from smtpin23.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 9C4C7414B2 for ; Tue, 1 Oct 2024 15:00:35 +0000 (UTC) X-FDA: 82625344830.23.BE1BAF2 Received: from nyc.source.kernel.org (nyc.source.kernel.org [147.75.193.91]) by imf23.hostedemail.com (Postfix) with ESMTP id 029FE140024 for ; Tue, 1 Oct 2024 15:00:33 +0000 (UTC) Authentication-Results: imf23.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=HSUQr0fi; spf=pass (imf23.hostedemail.com: domain of dakr@kernel.org designates 147.75.193.91 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=1727794665; 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=QqhVF17FL+TpDQ3D9EFd1/mNN3744U5WFfkVwM0Lty8=; b=CFlfiH9WfMS/6NLrh1IA8g0qjtAs5G9FVdABhVefu9C9KJZDSQoYwgoAhMAWQ4OATyB9M0 AHhh5UBr+p2dipnYhWcu05sSJatSV/+iOfzT4usVP/Sg5ce7m7lsCWnLfOYTrMyyLaaK/i Qb0+B2QFSPPrh5eSb+nGLXGz2xKFFd0= ARC-Authentication-Results: i=1; imf23.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=HSUQr0fi; spf=pass (imf23.hostedemail.com: domain of dakr@kernel.org designates 147.75.193.91 as permitted sender) smtp.mailfrom=dakr@kernel.org; dmarc=pass (policy=quarantine) header.from=kernel.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1727794665; a=rsa-sha256; cv=none; b=Du2cczgH5uXdonKtV57q4x247PTAOR97vsk1870s5wqvnhluSe42y14JsdfY4bXQZ4VY3m l3D1U2LMizJwspPGngwfQJZnb9NTWq7Jgxxnly82DYLy4uaKXMfoB2ew5VpFaIdbhpelQ/ /mQ7rupetOV9Yv382rXSD8+b+PTYNA4= Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by nyc.source.kernel.org (Postfix) with ESMTP id D51CEA41B5B; Tue, 1 Oct 2024 15:00:24 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id E27FDC4CED2; Tue, 1 Oct 2024 15:00:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1727794832; bh=QNiYbpuM4lhKU5PUzac8sp1oQTQY1U9z8BelyYqtrhQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=HSUQr0fiwqq9quB2232UQ5QYNfe5VMt5SueyMP+/RzqnRG1+0LKVAwJaWDK0LQ4QA VORCLeljJzcuaQYXFY8LeK02zyxGdvvsRdfpQvaTf1pBHFBn7ntBc4Mm3Dv80lc4Bf hNQQKtpH9zjDHnKWkdVZm5E21wUNSgOAilw6yHFRZG/t96WaLGSWSK0i3Tuvna++2Y QknYitfbqiDAjvv7Y0hVG3094W2M3xubi7S/VPz7JYANbYmKC5g7mvrhL1P3Om6SUo rAE3s7lYN5C/fcV91ivOHGz45xmZT/+nDlshYHSQJbozezcudk10KNqtHAWt7J+Zet ct0LaTl5bcEEw== 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 v8 03/29] rust: alloc: rename `KernelAllocator` to `Kmalloc` Date: Tue, 1 Oct 2024 16:59:38 +0200 Message-ID: <20241001150008.183102-4-dakr@kernel.org> X-Mailer: git-send-email 2.46.1 In-Reply-To: <20241001150008.183102-1-dakr@kernel.org> References: <20241001150008.183102-1-dakr@kernel.org> MIME-Version: 1.0 X-Rspamd-Server: rspam06 X-Rspamd-Queue-Id: 029FE140024 X-Stat-Signature: zrg91syby9q8hjebxx3qz6zszw5zuja5 X-Rspam-User: X-HE-Tag: 1727794833-491781 X-HE-Meta: U2FsdGVkX1/WK6aT1eplx6/TrUnAQ/sm0dOYWFztozXGWTc+9HX2XqESxq7k5T/bLH4Au9paZDC//M4fo6PTe4dzmqu/cP/0Sx7Fp57lNRB0f244itPwQybD13HNjgoyYZVX2ApWSdvfImq2obo1NHYhEqbKWs8H06uojw2OO1Q8XRMa1xQK392E2Q6lduUOE6lKymMhZSztkU4SjygBtA0euk40kZHh5f5ILIiO9cyvM2XiCBZEPkPghAFAo9VA39rTNsiuKsgBt+CRtkWBCtMVzVUjMFkz9nZ/G/DButJ5lpmIM6lfTg3S01OmXcOH/7zVWS76q/xW2EJFjvEiHoukYSVx/eLV3aSfYrJed65fM/qoiiK2OTIIEr6vkmmmD+ALRHazDQxB421EjuLROnweQRtTWt92RMTrafkXmkCnOyXyHNa1AXWHdTRpE4VJlDKqpkOp4gKwmryve+jCptglegjOK2ArbPzDrpXhQ1+r1JepMnsR2rLTQ9zcwkGZAzGotIkeuno9CEvQuTZKor5yjKIwGMH0q4UdLHz8T9VPKNPdDOLVUIqc+aTky4aGNxW29OYzS+GEJOgAkglarLtVbk1/KtG70pMTUfaGoQ65m1wsrywH/A/HwAG8LR5fTIZtz+m9Ek6bQyLsFuaHGCQGeOLmcmrMNGquUk57Ii3vrcAe4YAKzp18z9DuYnkUAVttJdzr7hCaKW5Vm+tTp7NxwongBODPnvcFOgpAN33Z/cC5Vda4Hdvzolj6DUKmjdb9RADpQF11oEv4+cszqR0T2DNQfd5sCiSqRFzUMd1C0jMpItRRbEcfq4uHiUbH70OgmUhsItitQc73JOKNveB05IahqHITpOL7N5dYW98ROjjg/2shMxavV3WseUACkFe7WuMJJhFCBQIQOfJ/xwuZnRUr0p84dX1Hy6trAjcNP89B00zNMMm95+IRBGH5rAa2NRXWVo8HXrqcEM0 w3qjVn2u k3oO8xCPpKonKR2OnmhiQO8m0riJXOhP6agfprynB9Q9REyAFfwjmUHd34pbsX7ONa2Dz3hRsQWNzCapd4uTLUphKlKlyK2gLOsgbr/raE4gXehhDMzY8YVd3lu+Av4XQDC6iHhlJFTHHhXfEJyJ/D5RM6hgDAKWQtX7Khau3dkvl5wxWwFNZOj9R5OxDt8tKDYnFMy1jfymZ5F29gG484XApUbRThLnhjyiOxYAV+KZI7XL0jzfRZVLKEQYatB395pc5J/brwHAsM7nV97pg+jQ1GOgTz7eMv/vD3Y4GVlL/heGQWMWpJJnWr2i419lYwq1UiNzzkYywkgn3BEF2+R81b9gYzexyG7iPIXN2wzFBSPz0lsMWcQdfdQ3FSXVrG4VHLnDKkMcgz2oePYi1rwqxxS6LAStR+uBh 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: Subsequent patches implement `Vmalloc` and `KVmalloc` allocators, hence align `KernelAllocator` to this naming scheme. Reviewed-by: Alice Ryhl Reviewed-by: Benno Lossin Reviewed-by: Gary Guo Signed-off-by: Danilo Krummrich --- rust/kernel/alloc/allocator.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/rust/kernel/alloc/allocator.rs b/rust/kernel/alloc/allocator.rs index c83b6dff896d..e32182f91167 100644 --- a/rust/kernel/alloc/allocator.rs +++ b/rust/kernel/alloc/allocator.rs @@ -6,7 +6,7 @@ use core::alloc::{GlobalAlloc, Layout}; use core::ptr; -struct KernelAllocator; +struct Kmalloc; /// Returns a proper size to alloc a new object aligned to `new_layout`'s alignment. fn aligned_size(new_layout: Layout) -> usize { @@ -36,7 +36,7 @@ pub(crate) unsafe fn krealloc_aligned(ptr: *mut u8, new_layout: Layout, flags: F unsafe { bindings::krealloc(ptr as *const core::ffi::c_void, size, flags.0) as *mut u8 } } -unsafe impl GlobalAlloc for KernelAllocator { +unsafe impl GlobalAlloc for Kmalloc { unsafe fn alloc(&self, layout: Layout) -> *mut u8 { // SAFETY: `ptr::null_mut()` is null and `layout` has a non-zero size by the function safety // requirement. @@ -72,7 +72,7 @@ unsafe fn alloc_zeroed(&self, layout: Layout) -> *mut u8 { } #[global_allocator] -static ALLOCATOR: KernelAllocator = KernelAllocator; +static ALLOCATOR: Kmalloc = Kmalloc; // See . #[no_mangle]