From mboxrd@z Thu Jan 1 00:00:00 1970 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 EB467CF8849 for ; Fri, 4 Oct 2024 15:42:19 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 7B0CE6B00A8; Fri, 4 Oct 2024 11:42:19 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 75ED46B00B0; Fri, 4 Oct 2024 11:42:19 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 600886B00B2; Fri, 4 Oct 2024 11:42:19 -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 43F0E6B00A8 for ; Fri, 4 Oct 2024 11:42:19 -0400 (EDT) Received: from smtpin01.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id 07EB2A1748 for ; Fri, 4 Oct 2024 15:42:19 +0000 (UTC) X-FDA: 82636336398.01.DAA2B13 Received: from nyc.source.kernel.org (nyc.source.kernel.org [147.75.193.91]) by imf04.hostedemail.com (Postfix) with ESMTP id 6D88140018 for ; Fri, 4 Oct 2024 15:42:17 +0000 (UTC) Authentication-Results: imf04.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=f4eAqOAq; dmarc=pass (policy=quarantine) header.from=kernel.org; spf=pass (imf04.hostedemail.com: domain of dakr@kernel.org designates 147.75.193.91 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=1728056393; 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=Qy8KxCIgBtvqnNj4RqFDbh6uuhL//IY30twfovya/Q4=; b=C3psw9Qb2GPRSySqeFui84SVK9eSXii94iMEer9uQOtrE/Rt+uZ3QkkECVBGQ1Ea7Dz5E0 SXzWCvRV3hDxeMfmlyay2P6t4axj4M2QDRGSKvfHtHk1vvd4eMApWmo34qAtYhSvfSRe2Q P2aGCAR53OBc2gtr6HgNuwxTbpnWWGY= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1728056393; a=rsa-sha256; cv=none; b=IE/iaRBldYpMOOTBNw6DfSdb6U09styhOY+vcqSYVjvkG+2XryuG1oUlrQiWiGkwgugxUK QZnE21hfDjLC1d+utaiIKu2Ljjr8nl/VH7qaJwTdhPTitjQEGvM8HE/smWLBVuDb7x4KRO ZXUBaIrSO0lhzD4pH2Yw7ormf8M/zkQ= ARC-Authentication-Results: i=1; imf04.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=f4eAqOAq; dmarc=pass (policy=quarantine) header.from=kernel.org; spf=pass (imf04.hostedemail.com: domain of dakr@kernel.org designates 147.75.193.91 as permitted sender) smtp.mailfrom=dakr@kernel.org Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by nyc.source.kernel.org (Postfix) with ESMTP id 47F5FA44C2A; Fri, 4 Oct 2024 15:42:08 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 66D15C4CED0; Fri, 4 Oct 2024 15:42:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1728056536; bh=RKYOxaZlfRNBRkHBIioYvHfe6spLUu1mZk00Wam8Has=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=f4eAqOAq1FX1Ya1okjVZkz82mLxBGix6bkOeHOi5qGpTXizdIdI1HGcng3ZO30+Su 1ibtaobqiZMH2mWJtOhI2E22BuQcm7mIPwwS5ULuccazCkaUDYJw+2hT711xDBX7Ey 2oeYgJ2/Kmu3UizrBDNvRBFrFbYJ2zlcfPxejGlYIRW7zYvSuqi9yZcmfyaXj97ykj 3g0kRigDy/sekuNsh9ECtUeQiQxI41drqNILzFdrd1NaAbk/ATarkl7sM3abOV40da 892mB3SXd74TS2mDLL/LLHLP1h9PKePh79zBPjVLoVaqcxEfPsIOcDe7UlJaWr47Tu 9+LAnKXkQLjWA== 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 02/29] rust: alloc: separate `aligned_size` from `krealloc_aligned` Date: Fri, 4 Oct 2024 17:41:06 +0200 Message-ID: <20241004154149.93856-3-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 Content-Transfer-Encoding: 8bit X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: 6D88140018 X-Stat-Signature: 1f1tjpnotsusud844zxmh5ndo8yr6mku X-Rspam-User: X-HE-Tag: 1728056537-245034 X-HE-Meta: U2FsdGVkX1/1URFYnp62o17bPPcolZfNXoMLHpW93xF1JNhivr2z5pDsgsK7fydHVu35O6jXQWG5GIG5x8AbisVWmXLhehdTiM7e2dKVrHtElIdJxob5jaT8H8oYD8b5jZ3chzmVIcySp2R5Q36AmbaiSW70D1EUlpkKNH9DZy3yjg0OWdo+JCjMkJ45ZyxKlDMDtKVISzrzcNoBwJFzkx3qL+BMx6DsvpV31+A6Qpj3CUVKn3OatbcYW5CZbr5ip1PRu5wW4TSNFlkEqwpvj1xv6b8WfgICCg3y1UIGyXxiW2dW66I/Z9Xw0dgBNalt/ZyXlRlEudavX2RbtGN012Xuk9D8hO5uSHA5w9gZXEHiLAPNgI+SwHPfE6cx81gpZYmyij/gLuZS6avbTd2XVhneAwWAup2I8fiVZ/uoWVgjXkVy5jo0OTQZZBzs0QtnfHJxWQPMnjFYtmh/SNa1HyGs48Sb3wH6W18bQ0pUsEzM/oQ8yyyuiOMOyc/6J0UgQ4bm8fJQNcX55K4LqqB5g8MX/gJtaFi9ReicSRpivgJXWB5xIwUdVA2Vmp4VOGbfE/hL7da5uZjrJNwQgz8y5ieXxWb/l+dEYp7ZzUCAAkdE0Hr4Ha2UCWUvLVdyjsdQK+ro/ebQYEUppTFHG1UmBDMrZLw19LV7XCwZN66IfghEyou/nuUtFpUhsHmrIEeZpMquYyL25Ab1lio2Nox2P26H4yfJXWXHHJB3/nqrNCrLySsOeJMdz4cTP+qZ28C2kOxpW1+mtU03Wk4XyOVbJixvwOJHN4+8GDZ1H+IZfcDflLls9/3MAebTA5aSuZNYVWfirNvHNDuMR8ENJhDKfSonpplBVXhd/givPuFVouYbeOo6/aydPAX9uicOywBVUQBBjD3dt7+ypE+PIjgJv/iPPhMn+47eqWG/H44zaxBottGDqEBnbalT+aeCd2d2AvZil2pefeCld20Na8m qaLNR6yR iNzPInwEYkij+efwvGBjTAqyRG7XUNbal0b3pJQSsmQmGTaSBvJiDmrd7c62bvRb41dk5BV4qWnWbx/lvB7xZWF6sgfWB4OI2K4P/1rAOc4P0roQI3U0F81k3PVSQcE7ROGO/j2up3O5chz9BWmYiQXgH5mnzJzvTn5Cb9g1Uc9zKK5CBzZ0DhNKoCfkoWT/dH2I5pUOdzNgd5ln0shbnkHjCOIdKy8g7t+c8RZWrVQhFO4cWJ47vP6yf4d3AMCcu/1aTPV/0a2XzkY24A9H409jBmkPstmQXaIGBDua8JEv7eS19E2uMdYWR6WYzCJhLTvkmDqxIB5UCcBJGYqsMSNYwLWYv05NxeQy1wRCuAuVC7WAjuBjAhlm1B9DFAVMEOd3gp8xoGD77ZPHoHPhiUQ1DF86LRbdN7dwuEV5NUhrE/yyfU0eEqr1xIQ== 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: Separate `aligned_size` from `krealloc_aligned`. Subsequent patches implement `Allocator` derivates, such as `Kmalloc`, that require `aligned_size` and replace the original `krealloc_aligned`. Reviewed-by: Alice Ryhl Reviewed-by: Benno Lossin Reviewed-by: Gary Guo Signed-off-by: Danilo Krummrich --- rust/kernel/alloc/allocator.rs | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/rust/kernel/alloc/allocator.rs b/rust/kernel/alloc/allocator.rs index 91216b36af69..765f72d5bc21 100644 --- a/rust/kernel/alloc/allocator.rs +++ b/rust/kernel/alloc/allocator.rs @@ -8,6 +8,17 @@ struct KernelAllocator; +/// 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. + let layout = new_layout.pad_to_align(); + + // Note that `layout.size()` (after padding) is guaranteed to be a multiple of `layout.align()` + // which together with the slab guarantees means the `krealloc` will return a properly aligned + // object (see comments in `kmalloc()` for more information). + layout.size() +} + /// Calls `krealloc` with a proper size to alloc a new object aligned to `new_layout`'s alignment. /// /// # Safety @@ -15,13 +26,7 @@ /// - `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 { - // Customized layouts from `Layout::from_size_align()` can have size < align, so pad first. - let layout = new_layout.pad_to_align(); - - // Note that `layout.size()` (after padding) is guaranteed to be a multiple of `layout.align()` - // which together with the slab guarantees means the `krealloc` will return a properly aligned - // object (see comments in `kmalloc()` for more information). - let size = layout.size(); + let size = aligned_size(new_layout); // SAFETY: // - `ptr` is either null or a pointer returned from a previous `k{re}alloc()` by the -- 2.46.1