From patchwork Fri Oct 4 15:41:11 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Danilo Krummrich X-Patchwork-Id: 13822618 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 DAD0CCF8849 for ; Fri, 4 Oct 2024 15:42:46 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 6ED406B040B; Fri, 4 Oct 2024 11:42:46 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 64ECE6B040C; Fri, 4 Oct 2024 11:42:46 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 453576B040D; Fri, 4 Oct 2024 11:42:46 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id 1FBAA6B040B for ; Fri, 4 Oct 2024 11:42:46 -0400 (EDT) Received: from smtpin05.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id D1F931A19BF for ; Fri, 4 Oct 2024 15:42:45 +0000 (UTC) X-FDA: 82636337490.05.D4D8A0D Received: from nyc.source.kernel.org (nyc.source.kernel.org [147.75.193.91]) by imf02.hostedemail.com (Postfix) with ESMTP id 5232180012 for ; Fri, 4 Oct 2024 15:42:44 +0000 (UTC) Authentication-Results: imf02.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=RT8MltSI; spf=pass (imf02.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=1728056433; 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=EX4TD+JjJBRwfO1wVqGhdkQ8i5QCl+pKthOi/HJZgzA=; b=r5EBzkSzbJdfj1xqq7k5dIZNTKerfdRx8BBRjqcBIO0c8QETg8bhP9bJb8IGsP5DI89q20 2ijkx9e8KPz3TinAPo+0txV2yaJlvX41BRy6OdkT6B4KJEl1AbtWp5IS6xieC/1BbrMcM4 hSGPPX0CZmsXRdG3M0wzW9hEQBUdWpw= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1728056433; a=rsa-sha256; cv=none; b=3l005CEseGoIs5MKkgPJmDvCX4JTikBT+vOjDql0vXQf0OYDc91GRE7h/syf/pswgCYXss o4CIUviyp4DcjadK9NPR1U2RQe29Zdo+65nPM5wfgsxzG7dIfeEf8mog95Nb1M2Y+Umphl W1hrKrP1IZv/uoacBtSi4gtWOmybNjw= ARC-Authentication-Results: i=1; imf02.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=RT8MltSI; spf=pass (imf02.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 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by nyc.source.kernel.org (Postfix) with ESMTP id 565AFA44C4F; Fri, 4 Oct 2024 15:42:35 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7FCE4C4CEC7; Fri, 4 Oct 2024 15:42:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1728056563; bh=qlNC8elt2DUs+OwvKv1BnkmPQ4QqoPQad7Orfyq3Sws=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=RT8MltSIAOaKHQso1eT6Z3mUjfi5RIvInL1mxMQG2SL1evErcWA4qcx+604Orhc0L KUqXykgrTTXpuWLEQAxwd3FKpElA8xCNwM/1ZapjJMEWlLcNT9oPJvY89Xk1XMyPky Fak8WyV30MuRnMLZyWdMaMh9ivSoAujvNZ1VyuDQm40yXjm2BM6dAPJAryWCYSjc7o D+OV1bXzZJm27Yox5GFTb45b2DsjWT/U64k4XrJvC4ATcbKOZKLfnY1H9RP8Fd5BVL KQ4swMp90bxNA+VGWSmMkRnrqZG8QzStP40GSzB2CILS6gTbVkSnXcQPKjiYwpl9mk b/VuM9UUxUjaw== 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 07/29] rust: alloc: add module `allocator_test` Date: Fri, 4 Oct 2024 17:41:11 +0200 Message-ID: <20241004154149.93856-8-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-Stat-Signature: jeffcgksydozy9bm8d6cokb3snkrbd4n X-Rspamd-Queue-Id: 5232180012 X-Rspam-User: X-Rspamd-Server: rspam08 X-HE-Tag: 1728056564-825568 X-HE-Meta: U2FsdGVkX18LBYqsnUCOZxRjTh+zjGbemRVBdHs6xrLrOMXdtJkozHkQ+NVmQKmdmsdmsyVk0Tj6iQE490A439ENPOOgfI6nhfJW3A66EWQ/MypMjO5rabWXxj07DBcjl7SLDgzgsqtTySRa1BTx+3C1OS49L6kkKFgG2rNbC5vD3j2s9G4F4Yx3VQfTFId5qtyePc3f2Tb1V4Sl51UC/+VmxBQOQieduhTwYFTBl0Dnl6IG120bBOoGWY/al9xLjniqPhwwOMY0wnNuj5SWqYwaerWGI4EHWIXTyYlqtrm6VbyT5CtIAmZmlm9sbTc2JAXE0n0THb3kHbI6eh8J5T8n/mtFhEgpNVa/N16hdJfwXUdvq8u2y7nfGGUeMrMqz91VLnH/iy7GR3RrASS1ZxN2S8HF/adFbNQx3rSymZIGIINjXBvY82xfZ3Gwc57j0v30dM9A01qxhDyw9IqAb64UEMlYwE14L62+x3h+neizwD6jXaNO7iZu1lntszY1zPWIBBT0hk1hB/dvWFHloQKQtI7/20slg/hekTWdFObacuj7afteqhz2YxlqAzI6/sENNVZ1azLXgacEFATGYK0VuDBPgSt3HJoBCHQYDfE0d8+xYeYo3E2oO3/W4IqqFOBnUDMxhvkdzLbg1uatVXDi12Bme5PbZuSdFhgj2vYhgrCc86vofHCGRaV76XjzBRBXhGMxf1kZ9oWNKEnChRnSw6imdIUhUmnkq2N0IG5jqZqk7477rsb2Epf93BYsbAwdSytuA+OHRcqgGCe/jor+L1aO7MnW7roPb+va/hVYItMJyEUTZXzdU+jQG4xm2T/L0gsB9cD4psXsbuUlHLSInxutFOZS4U7Y/y3WyWLoqCH++gLpOio5PodV8B+6l3sguihHnl1ltTBjXADqB3XBCRiOw/5etTAYfIY221EhB7k14jTNdcMcaom3DvqVipjN1xy2XF4CdoWMO8R w4mYQy2X NkmztiYqRHj0k4yBm+ABIslsvs0PwtddMJdcf3huUaciQS2D/aRvHtfEGmobHGGDVVmcw9YhBFhie79CZccXUj3WE6qYmnkvUVGYa3wLcDE18OrrMpyn77onnnTT5v3BoE88dQK9MXNcG95LRxWca/hneF8KNSd9+aj/60XCIoSyhMcjhZFp2vskq6BBn4t3P0MARkAv0l0vFV2Kin2+U5xn5SkVYo36TIAyeQcj/c4QHPwWAtpeLEfugZCIx5xKV9kcf9HSodfCeKbEYz+bPJDQCjs4X/itbOWzhX8+aScovQfuMy/YtymbZHKNoyONAljNKyRWMMvIzUL/KtaQB+OeNdgXHKSV53MfABFvH3Ev7xyRhKv85XusaZtOgqC466dX0R0NxCUjRQPS+sQAeHhI+DxMDxPtX9azvYcbgIqCaE2DTJwOEXdG0ig== 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: `Allocator`s, such as `Kmalloc`, will be used by e.g. `Box` and `Vec` in subsequent patches, and hence this dependency propagates throughout the whole kernel. Add the `allocator_test` module that provides an empty implementation for all `Allocator`s in the kernel, such that we don't break the `rusttest` make target in subsequent patches. Reviewed-by: Alice Ryhl Reviewed-by: Benno Lossin Reviewed-by: Gary Guo Signed-off-by: Danilo Krummrich --- rust/kernel/alloc.rs | 9 +++++++-- rust/kernel/alloc/allocator_test.rs | 19 +++++++++++++++++++ 2 files changed, 26 insertions(+), 2 deletions(-) create mode 100644 rust/kernel/alloc/allocator_test.rs diff --git a/rust/kernel/alloc.rs b/rust/kernel/alloc.rs index 91b2a26faf3d..f8ddc8d96da9 100644 --- a/rust/kernel/alloc.rs +++ b/rust/kernel/alloc.rs @@ -2,12 +2,17 @@ //! Extensions to the [`alloc`] crate. -#[cfg(not(test))] -#[cfg(not(testlib))] +#[cfg(not(any(test, testlib)))] pub mod allocator; pub mod box_ext; pub mod vec_ext; +#[cfg(any(test, testlib))] +pub mod allocator_test; + +#[cfg(any(test, testlib))] +pub use self::allocator_test as allocator; + /// Indicates an allocation error. #[derive(Copy, Clone, PartialEq, Eq, Debug)] pub struct AllocError; diff --git a/rust/kernel/alloc/allocator_test.rs b/rust/kernel/alloc/allocator_test.rs new file mode 100644 index 000000000000..4785efc474a7 --- /dev/null +++ b/rust/kernel/alloc/allocator_test.rs @@ -0,0 +1,19 @@ +// SPDX-License-Identifier: GPL-2.0 + +#![allow(missing_docs)] + +use super::{AllocError, Allocator, Flags}; +use core::alloc::Layout; +use core::ptr::NonNull; + +pub struct Kmalloc; + +unsafe impl Allocator for Kmalloc { + unsafe fn realloc( + _ptr: Option>, + _layout: Layout, + _flags: Flags, + ) -> Result, AllocError> { + panic!(); + } +}