From patchwork Thu Aug 1 00:02:02 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Danilo Krummrich X-Patchwork-Id: 13749342 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 AECACC3DA7F for ; Thu, 1 Aug 2024 00:07:13 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 4B7676B0092; Wed, 31 Jul 2024 20:07:12 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 440F36B0095; Wed, 31 Jul 2024 20:07:12 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 290706B0093; Wed, 31 Jul 2024 20:07:12 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id EE3106B008C for ; Wed, 31 Jul 2024 20:07:11 -0400 (EDT) Received: from smtpin20.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id 78E5DA080F for ; Thu, 1 Aug 2024 00:07:11 +0000 (UTC) X-FDA: 82401736662.20.7BB1F60 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf27.hostedemail.com (Postfix) with ESMTP id E8E4D4001F for ; Thu, 1 Aug 2024 00:07:09 +0000 (UTC) Authentication-Results: imf27.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=jBYmOPoB; spf=pass (imf27.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=1722470802; 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=sb+sRk/KhpG1et85JfZ2RFT8A4dLjjRlp8oY/wKYqa0=; b=wrIZwBGAg3oLbwi4qs8ZUgUpXnc+ikYWiD5CV6PCPtxIEPOKwhoPE93hAqLJZOgxV2y/vE Lrf2x24S8llSEKcKEXjce/O1op+BrBJfhuWx4FKwHOMNA+jaKOHlgU4Ekzemij1vvtl7fJ sYtxjPOvx/k8kmcZpopiGu+S6cUkiFI= ARC-Authentication-Results: i=1; imf27.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=jBYmOPoB; spf=pass (imf27.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-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1722470802; a=rsa-sha256; cv=none; b=LQDRRW9URR8ALZsxqprYAYBJUNqWqFTIV5WJSeX4ScLDmqNNcAJj60gvhYxcl+40dLGtlQ IG+Zi4EiC/4ZEfq07gnQeZGUVWSE4bDG9zlNMT9XaauzeiZm4Kvsoe7R87S5xINZHMT59S UtgBwDLzhQwhg/uj0q23cZ4mSWfpjWc= Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id 1CF966246A; Thu, 1 Aug 2024 00:07:09 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id BF2ABC4AF0C; Thu, 1 Aug 2024 00:07:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1722470828; bh=aW/HcnaSGCL2MNKjQfZpCrQAc7Fxs7Kovj68XjWpzPo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=jBYmOPoByXs5xNTmUlHB+YhPa15GwpymwwL3KlcJuVBlUgTtc2hF2vc3WDtmW/n4s AtGeSVMmAW6XLXAA4x9LOYxMQcMf4rX3jwCcLcnPffYQKthc1Ui8NedRYGZvLXuGf8 tPEnDcanlJB1nFStDAxtV+TwXU5Avnikrs9qSnrxRYD2nMbwPzs7d2sQ5CnhDvQZm1 r4m4DohrnpYXvGpWZDX/P+SFcDLTPVmdDBM/Ufv01jPXdUX/Kj0pDvT693dRN31G+L KoLAFANNovd+tWyzyHNoyUH7yWgCbFaSpcBitHT3xZmwW+Dcc99tLsI3aB5jt8aZeX tixOGPlXJavbg== 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 03/25] rust: alloc: rename `KernelAllocator` to `Kmalloc` Date: Thu, 1 Aug 2024 02:02:02 +0200 Message-ID: <20240801000641.1882-4-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-Server: rspam03 X-Rspam-User: X-Rspamd-Queue-Id: E8E4D4001F X-Stat-Signature: zc4fyc9pstuyu7wnfjpwygo8cuwgrhq5 X-HE-Tag: 1722470829-519734 X-HE-Meta: U2FsdGVkX19dSXBmnxEwD3wW24J9Qxmkwgpqs+EvSNecO1AdH31A+Mx/ZtbuD7N/AXoOFGOLeSIt8h45GGBlMGT3pxc+/mK3G21lzmCBK2ut0Xbp/p8cZ6T46OSwpvdPx2tx8nS4lK9x2NmSRBclXnrjAw+bJeYXDEdaNUmkLtV6AAcgfeyh4IzaQ2QEZYTCf1pDzL+Sl/1jbp6S23oyIZQky3ktdeaLVF+Z8P/Vonkt+celLkW8I3H2ygHnC3mOhrts7FcCOdZUgFeV/ozH/gw1+N23UVbe3BXzDFpdDXJVsN7DeR7E5oDRkahTsWehtuOJzq2rSe2hYVb0CZUjIGOxyncoxayUWZSZfsGWlaOws+7VBGlWmAspps182gVuoQxFliG4IaigqgAPL+Xae4gcT21nG5o7iebs5ROkjfGdzJ6ZvzyMUVLjPZGDsy3dyifJ5pjKNi6n18tNJSKK/iMMOvt5hQreDC4lJUGWqZf16dBAOQcDUMbuKzVnIrXaiynG3plP80jB/V9Xxww60+h9HKD0/QgL5xFESWGlxWC5XluiHranB+q4RYlrpuuN5++u9E4g83CV+ctHbldNX2nIUffA5YIQMqsyTehRmhXa/RckJHY8RGSNjyxOq3ACRKirSteKjzqZS08PMrUpi/xHDFwEtyKpb4O1SoVz4DLLl1x6NQVkKy5ASm8oG6Kp1d6H5H56n3iteyrn0Q1KKHHQ30juuwLtTEezw1uVH+mMywRxEvOIxscC2f5pnmCXIwgRg4OQKtLat7c8GHILe28j3QbuKbhChA8FAImAIe5G5OMdn2xaWZY30+gsILaIOt9j3h3K8Gf2Qo+j0Dsiku65zkTJPMvEfWB4GstArjVpyMt180DW+ZKAJCfyRIx/sG0IcFmLOo4le50KkHSn335Pm4sabNtzq1SjlNXBPuf1TVXMI9c6h+4y1dk8mmora3fAMTmsB8vezaSn1FA JV0X561P iBYekvUrGbLYj6B9K6YhswLvH9yxOUHd+ICkNAGtRTNURe0sW3yXbOei/mzmqW/D/qauPwRjwtok3BfdRX5G3HUI5oWa568NccUhUi7NA1Mg9o0QuIruB5VIx8fGxZxYphDVO0k72DUeyUz//2UYN6o9IVrbj6hA6XcxbTUxZvtwlN+kYSj1z2GT7G+en9fMc9H9I9LuowRLa3EnJSlNUb/+L2IZ3bITwNcqevQ7RFpaqsy85I3j4AUF3+p82/G8l4Femy5tKYksUeiSnbbhTOPziIC6UVDF30zbI81AlPRvPVY0KLeoTxjCJbv8+rXbQAO5SeGBQRPr99rA= 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. Signed-off-by: Danilo Krummrich Reviewed-by: Alice Ryhl --- 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 6e133780a4a1..10774c51ae26 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; fn aligned_size(new_layout: Layout) -> usize { // Customized layouts from `Layout::from_size_align()` can have size < align, so pad first. @@ -39,7 +39,7 @@ pub(crate) unsafe fn krealloc_aligned(ptr: *mut u8, new_layout: Layout, flags: F } } -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. @@ -75,7 +75,7 @@ unsafe fn alloc_zeroed(&self, layout: Layout) -> *mut u8 { } #[global_allocator] -static ALLOCATOR: KernelAllocator = KernelAllocator; +static ALLOCATOR: Kmalloc = Kmalloc; // See . #[no_mangle]