From patchwork Mon Aug 5 15:19:40 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Danilo Krummrich X-Patchwork-Id: 13753730 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 B5779C3DA4A for ; Mon, 5 Aug 2024 15:22:16 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 52E8C8D0003; Mon, 5 Aug 2024 11:22:16 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 4DED38D0001; Mon, 5 Aug 2024 11:22:16 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 3A6DD8D0003; Mon, 5 Aug 2024 11:22:16 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id 1B67A8D0001 for ; Mon, 5 Aug 2024 11:22:16 -0400 (EDT) Received: from smtpin03.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id D4F00C1C69 for ; Mon, 5 Aug 2024 15:22:15 +0000 (UTC) X-FDA: 82418557830.03.712678F Received: from sin.source.kernel.org (sin.source.kernel.org [145.40.73.55]) by imf23.hostedemail.com (Postfix) with ESMTP id 9E522140026 for ; Mon, 5 Aug 2024 15:22:13 +0000 (UTC) Authentication-Results: imf23.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b="d/S0kpnJ"; spf=pass (imf23.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=1722871286; 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=IWR+1E/65mwo944n6uj+O8Ije9QTslyXqSepjeFgNOo=; b=7ySlhgbhaidkQRKuHCiV9At3ypRKUW3QczMDThB9spueSo6/CbKsM9kHKGANQPP2J+7VnL CKAG0B1dNpNbuuyggpUnhjTsBtMT1cqClCWegaKz+XbZ1r7o57uY9nL3tTCJlmTed40gwT ZFlKhLlWlXSQzNK6+bQ+ljWnBoCjlPw= ARC-Authentication-Results: i=1; imf23.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b="d/S0kpnJ"; spf=pass (imf23.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=1722871286; a=rsa-sha256; cv=none; b=LhJAsRUYtRCBghyK96rCmmITTqE+TkuqF6G26Uwq96MSZNvFExc2iOBsSiL3MUn2P1ShRR s+5d/Som1nBj0S4WY6dY8L4Cg4ymUId0in9MwIcUladX1qxUAYhwznb9biq0WmsC3oX9o6 cD+K/ez87NSX30G6r7vPi/CuG7X5YVk= Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by sin.source.kernel.org (Postfix) with ESMTP id DF7D8CE0B2E; Mon, 5 Aug 2024 15:22:10 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 22FE0C4AF10; Mon, 5 Aug 2024 15:22:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1722871330; bh=7OXF+mdH/VtP3EJJlqmokN5UjBwgO5IftFjHmEHegv0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=d/S0kpnJEA53HZxx/ByKgPAnMqA2hpXuuhUkXibFqKo49ZEoH76Oj4hJ8SqrD3aqT ohaViLeqbOK0gaZsi/YhrEPpZXklRe02xuggdqQSFZM7frZqBv26bR1J7bFaq3GfZr kCFuJqcRX6kpxTcvMNk1xoMkNxQpXXosWPQGfg/G4D24VbC0zsc9n3E1NFT6mukVqo TaHwHMYBskm5uZKwmvD4+BhLRnXthAhNxE0EtTCneiAwCmfULUVtNOZQpZ7/OvOZSz hp4bWiQFIIkrm7CnkC811aoijDzacgxc6d8ngbYyU7Kdo4HynY54SZYCf7p2cgxEBy Q1M+GE4r/RV1A== 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 21/28] rust: alloc: remove `GlobalAlloc` and `krealloc_aligned` Date: Mon, 5 Aug 2024 17:19:40 +0200 Message-ID: <20240805152004.5039-22-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-Stat-Signature: za6g1aorb1b3pfj3offibqaafy83se8g X-Rspam-User: X-Rspamd-Queue-Id: 9E522140026 X-Rspamd-Server: rspam02 X-HE-Tag: 1722871333-484327 X-HE-Meta: U2FsdGVkX19fGc3K7NOhCy6q32JvTQO/S8o0pK7YlVzyss2wMd7qSpMHoBRY5CkRMM+wFUHLHeultxgRJqs3lW8USL1hqK7F6wn3V+5oBYMSetgfBBUTw5Vlzlg/jqvWQbAMBBsCgoW28ABeEJufD7aGZGt/DsuxtVu4m85qutGu3uxRHUC6mxtnaiR2OQTqjHMGMQXm94ULNUPIRqQE6TA8z2qNjjwNFc2w4KTSOJW+qQ0nYIa5I8aBkJgD2ehL7Xt+GFNYJRKwky41gnNw4ZofBkhH8onCIqTnLL1+nuqjChzDBVjpJ4VLBHiHa/13rWYfwSKGD9V/2xRZhLg8e9XGiNpv5rY8LIOQfSqTUVH2QBvCxJkrtBJozBhAlN5EGEVlCLpKFOlqfRSdhVqW6tuQozqWJXr2Vn7M9QbmvPIYopFmbcYFWBFxU/Xi/monsje6sY2Cj82+Zt3GkfaQQ/UDvUwKtost10XYY5GYb+5EqOVZTOxo1eLhb47L1PnQ5gNk/cTKVXst7l+wiMmgGqzVL5uxpr9lWoEUOBdzCC5LH/cmJmiuRhHhqYT4ghSmQnG6YbPBXeFLuLDeTJR88zGhp0ySTB5I9icUB4CCy8VFdeNauuLVQDinPc+l0umrZwgHCkuupdbzTC6oqzdSgqyFv22sIVRGlLxzsDxyhxi3rrlE8BAlAI25aLmos8LFeJpuGvSP06RBOqfoUyqx7MmJcvjJa6xid20CEsO37LEETI5RggLiVBEW96lLYAG/r/cckeKClnY7IkSzbx9NsjEXjvPBLUfmyFAAq8A+cdwdR84wqMyB8Ol+3NVu4/nloA8H1oa8tPCdqZ2pftljQqMGSZZiXF5WnmMMIJjKNFDYf1mBXXXn7nuzbl3/e7hOoNaUoPzWlrELgM8fE95I95gxMwIX2Nofik8TI/uAcjMog8UWqD4JhQgvrJ7DRF3CdoF08NJtFyhMOzcVw8H +3ingtnC zkGVkcU8aJFK8jNgpNTNlw7LdSeqlJ3qCZF26DjqQirvpJBXvruIV6o0t8N5byAUx53QupS6EhLb/lWMIkg6aCLq/xibCLGZVM1dakP4t+kFj8QgVQryv2To4lC3wYB+uBARPlZd6qMnmsp9qqow2hTRyjVPEVvlD3ka3LkMddE6MltdMQGRRRDf0XlKxxkwQyBUBdsSnKPFp16P3/KJkDUSO4A6/W9ET64KoqKXhS50ujGrG8FVP7XSj2alrGjHUmlRRycb8Xg9vUY4uc9w15dMPuUw+PASF5zyWCyfwnIj24FccylLdG1wm4QlN+FIDC67ZdNCCtAPhV82MUGBd2wuth8LtCbyXTXDHdVWmMhqKsYgQBtj9wV6hlUEWOPPL2THH 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: Now that we have all the `Allocator`s and the kernel `Box` and `Vec` implementations in place, remove `GlobalAlloc` and `krealloc_aligned`. Signed-off-by: Danilo Krummrich --- rust/kernel/alloc/allocator.rs | 63 ++-------------------------------- 1 file changed, 2 insertions(+), 61 deletions(-) diff --git a/rust/kernel/alloc/allocator.rs b/rust/kernel/alloc/allocator.rs index 91ff21372a8f..6abd55694422 100644 --- a/rust/kernel/alloc/allocator.rs +++ b/rust/kernel/alloc/allocator.rs @@ -2,8 +2,8 @@ //! Allocator support. -use super::{flags::*, Flags}; -use core::alloc::{GlobalAlloc, Layout}; +use super::Flags; +use core::alloc::Layout; use core::ptr; use core::ptr::NonNull; @@ -40,27 +40,6 @@ fn aligned_size(new_layout: Layout) -> usize { layout.size() } -/// Calls `krealloc` with a proper size to alloc a new object aligned to `new_layout`'s alignment. -/// -/// # Safety -/// -/// - `ptr` can be either null or a pointer which has been allocated by this allocator. -/// - `new_layout` must have a non-zero size. -pub(crate) unsafe fn krealloc_aligned(ptr: *mut u8, new_layout: Layout, flags: Flags) -> *mut u8 { - // SAFETY: - // - `ptr` is either null or a pointer returned from a previous `k{re}alloc()` by the - // function safety requirement. - // - `size` is greater than 0 since it's from `layout.size()` (which cannot be zero according - // to the function safety requirement) - unsafe { - bindings::krealloc( - ptr as *const core::ffi::c_void, - aligned_size(new_layout), - flags.0, - ) as *mut u8 - } -} - /// # Invariants /// /// One of the following `krealloc`, `vrealloc`, `kvrealloc`. @@ -129,41 +108,6 @@ unsafe fn realloc( } } -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. - unsafe { krealloc_aligned(ptr::null_mut(), layout, GFP_KERNEL) } - } - - unsafe fn dealloc(&self, ptr: *mut u8, _layout: Layout) { - unsafe { - bindings::kfree(ptr as *const core::ffi::c_void); - } - } - - unsafe fn realloc(&self, ptr: *mut u8, layout: Layout, new_size: usize) -> *mut u8 { - // SAFETY: - // - `new_size`, when rounded up to the nearest multiple of `layout.align()`, will not - // overflow `isize` by the function safety requirement. - // - `layout.align()` is a proper alignment (i.e. not zero and must be a power of two). - let layout = unsafe { Layout::from_size_align_unchecked(new_size, layout.align()) }; - - // SAFETY: - // - `ptr` is either null or a pointer allocated by this allocator by the function safety - // requirement. - // - the size of `layout` is not zero because `new_size` is not zero by the function safety - // requirement. - unsafe { krealloc_aligned(ptr, layout, GFP_KERNEL) } - } - - unsafe fn alloc_zeroed(&self, layout: Layout) -> *mut u8 { - // SAFETY: `ptr::null_mut()` is null and `layout` has a non-zero size by the function safety - // requirement. - unsafe { krealloc_aligned(ptr::null_mut(), layout, GFP_KERNEL | __GFP_ZERO) } - } -} - unsafe impl Allocator for Vmalloc { unsafe fn realloc( ptr: Option>, @@ -204,9 +148,6 @@ unsafe fn realloc( } } -#[global_allocator] -static ALLOCATOR: Kmalloc = Kmalloc; - // See . #[no_mangle] static __rust_no_alloc_shim_is_unstable: u8 = 0;