Received: by 2002:a05:6358:11c7:b0:104:8066:f915 with SMTP id i7csp504730rwl; Wed, 29 Mar 2023 05:10:11 -0700 (PDT) X-Google-Smtp-Source: AKy350ZMqbZwS/TrAdm3sP4pVZFUQ3P4rYUTDNXQSNBLVBd4/S3K3fjKa5/oWb8tYQ1B1S8zSrrx X-Received: by 2002:a17:90b:38d1:b0:23f:7464:ae55 with SMTP id nn17-20020a17090b38d100b0023f7464ae55mr20945822pjb.0.1680091810957; Wed, 29 Mar 2023 05:10:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1680091810; cv=none; d=google.com; s=arc-20160816; b=si+Yl66sZBNj4IcnezfuLijdtttogbU6VLvqlyyTBHosQkPwTNQ6j1AvmaFF3ML3jc +KPKyrjxHPZoEkq3flbBimKa9FwxZ9IED0DPRzIoNuRZnyNTQxp+JxxQs7I9xU9r0q6X 4I6aG55x7xD6dgt8T9FrrNLiwgjstovsHfuahKUatUV3RGJ7IsibGUTj+M7p2sGUeHhR XVO+XWR6Ie/j6GP434u4l2hcPibmjI8jYbkAmi8zvDPc4DL5a5MuoK2UNTFsUMhC0TFe AgxLH18zQq7ZzceYUTX1sn57dXAqFyRuoqQI9Lo6bcKcFqNsP6tX6R7K6aAAJXhs9LPD LoFA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:in-reply-to:references:message-id :content-transfer-encoding:mime-version:subject:date:from :dkim-signature; bh=Qwnnvea04wNRRIFVJLuVK5QD35VYZcLHs9wHN6ZXuuI=; b=tSEsG8df7Y1WwNPnbACJPkx+6tEdyAIclwAbGjUFS0FbeWXoPzOPaLEPewZesa9ymD /hJiiqg/zR8LcnS7502L86tEjP2uUSKzAPryxmPCXgxXLaKDXSRPJU8Crr7d34FpD4/w IVNI6stMT7uKvA7jLd0TLG5Ojh0qFuXS+RyDh+vdzPjX8au2Pjh3GuuB6VPSonWQMWeB J384GlF0d84hHrgNGu4VWVCDe/eGcVveZiusSJdhTIU09lLgtDneiGLcCJFi05Dkc+zh qY/w7Sa2v/dLevzCcWclyakTi59D7KJgVKxf5cP19IcIq0UtotFHvpj6hQmCoUZECBU/ dszQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@asahilina.net header.s=default header.b=LgcC9Rbc; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=asahilina.net Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id bc22-20020a656d96000000b0051324a717a6si11613657pgb.520.2023.03.29.05.09.59; Wed, 29 Mar 2023 05:10:10 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@asahilina.net header.s=default header.b=LgcC9Rbc; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=asahilina.net Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229917AbjC2MFT (ORCPT + 99 others); Wed, 29 Mar 2023 08:05:19 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43960 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229627AbjC2MFH (ORCPT ); Wed, 29 Mar 2023 08:05:07 -0400 Received: from mail.marcansoft.com (marcansoft.com [212.63.210.85]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1754B4EC1; Wed, 29 Mar 2023 05:05:04 -0700 (PDT) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: linasend@asahilina.net) by mail.marcansoft.com (Postfix) with ESMTPSA id 1A545424D0; Wed, 29 Mar 2023 12:04:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=asahilina.net; s=default; t=1680091502; bh=Z2Msqmu+TDL/Y0kqemtpmsxm6/7qz/c1AG9xBrS/GVA=; h=From:Date:Subject:References:In-Reply-To:To:Cc; b=LgcC9RbcMlP1MIG3M4+1vSvrPC2561Y7xnNXcvGF8kl5gBLmrZuTAFzICs2gk8F9I 1IDOMz1otzPrd6sNLh5zALuVGasmJM5TM7vbbiIKnFQgopxpnep80BxsWR6UHV3W9v AXuHq8/2En4kIX6zRy9PIujREUHDndBeGsrQplvEYv9Tr/nCIejII+Apk8WRTZO2x3 0m6SRNcNNQKYIhvJyzScDbtooJi4tFx04XtZhmeBuChvjYFs7F8Oym/NsQXS4LgeWD Z7ishp6wiYMZqG4xuAN1vFiJ07KGK2Nu+lTPk2zRfKZJ2MPdLZRQluIIvVd7z3rfJR xEESjrku4pW/w== From: Asahi Lina Date: Wed, 29 Mar 2023 21:04:37 +0900 Subject: [PATCH v2 5/6] rust: error: Add a helper to convert a C ERR_PTR to a `Result` MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20230224-rust-error-v2-5-3900319812da@asahilina.net> References: <20230224-rust-error-v2-0-3900319812da@asahilina.net> In-Reply-To: <20230224-rust-error-v2-0-3900319812da@asahilina.net> To: Miguel Ojeda , Alex Gaynor , Wedson Almeida Filho , Boqun Feng , Gary Guo , =?utf-8?q?Bj=C3=B6rn_Roy_Baron?= , Sven Van Asbroeck Cc: Fox Chen , Martin Rodriguez Reboredo , Andreas Hindborg , rust-for-linux@vger.kernel.org, linux-kernel@vger.kernel.org, asahi@lists.linux.dev, Asahi Lina X-Mailer: b4 0.12.0 X-Developer-Signature: v=1; a=ed25519-sha256; t=1680091478; l=4224; i=lina@asahilina.net; s=20230221; h=from:subject:message-id; bh=qOm0Nqiw7jlI1w438+NRLYRRJvpIZVUQLi5w4HxGf24=; b=lVOZaAXcQ20z1kEBxLI7TArlo/VvpaBP4j7TWhGxiiK4DT7IbyYMONGf6nwTeO6cm/ltdQLmJ RMkzsjzmSoyCyPkM/4gpY50WP+qwFE6VRK3bkuDvZxFtMyqf+J7rz4S X-Developer-Key: i=lina@asahilina.net; a=ed25519; pk=Qn8jZuOtR1m5GaiDfTrAoQ4NE1XoYVZ/wmt5YtXWFC4= X-Spam-Status: No, score=-0.2 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Sven Van Asbroeck Some kernel C API functions return a pointer which embeds an optional `errno`. Callers are supposed to check the returned pointer with `IS_ERR()` and if this returns `true`, retrieve the `errno` using `PTR_ERR()`. Create a Rust helper function to implement the Rust equivalent: transform a `*mut T` to `Result<*mut T>`. Lina: Imported from rust-for-linux/linux, with subsequent refactoring and contributions squashed in and attributed below. Replaced usage of from_kernel_errno_unchecked() with an open-coded constructor, since this is the only user anyway. Renamed the function to from_err_ptr(). Co-developed-by: Boqun Feng Signed-off-by: Boqun Feng Co-developed-by: Miguel Ojeda Signed-off-by: Miguel Ojeda Co-developed-by: Fox Chen Signed-off-by: Fox Chen Co-developed-by: Gary Guo Signed-off-by: Gary Guo Signed-off-by: Sven Van Asbroeck Signed-off-by: Asahi Lina --- rust/helpers.c | 12 ++++++++++++ rust/kernel/error.rs | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 61 insertions(+) diff --git a/rust/helpers.c b/rust/helpers.c index 89f4cd1e0df3..04b9be46e887 100644 --- a/rust/helpers.c +++ b/rust/helpers.c @@ -53,6 +53,18 @@ __force void *rust_helper_ERR_PTR(long err) } EXPORT_SYMBOL_GPL(rust_helper_ERR_PTR); +bool rust_helper_IS_ERR(__force const void *ptr) +{ + return IS_ERR(ptr); +} +EXPORT_SYMBOL_GPL(rust_helper_IS_ERR); + +long rust_helper_PTR_ERR(__force const void *ptr) +{ + return PTR_ERR(ptr); +} +EXPORT_SYMBOL_GPL(rust_helper_PTR_ERR); + /* * We use `bindgen`'s `--size_t-is-usize` option to bind the C `size_t` type * as the Rust `usize` type, so we can use it in contexts where Rust diff --git a/rust/kernel/error.rs b/rust/kernel/error.rs index 4f599c4d1752..6b10129075a7 100644 --- a/rust/kernel/error.rs +++ b/rust/kernel/error.rs @@ -177,3 +177,52 @@ pub fn to_result(err: core::ffi::c_int) -> Result { Ok(()) } } + +/// Transform a kernel "error pointer" to a normal pointer. +/// +/// Some kernel C API functions return an "error pointer" which optionally +/// embeds an `errno`. Callers are supposed to check the returned pointer +/// for errors. This function performs the check and converts the "error pointer" +/// to a normal pointer in an idiomatic fashion. +/// +/// # Examples +/// +/// ```ignore +/// # use kernel::from_err_ptr; +/// # use kernel::bindings; +/// fn devm_platform_ioremap_resource( +/// pdev: &mut PlatformDevice, +/// index: u32, +/// ) -> Result<*mut core::ffi::c_void> { +/// // SAFETY: FFI call. +/// unsafe { +/// from_err_ptr(bindings::devm_platform_ioremap_resource( +/// pdev.to_ptr(), +/// index, +/// )) +/// } +/// } +/// ``` +// TODO: Remove `dead_code` marker once an in-kernel client is available. +#[allow(dead_code)] +pub(crate) fn from_err_ptr(ptr: *mut T) -> Result<*mut T> { + // CAST: Casting a pointer to `*const core::ffi::c_void` is always valid. + let const_ptr: *const core::ffi::c_void = ptr.cast(); + // SAFETY: The FFI function does not deref the pointer. + if unsafe { bindings::IS_ERR(const_ptr) } { + // SAFETY: The FFI function does not deref the pointer. + let err = unsafe { bindings::PTR_ERR(const_ptr) }; + // CAST: If `IS_ERR()` returns `true`, + // then `PTR_ERR()` is guaranteed to return a + // negative value greater-or-equal to `-bindings::MAX_ERRNO`, + // which always fits in an `i16`, as per the invariant above. + // And an `i16` always fits in an `i32`. So casting `err` to + // an `i32` can never overflow, and is always valid. + // + // SAFETY: `IS_ERR()` ensures `err` is a + // negative value greater-or-equal to `-bindings::MAX_ERRNO`. + #[cfg_attr(CONFIG_ARM, allow(clippy::unnecessary_cast))] + return Err(Error(err as i32)); + } + Ok(ptr) +} -- 2.40.0