From patchwork Tue Oct 1 14:59:58 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Danilo Krummrich X-Patchwork-Id: 13818242 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 ED65CCEACDC for ; Tue, 1 Oct 2024 15:02:24 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 7E1E568001A; Tue, 1 Oct 2024 11:02:24 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 768C1280068; Tue, 1 Oct 2024 11:02:24 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 60A0168001A; Tue, 1 Oct 2024 11:02:24 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id 3B93E280068 for ; Tue, 1 Oct 2024 11:02:24 -0400 (EDT) Received: from smtpin25.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id E0550815C7 for ; Tue, 1 Oct 2024 15:02:23 +0000 (UTC) X-FDA: 82625349366.25.404DB0E Received: from nyc.source.kernel.org (nyc.source.kernel.org [147.75.193.91]) by imf17.hostedemail.com (Postfix) with ESMTP id 1960540019 for ; Tue, 1 Oct 2024 15:02:21 +0000 (UTC) Authentication-Results: imf17.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=e+vqwI38; dmarc=pass (policy=quarantine) header.from=kernel.org; spf=pass (imf17.hostedemail.com: domain of dakr@kernel.org designates 147.75.193.91 as permitted sender) smtp.mailfrom=dakr@kernel.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1727794848; a=rsa-sha256; cv=none; b=2bt4zQ1hhzicMjEVoprLoEg7rjdzJWYqxsCkkdvFZMF+DDDF/gzyVjOkkXKQA+SBfbNEJV Q9LpROVm7T4hmj7KCYRrZxr+lNZwcJd7oQY+VhyjC4D01hJuFPAYhrhlZF/xWDMzlCoBDZ Hj+iQrNlgISoSfqS4xpGiTbwn/Tp+/0= ARC-Authentication-Results: i=1; imf17.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=e+vqwI38; dmarc=pass (policy=quarantine) header.from=kernel.org; spf=pass (imf17.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=1727794848; 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=auLoE+/cqYzLtXpQAXgaycME8ttu88NyJXsTFN2ZvCo=; b=KofLJiM+AYL1euriXECqCh6gGkeauqgBszck7dhyquzGJd3Aa1eWyDybLaykMOsV0uZbfn 0ZG9VJIfNfBJcW1X7E9YPrSEAMlKZY0qwmc1cc1boXMyByYbIc8AbeRDQftKPh+kokgEM2 3oVu+T4/Nu5OjY14utvnUjoasL2m1Bs= Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by nyc.source.kernel.org (Postfix) with ESMTP id F3071A40216; Tue, 1 Oct 2024 15:02:12 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 144C8C4CECF; Tue, 1 Oct 2024 15:02:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1727794941; bh=dcNxqKnnFz5ev8owV03l67WWJcIeV+zuTzyuxUVGedE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=e+vqwI38aUi+XTqVQgdXynPd4BENIOD2o+SC8pUH/21gcJ38Nb+gJ9Plsd8r5vgwV Kn9kpo72MOUkdbIXgIZpJ3qQBORhhLeLArsAJuKam4covn0BAwwsqH05GicpaVFNw1 2GFtDg/GWK84pE3pbS0ECn8byzZ7dGOcM5cO807Ydx84gCrZxp9MCv+mD9H1gFflk4 v4HuwvDxJvtwbjAHu05uNovXhcR0jTBp89Gt6/gzW8KaCOS3nxpF/SVzoCrOoUSd5h IasB3eCjPkSosJoVIiaxIMMoV4bg2+ML4Pefbxkv75mwlHgMDpaPO0cLzGsHJplbe6 Jvzs4ivfCAKtQ== 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 v8 23/29] rust: error: check for config `test` in `Error::name` Date: Tue, 1 Oct 2024 16:59:58 +0200 Message-ID: <20241001150008.183102-24-dakr@kernel.org> X-Mailer: git-send-email 2.46.1 In-Reply-To: <20241001150008.183102-1-dakr@kernel.org> References: <20241001150008.183102-1-dakr@kernel.org> MIME-Version: 1.0 X-Rspamd-Queue-Id: 1960540019 X-Rspam-User: X-Rspamd-Server: rspam05 X-Stat-Signature: y8fu9k6qj5gap853tzwn84mrhegws3q6 X-HE-Tag: 1727794941-175232 X-HE-Meta: U2FsdGVkX1+7r09Q9vOm97StsgeyIqOQnEdYOo7Kgbx2GKYFNJFAN+inLgBeK3t1axhvFki5uspVnIDTg740lLyKDlpRuE7u5toC+qlbWAqB/pos7XdHwfhqOSjQov8ivxv/c/pd5nu6eAAwxY3DdwUr0jvmTsl1Z3CeIoY+iTaqf2UomOHmsJfhyGTHrATE2EbYe363hGzNnpxEy61kNaj946Y3sgDztH85iJNlinJKWYbMRzrCGEfoAG7683zgdHZ20ex7yxDd/PIgqCoyFHWGSsH7UMTEqw3WEY5yI9ouy0nqX5F7SEiMreVIOkcYHfSjiRbk72QeKTQpHmiwR2vTsJfGDG6NgUMeTuUchLG1LKNmmnRSDp0Bt9FVCS1ziXG/cC2PogvaGAW8TIctLgf7O8x4vf8rejcZBUnIOac8iFtAMDWOBRVZCv6vB6UE/jukGGslXhlWwS4I9w8wxlyLNeGV2ZMhWm/TyXWlFAD0Zj3wcJAhxg/tCCjEd0E2G1BxHhJCViVCLW5uEO7J9ek+D9/wcPtW25TDJoXyz5Nj3FC4UB+KHeGwcajXflCFEalMZm7fIJ8tzdUByxqQ/Wmu4YJtS+RK1y9fajg/juGXCBv1D+KNvGUU7cqBypLWK/4WptDdrCCyws2FOTAPFhR76n/6+xLojCHmLTTgyTWGm9OzmBXNxT7zq/vC/Jfit1gJAKGzuCeqAxQwfv5r03YR/FF+xCojuayDnVh04fDtqJdlggLUKjO17VPBP/SJS4mPdHm1927sjNX23eTwpoTeQ9VaPDhs6tdG1a5j7lM2GEgOUyUswJyDrASuDKizWN7n1+SciRGUvkNKZMsDGLB0PRfr65KtAi2sbek+OIUzK+6EtJeT8U8GimJY/Dk+oGeVdH6ZV5Rv1QLuMZps+lxXc5414H8hjx8FFRl9EKF0IlO41rmUjrTNlM/QRnPiD0K+2ynfrKLpORRsaHV LJArR4LQ M0dnhXp3V52JZMrdOHynItXZ3m0muJy7++ujl1Ua3ISxlsuY/TZlzTh+GVgCJ1FYLlBbEyGMh9VJu3GnDOLrjyxVM3n28P+TGquTLuBPtqgbNkEO8lY06EJxYD3efs28R2A3Xt6cCiSd1Dm/ydbYrBTwrfLZ7/58EmehsVK4aZnctsOOdwPPTwighKu1554ywmWWCXPAwL5z6MwGRML8LkKh6gCIx6bRpT3IOssfZqgVYLePF1O1ptnU2BHJjsznv/IrL8kpcGyfGPKqYwe3HlZ8bT497pHzDFqMls2qL0P75bK6sPkZfNo3m0kp+NXZRlAN6xr6hMaDp0RlAFKjMPmJ1VFR/jFnI73SeRRobaX64m0+CyiDAktK0yEHy94zb9Z/a 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 Reviewed-by: Benno Lossin Reviewed-by: Gary Guo Signed-off-by: Danilo Krummrich --- 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 81b4fc5cf21e..b71fdd0f54c2 100644 --- a/rust/kernel/error.rs +++ b/rust/kernel/error.rs @@ -143,7 +143,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) }; @@ -160,7 +160,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 }