From patchwork Fri Aug 16 00:11: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: 13765301 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 F03DCC52D7D for ; Fri, 16 Aug 2024 00:14:17 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 807988D0024; Thu, 15 Aug 2024 20:14:17 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 7B7008D0002; Thu, 15 Aug 2024 20:14:17 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 657AB8D0024; Thu, 15 Aug 2024 20:14:17 -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 446948D0002 for ; Thu, 15 Aug 2024 20:14:17 -0400 (EDT) Received: from smtpin03.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id ECF6D1418BE for ; Fri, 16 Aug 2024 00:14:16 +0000 (UTC) X-FDA: 82456186512.03.CDFA261 Received: from sin.source.kernel.org (sin.source.kernel.org [145.40.73.55]) by imf14.hostedemail.com (Postfix) with ESMTP id EC333100007 for ; Fri, 16 Aug 2024 00:14:14 +0000 (UTC) Authentication-Results: imf14.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=KDFzCKig; spf=pass (imf14.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=1723767218; a=rsa-sha256; cv=none; b=Xu5kx6Z+ARpNS/qAU4JYFwDz4WMJNcnAbWboyKVLbGzmldw9jeZeqvUsHJl7kw8oIdsCXt cdiz7B7tEVwyKe+88rV+T5KcDt+l++qdILiOnMGznal1gGfrZTeg2woZvqagcmbGXKZjzn Eph7EoolaxgU6bzhTUwrNh0/IJyHWAU= ARC-Authentication-Results: i=1; imf14.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=KDFzCKig; spf=pass (imf14.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=1723767218; 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=IUALEMDAXrq9HmZIMcM12fe7YQSg0JgIp1W9zkDVVhQ=; b=mZbuNqE/irxqxiehlem+QZ7kYYUERZXvr2IMILr6Nu3BiARwERy5MHYVOPtdfHqLeATCRt GszSpVZHUqKEbUudwEoPCm6kEwqxel92jxU2iDvS1SzDyx2s41G6H6ZfHFZgjUys/joVS0 N7TjvZJQ7wGxeGVK6XxpioGsl3CgxWk= Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by sin.source.kernel.org (Postfix) with ESMTP id 2453BCE1DAC; Fri, 16 Aug 2024 00:14:12 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7733DC4AF0F; Fri, 16 Aug 2024 00:14:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1723767251; bh=2JZ/HPYqMBMv9V3VcU7sSwUGHcVU2KFw93XwDqoGeDQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=KDFzCKigmPq8S5g5JjHxUVJaiXQcpcx6LPz0k+Mik2iTPq7nOt3vh/1QYBTXXd3Xn TFg6vqur3nJzb+OvP8mOVgmWqylFXdn9K/0kEiyGSLFfkMq1AsBcYjhXtpYY9cz0cJ 5s4xn9tMnpGQinwPfZKPb3Sru19j59yWh2dUn31cNU9NU2xUQYRZZMhsYjEPtVBIJq J2l3066gtvSBLWXDcMx8w2WRtnRHqDEGXfU+xS1462CaNEfWeH6XmBN6O5BslF6Dfh bR8G2mU7+WRzSYLV3JjCX6qIG1aJ87CMXghyr/+ahsBm10J0y67ifwe4LB2sgcr1eb fDA8jt6ZJSr/g== 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 v6 20/26] rust: error: check for config `test` in `Error::name` Date: Fri, 16 Aug 2024 02:11:02 +0200 Message-ID: <20240816001216.26575-21-dakr@kernel.org> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20240816001216.26575-1-dakr@kernel.org> References: <20240816001216.26575-1-dakr@kernel.org> MIME-Version: 1.0 X-Stat-Signature: grzz5mrr67xctu8ssuh9e13ddmo6585x X-Rspamd-Queue-Id: EC333100007 X-Rspam-User: X-Rspamd-Server: rspam10 X-HE-Tag: 1723767254-167663 X-HE-Meta: U2FsdGVkX18A4ZqJ/qupPeEuw09KOBcivZ7ezGDVJ0As8tg6hgJ2S2oF3liHx6uJxPrFzGBbMDBH9tfQW7rsPPjPg1r/B+fNvSzT/3PQg7h+dQ/QFJxiNHD8Du0nYeRLcFX4vfBVRBcaA0Lz4+OuWC5mu9jATNDBVc1zKjciA7mcNFjuLh+to7V/ltfXYrflgJggYgLSGAgWuYVVysZChkrUw8XHNeKP02HIwIqEBaj1Y8N7S9ImG1+gJ0n9mmFnmDaDTj2lScqMgBXaw7Hu+JY92oM8gvEOOgUrH/HoERT28EYyhNV0MX9Q08VI22EmKLGWEuJGp1cwjM55ESgE1Prgdb+bw14ep97f0IINbHvyMULMsGiurJj6eNHM0MU9//DKwR0Bp/Zvh/XHUPceMJuofmAZPTxgJuXLnSYxDAu1yOXTjt5TG4SO5BF2DEpGipthdNmPpQwXrgna68WZ7iPRmlXY29QxQDRfNdCkcjWxacfL/0Z+AszEOrLVB7GVBcInCrA88aj/rbHlfNrRl1w27p88akY86v6LwGbGXNE+zn5hUCJ60Xwmobny/c5knOtqc74V3Y9KH8/qTDBtiBDp8I5DU4CXIOE3C2GW/nzZCFVKqiF6QbWUzEXqvHD+/EP5uEh6L0doXLiH8+6nXfbywidZvtSL2FGg4uCCLe4sr1Mkm+ASINw6U/erLo9qOzihdCZlN2ib1DoBPuGOjsrXV0SGxMfklRGO6oTVnFTsVHhxg63J+ShSBLrrvLbOHp4FFNvrBDlM6wX05TAr2ORAkcKZfbPrOspi2ta/AAT0b0HBzvCq6xJ2aBJelqhL7HEWF06XoA/WeN7Us370sQN5u4Q0rjv+PYyImSDZ4PXEyBT3AUp6CdBI7VW4ynVAlLq+py7tBwF5fuYpdY4tp61CLdEBZLUyAO5LVuyfkRdrIx0mHf7Wdgd8J4YfOESiML53QHJ7Eot51F21kMz ODqgmFG/ fTCZu6HTgoCW3cuqvZ2A/4YTX0u+D7wpBxiSBS88aBZyh4JO/1R+2baH1NuEUEjr68UYHYyESTtSJJmI8iFiE0WU03SmSZOdLLM16F9vknKNRXrbFMgRtCgKD5mC1sgaaBvSDK5XtReRlERZY3oSfQ2BfubDVzjh281g6Ir7cY+PZauO0V9moFMRLWe8zV886zk3UshJ4lzREDvFeIdlQcPBoLlTlLUwTUFdHOZoALzpw6npo0d4SgRhkxvzWeizc5cTh2HCsUM4x7Gr0QYAMe5jqa98aR3RL2BC4zZRxZE8WBMng1QBID6GPAoYAgKoRJygB+iABv2lYDBA= 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: Additional to `testlib` also check for `test` in `Error::name`. This is required by a subsequent patch that (indirectly) uses `Error` in test cases. Reviewed-by: Alice Ryhl Signed-off-by: Danilo Krummrich Reviewed-by: Benno Lossin --- rust/kernel/error.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rust/kernel/error.rs b/rust/kernel/error.rs index 2d012cc3881a..7adf889b9526 100644 --- a/rust/kernel/error.rs +++ b/rust/kernel/error.rs @@ -140,7 +140,7 @@ pub(crate) fn to_ptr(self) -> *mut T { } /// Returns a string representing the error, if one exists. - #[cfg(not(testlib))] + #[cfg(not(any(test, testlib)))] pub fn name(&self) -> Option<&'static CStr> { // SAFETY: Just an FFI call, there are no extra safety requirements. let ptr = unsafe { bindings::errname(-self.0) }; @@ -157,7 +157,7 @@ pub fn name(&self) -> Option<&'static CStr> { /// When `testlib` is configured, this always returns `None` to avoid the dependency on a /// kernel function so that tests that use this (e.g., by calling [`Result::unwrap`]) can still /// run in userspace. - #[cfg(testlib)] + #[cfg(any(test, testlib))] pub fn name(&self) -> Option<&'static CStr> { None }