From nobody Thu Apr 2 00:15:31 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 41E2E303A26; Fri, 13 Feb 2026 22:07:28 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1771020448; cv=none; b=K1As7KaxtdyexSD2v9voJ3L6Rf6wKeIFWxy6HoxI1gEjoEOWhP+ATj5o/u8jaG2IaO5Fr1t5PJw+GOma+vwguIptsPJB2BLMHA2t7b+vBU9jaKzvV9fjysi/nf+CbWRyElfti2KNwz98eXvsHKdDhOyfjf6bIWwBjm/6Tht3CYA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1771020448; c=relaxed/simple; bh=0IUKZwfn3BUVdcPrAgpyEOjKmwUF79BsZF/GvKQp4uQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=I1d2d3pUJ1It6rEXuFhNnlLpBMyG7rXAB03w6fUGCy4fL76xJNv0tq+gSbceDyQCJqWuJFWRFU8L1t2jcfTIqbyKDL3ci86AlC9sGtVIzuf6kO2gry8/LbCc2mlTiJmEIyM+tadrfXwXyhnw+GUPhbBQSXHy70jUXrjlEPSaESQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=kC3J6zLu; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="kC3J6zLu" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 151F9C19423; Fri, 13 Feb 2026 22:07:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1771020448; bh=0IUKZwfn3BUVdcPrAgpyEOjKmwUF79BsZF/GvKQp4uQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=kC3J6zLuRTbhVxuUKfUZaXIbu4vsq9ctVz0stzza4y9bmMaOYKEvyFzTbY6BenWH8 V3UiBFJ4DS6awxTN0wYtPObWnnnx+/5j66hL7rHrej1dCAp7Ze0oVNwGs0yLT9kXNO dC5tw+rqk1yPMmY0YPqJ7Ct0LWx8vu5qSH13tTfhhfYAgoVDRaSW0/f8CFN+/0vznF Ap7RSut5xLoNGqZ55DJcRkAiU/UQHI3/iQZnbQfncuPR9CDk2dWwuQATONBj2iDBKF X5laThfTnZM/Z0gXHN0aIJ2vBhU3c7TXjdi7NL9C2YYTzCBJrAfRrMmkCRMr+4ijvK fZD3H6NVnsabw== From: Danilo Krummrich To: gregkh@linuxfoundation.org, rafael@kernel.org, ojeda@kernel.org, boqun.feng@gmail.com, gary@garyguo.net, bjorn3_gh@protonmail.com, lossin@kernel.org, a.hindborg@kernel.org, aliceryhl@google.com, tmgross@umich.edu Cc: driver-core@lists.linux.dev, rust-for-linux@vger.kernel.org, linux-kernel@vger.kernel.org, Danilo Krummrich Subject: [PATCH v2 1/5] devres: move struct devres_node into base.h Date: Fri, 13 Feb 2026 23:07:11 +0100 Message-ID: <20260213220718.82835-2-dakr@kernel.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260213220718.82835-1-dakr@kernel.org> References: <20260213220718.82835-1-dakr@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Move struct devres_node into base.h, such that we can access it from the Rust devres code. Signed-off-by: Danilo Krummrich Acked-by: Greg Kroah-Hartman --- drivers/base/base.h | 12 ++++++++++++ drivers/base/devres.c | 12 ------------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/drivers/base/base.h b/drivers/base/base.h index 8c2175820da9..5e0e7eefa405 100644 --- a/drivers/base/base.h +++ b/drivers/base/base.h @@ -222,6 +222,18 @@ static inline void device_set_driver(struct device *de= v, const struct device_dri WRITE_ONCE(dev->driver, (struct device_driver *)drv); } =20 +struct devres_node; +typedef void (*dr_node_release_t)(struct device *dev, struct devres_node *= node); +typedef void (*dr_node_free_t)(struct devres_node *node); + +struct devres_node { + struct list_head entry; + dr_node_release_t release; + dr_node_free_t free_node; + const char *name; + size_t size; +}; + void devres_for_each_res(struct device *dev, dr_release_t release, dr_match_t match, void *match_data, void (*fn)(struct device *, void *, void *), diff --git a/drivers/base/devres.c b/drivers/base/devres.c index 0fca73b56168..7c9ef6fc6827 100644 --- a/drivers/base/devres.c +++ b/drivers/base/devres.c @@ -16,18 +16,6 @@ #include "base.h" #include "trace.h" =20 -struct devres_node; -typedef void (*dr_node_release_t)(struct device *dev, struct devres_node *= node); -typedef void (*dr_node_free_t)(struct devres_node *node); - -struct devres_node { - struct list_head entry; - dr_node_release_t release; - dr_node_free_t free_node; - const char *name; - size_t size; -}; - struct devres { struct devres_node node; dr_release_t release; --=20 2.53.0 From nobody Thu Apr 2 00:15:31 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A140F303A01; Fri, 13 Feb 2026 22:07:31 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1771020451; cv=none; b=cthpiQJyqTs5lr/NI83o1aM3LeqpD3Jaywk75QKfrPtm6LTrwGl+z4QkBE6WT/MkQ7QadhBE/981FVgS+nEOVR5WBXKgLn7rEQVHpY7hma6rrhVcasxZSIrM8smB+uhxZv9fneiXSuc83pyYNA8kHLgTybVoVFQ1o/HuadYgBWU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1771020451; c=relaxed/simple; bh=xo5sU91OR5Gc6dMD4w7aMlpbSlKYhosLwmq+Cy4FxcQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=YSdU+BwmPw5mNFT0xbT2LiH6o1sj9WyzCayeI5j2wzUWkjsCnFKvLQ6h2jyWnTK/Y9sfKET5LAaihuhFYrp6S2GF2jA115+bZMUDurXvOZhmDcL3aAtKmbvDreNieKJCuJ9BbSRuG1qDkajrZ8qZ4xk69rzzlSsXMz/4vXcVLb4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=ES6XRR1t; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="ES6XRR1t" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6B7DBC116C6; Fri, 13 Feb 2026 22:07:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1771020451; bh=xo5sU91OR5Gc6dMD4w7aMlpbSlKYhosLwmq+Cy4FxcQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ES6XRR1t0xXSYBRiD409gyYQQIXugz4WMdOX3jAU3OJ/30/iI3G7fyo9DRByEitv8 8H53x4jQ2jA7OzUy5a8E4mopV1rUdlg4w+DiFGzVAGVI/W2WAECc27leS/wAmhLwt8 edY21bX06rMjUDDSiqPlx//IclMZoqAT1fqj1ZjNPcvIOXHoq6p2yX59b6gN1N2rVL oxS2pw7pK5g2XSuS4auvOVw182EXpb6lciWmkmAsUHN2QffyBi7V5nKYyndU6gZFi8 I0vyMli5h+g5f+9xVxmJDoEhs1sHFb7Tqa7+6ew5+y1gNV3aJlijKwbjyr4dbdlzWd fC8ticAkuAh9A== From: Danilo Krummrich To: gregkh@linuxfoundation.org, rafael@kernel.org, ojeda@kernel.org, boqun.feng@gmail.com, gary@garyguo.net, bjorn3_gh@protonmail.com, lossin@kernel.org, a.hindborg@kernel.org, aliceryhl@google.com, tmgross@umich.edu Cc: driver-core@lists.linux.dev, rust-for-linux@vger.kernel.org, linux-kernel@vger.kernel.org, Danilo Krummrich Subject: [PATCH v2 2/5] devres: export devres_node_init() and devres_node_add() Date: Fri, 13 Feb 2026 23:07:12 +0100 Message-ID: <20260213220718.82835-3-dakr@kernel.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260213220718.82835-1-dakr@kernel.org> References: <20260213220718.82835-1-dakr@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Export devres_node_init() and devres_node_add() through base.h, such that we can access is from the Rust devres code. Signed-off-by: Danilo Krummrich Acked-by: Greg Kroah-Hartman --- drivers/base/base.h | 3 +++ drivers/base/devres.c | 8 ++++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/drivers/base/base.h b/drivers/base/base.h index 5e0e7eefa405..0ad52a847bd0 100644 --- a/drivers/base/base.h +++ b/drivers/base/base.h @@ -234,6 +234,9 @@ struct devres_node { size_t size; }; =20 +void devres_node_init(struct devres_node *node, dr_node_release_t release, + dr_node_free_t free_node); +void devres_node_add(struct device *dev, struct devres_node *node); void devres_for_each_res(struct device *dev, dr_release_t release, dr_match_t match, void *match_data, void (*fn)(struct device *, void *, void *), diff --git a/drivers/base/devres.c b/drivers/base/devres.c index 7c9ef6fc6827..aa39e87082a1 100644 --- a/drivers/base/devres.c +++ b/drivers/base/devres.c @@ -36,9 +36,9 @@ struct devres_group { /* -- 8 pointers */ }; =20 -static void devres_node_init(struct devres_node *node, - dr_node_release_t release, - dr_node_free_t free_node) +void devres_node_init(struct devres_node *node, + dr_node_release_t release, + dr_node_free_t free_node) { INIT_LIST_HEAD(&node->entry); node->release =3D release; @@ -256,7 +256,7 @@ void devres_free(void *res) } EXPORT_SYMBOL_GPL(devres_free); =20 -static void devres_node_add(struct device *dev, struct devres_node *node) +void devres_node_add(struct device *dev, struct devres_node *node) { guard(spinlock_irqsave)(&dev->devres_lock); =20 --=20 2.53.0 From nobody Thu Apr 2 00:15:31 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 1426E303A35; Fri, 13 Feb 2026 22:07:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1771020455; cv=none; b=sJbwfCEPTYbJLjwplPx9X1fGJZvP7uFn4oMTvORGjyj87xGoIUcBQ65PHSTznGbM6846ANEm90C+rTUgxdvE2kOOHt+NTue2zMKKzVwmcXJp8C42nC5momSuP73ZDyvbYruiTp8Xq/O6KCznlrmKl46xM0HlhK6dXwdcTVgFnQY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1771020455; c=relaxed/simple; bh=5AVHo1gEodXkShfE/oa7y1+OZxZ1jufYkYdoM9ADMZk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=rUB4GGzFCtgD0UkbbHjds1RUl+Qa3yzYOXHwvq3NpO3WB2lQVVxhicLvwrT2HxZEsKREeeoYAz9WHkCvFdKaYJ/R+dBdgStA57vKPQdcZT/lPC+sZFV6di5NPameu40VI2YgOepE7Gp4dWW5hz6jlVfxsshC0+U09VERE8FVQEo= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=fgPd/QN1; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="fgPd/QN1" Received: by smtp.kernel.org (Postfix) with ESMTPSA id C854CC116C6; Fri, 13 Feb 2026 22:07:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1771020454; bh=5AVHo1gEodXkShfE/oa7y1+OZxZ1jufYkYdoM9ADMZk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=fgPd/QN1ftJ9LkQEVnTob+R/c1jELS78v/kkHm8YcYDLabtN6nl3oFIm+8087Tula cWH+xbswwnwNaTigY5RBH0W6PL3eaiHYBWoodurdS24QfpxInTiHNLZOkgVrwknkY4 1+HCG03WPRFuT0J81X9kYYu+CJVxj9l3CgojT3/Mys8ZQxQvwIwcpTdwUZpHqxaKAT 0cFcGdh9tQPKtpDPvegbv44VGOyMmTpJrqzd3Hfr7QQMIOYWQjmuBi5scksfGW/Pfx gOor3LBfef2ExlUIbBHvKt3UM9kIYShG/+RnK6cu7gGad5CRwxjWmZprptfd2AjNZK vSSJzkPMSzEDg== From: Danilo Krummrich To: gregkh@linuxfoundation.org, rafael@kernel.org, ojeda@kernel.org, boqun.feng@gmail.com, gary@garyguo.net, bjorn3_gh@protonmail.com, lossin@kernel.org, a.hindborg@kernel.org, aliceryhl@google.com, tmgross@umich.edu Cc: driver-core@lists.linux.dev, rust-for-linux@vger.kernel.org, linux-kernel@vger.kernel.org, Danilo Krummrich Subject: [PATCH v2 3/5] devres: add devres_node_remove() Date: Fri, 13 Feb 2026 23:07:13 +0100 Message-ID: <20260213220718.82835-4-dakr@kernel.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260213220718.82835-1-dakr@kernel.org> References: <20260213220718.82835-1-dakr@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" When the Rust Devres container type is dropped we need a way to remove the embedded struct devres_node from the device's node list. Signed-off-by: Danilo Krummrich Acked-by: Greg Kroah-Hartman --- drivers/base/base.h | 1 + drivers/base/devres.c | 16 ++++++++++++++++ 2 files changed, 17 insertions(+) diff --git a/drivers/base/base.h b/drivers/base/base.h index 0ad52a847bd0..93b2020baa99 100644 --- a/drivers/base/base.h +++ b/drivers/base/base.h @@ -237,6 +237,7 @@ struct devres_node { void devres_node_init(struct devres_node *node, dr_node_release_t release, dr_node_free_t free_node); void devres_node_add(struct device *dev, struct devres_node *node); +bool devres_node_remove(struct device *dev, struct devres_node *node); void devres_for_each_res(struct device *dev, dr_release_t release, dr_match_t match, void *match_data, void (*fn)(struct device *, void *, void *), diff --git a/drivers/base/devres.c b/drivers/base/devres.c index aa39e87082a1..bf51404e2bf4 100644 --- a/drivers/base/devres.c +++ b/drivers/base/devres.c @@ -361,6 +361,22 @@ void *devres_get(struct device *dev, void *new_res, } EXPORT_SYMBOL_GPL(devres_get); =20 +bool devres_node_remove(struct device *dev, struct devres_node *node) +{ + struct devres_node *__node; + + guard(spinlock_irqsave)(&dev->devres_lock); + list_for_each_entry_reverse(__node, &dev->devres_head, entry) { + if (__node =3D=3D node) { + list_del_init(&node->entry); + devres_log(dev, node, "REM"); + return true; + } + } + + return false; +} + /** * devres_remove - Find a device resource and remove it * @dev: Device to find resource from --=20 2.53.0 From nobody Thu Apr 2 00:15:31 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6A3C4303A01; Fri, 13 Feb 2026 22:07:38 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1771020458; cv=none; b=IuJ1jUCWPGS0HgVqz/eUZ+fa4mPmneZDJ9smnkE115ckmwwJTXNpemEn1/zqTZlRepqLp73qS6JWlfLnb1aebi1Wnh1ottizhDdOil8uACfhK3O311Yl9TwTNSYCQ36cvxaGdWFG4Z0Fw2hrNzFf/7WV0ID767lhnjcc9tRnXyo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1771020458; c=relaxed/simple; bh=xTZQEObhLQk1t7qft0AgT5jc/nmzg9hJRLdW3uNk2L4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Ct+3pwiWMeNVPwopMnzUo4QHrHBPFxzPxU3cQfsTCfQF0zHP8EwgwciT5xTD3WIT94o9lKh1paTKDDGDxgzCEqKCP7yOjWupqZP9x7kv69vcJFVyzrO/mN/7/+hnut57Z+ox1/97qC+7JluZ75LwP2T4Q9Cfy3a8VUIB51yrHDY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=eH9YiW5u; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="eH9YiW5u" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 35069C116C6; Fri, 13 Feb 2026 22:07:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1771020458; bh=xTZQEObhLQk1t7qft0AgT5jc/nmzg9hJRLdW3uNk2L4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=eH9YiW5uG+tD2D/0+GjEb+a93+CdXhkw+OxvR+jNbq/eM9pzSnC9NTuSjm85lGvhT 9JwWxseWpVRwK47GTjrycnVyDjKdnd5jFIFhIlki0zUsUNh77MQm7iUqRcacmIP5/r 96mSQu4mGEYfmvS34wZ/ipDJqIKPCziv2CPAvAqSM8RReaOgQN5v+I3NJk6/oN+Uwc IuBff638i1qOs1FvNst5IB5pbf8tTumGLxcq5+F7P61XaM8JwDy/fygbYhjF7idKCT XA6TpIzq/CNODWgPc9mZDQ01Mc00m6amtZ/pQwwxPmzrxELhZzKRf4mPEoiuaPFA3/ 7DmkJKIJv5HIQ== From: Danilo Krummrich To: gregkh@linuxfoundation.org, rafael@kernel.org, ojeda@kernel.org, boqun.feng@gmail.com, gary@garyguo.net, bjorn3_gh@protonmail.com, lossin@kernel.org, a.hindborg@kernel.org, aliceryhl@google.com, tmgross@umich.edu Cc: driver-core@lists.linux.dev, rust-for-linux@vger.kernel.org, linux-kernel@vger.kernel.org, Danilo Krummrich Subject: [PATCH v2 4/5] devres: rename and export set_node_dbginfo() Date: Fri, 13 Feb 2026 23:07:14 +0100 Message-ID: <20260213220718.82835-5-dakr@kernel.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260213220718.82835-1-dakr@kernel.org> References: <20260213220718.82835-1-dakr@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Rename set_node_dbginfo() to devres_set_node_dbginfo() and export it through base.h, such that we can access is from the Rust devres code. Signed-off-by: Danilo Krummrich Acked-by: Greg Kroah-Hartman --- drivers/base/base.h | 2 ++ drivers/base/devres.c | 14 +++++++------- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/drivers/base/base.h b/drivers/base/base.h index 93b2020baa99..9aed7e2c78ef 100644 --- a/drivers/base/base.h +++ b/drivers/base/base.h @@ -238,6 +238,8 @@ void devres_node_init(struct devres_node *node, dr_node= _release_t release, dr_node_free_t free_node); void devres_node_add(struct device *dev, struct devres_node *node); bool devres_node_remove(struct device *dev, struct devres_node *node); +void devres_set_node_dbginfo(struct devres_node *node, const char *name, + size_t size); void devres_for_each_res(struct device *dev, dr_release_t release, dr_match_t match, void *match_data, void (*fn)(struct device *, void *, void *), diff --git a/drivers/base/devres.c b/drivers/base/devres.c index bf51404e2bf4..e36d2cc7723d 100644 --- a/drivers/base/devres.c +++ b/drivers/base/devres.c @@ -50,7 +50,7 @@ static inline void free_node(struct devres_node *node) node->free_node(node); } =20 -static void set_node_dbginfo(struct devres_node *node, const char *name, +void devres_set_node_dbginfo(struct devres_node *node, const char *name, size_t size) { node->name =3D name; @@ -189,7 +189,7 @@ void *__devres_alloc_node(dr_release_t release, size_t = size, gfp_t gfp, int nid, dr =3D alloc_dr(release, size, gfp | __GFP_ZERO, nid); if (unlikely(!dr)) return NULL; - set_node_dbginfo(&dr->node, name, size); + devres_set_node_dbginfo(&dr->node, name, size); return dr->data; } EXPORT_SYMBOL_GPL(__devres_alloc_node); @@ -603,8 +603,8 @@ void *devres_open_group(struct device *dev, void *id, g= fp_t gfp) =20 devres_node_init(&grp->node[0], &group_open_release, devres_group_free); devres_node_init(&grp->node[1], &group_close_release, NULL); - set_node_dbginfo(&grp->node[0], "grp<", 0); - set_node_dbginfo(&grp->node[1], "grp>", 0); + devres_set_node_dbginfo(&grp->node[0], "grp<", 0); + devres_set_node_dbginfo(&grp->node[1], "grp>", 0); grp->id =3D grp; if (id) grp->id =3D id; @@ -792,7 +792,7 @@ int __devm_add_action(struct device *dev, void (*action= )(void *), void *data, co return -ENOMEM; =20 devres_node_init(&devres->node, devm_action_release, devm_action_free); - set_node_dbginfo(&devres->node, name, sizeof(*devres)); + devres_set_node_dbginfo(&devres->node, name, sizeof(*devres)); =20 devres->action.data =3D data; devres->action.action =3D action; @@ -953,7 +953,7 @@ void *devm_kmalloc(struct device *dev, size_t size, gfp= _t gfp) * This is named devm_kzalloc_release for historical reasons * The initial implementation did not support kmalloc, only kzalloc */ - set_node_dbginfo(&dr->node, "devm_kzalloc_release", size); + devres_set_node_dbginfo(&dr->node, "devm_kzalloc_release", size); devres_add(dev, dr->data); return dr->data; } @@ -1024,7 +1024,7 @@ void *devm_krealloc(struct device *dev, void *ptr, si= ze_t new_size, gfp_t gfp) if (!new_dr) return NULL; =20 - set_node_dbginfo(&new_dr->node, "devm_krealloc_release", new_size); + devres_set_node_dbginfo(&new_dr->node, "devm_krealloc_release", new_size); =20 /* * The spinlock protects the linked list against concurrent --=20 2.53.0 From nobody Thu Apr 2 00:15:31 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E4754303A01; Fri, 13 Feb 2026 22:07:41 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1771020462; cv=none; b=FY1Mt1zgTqOz4OROToRaIQkGKjaBJYMSmh/b6SCmwFiW3FrcaNLplF1TtEG9JmfMDmOIb8oYWGN6xgJ+VG6kaAPgVTPqON7V7Fyz7Hj9cIxlQlaLVMeyXYD0mkdwylDrbKWTWU8lck71VbiPfEFvPDekq+7FlzY7AAhL/g2hsuQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1771020462; c=relaxed/simple; bh=v6pYErK32CTDUWUPlbCOsjcpr4M6bc3WqnIvsYorakM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=bXml8EdoEBr8TMlZWPyrKG1s6Vu8o1+bHwoZ+K/yt2SFBW2GgfMTc/9CVyKxn07ptA7JToC4bZ9TppRIIY6HcIVczylQ4ZtyL3iHse7JIHT5e+Q0PNk7oEdU/257HDvkTOCdeB3Wfg1022flwZVYtFeM5PV9nANtrhBYZVYWLQU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=kzNPP7OU; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="kzNPP7OU" Received: by smtp.kernel.org (Postfix) with ESMTPSA id A6291C116C6; Fri, 13 Feb 2026 22:07:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1771020461; bh=v6pYErK32CTDUWUPlbCOsjcpr4M6bc3WqnIvsYorakM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=kzNPP7OUXUfex6xFGKrwB0Jt69w++sRmwHxwYcqU0wm13nRV2rEfT4Q4ATS/FYCiM jpfknroj6hdVN9QHNa48sINlgviXSbKPQ0t0253/Lwl1mkwTVpiLFWa43/dGHS9PNJ lYAIOY8oX1udaX2hldQ7+bfz3RLPcKX9v8N1BlHu3DrnrClzNZlL2dRPBxWWrhnwlT DK34tnSaRyxaSmfp2+Ufhg0tLiDjXPCrp6Yerxbo2wj2S6XJP9LsC3IHWDbYrG4mdM +OER+zLfmaDxmIo52QuSPjqeKdn5rI1r91wI7fBgkv19KQ43ehW1yDYJNBJ376ng/g urM6ESOo5avJA== From: Danilo Krummrich To: gregkh@linuxfoundation.org, rafael@kernel.org, ojeda@kernel.org, boqun.feng@gmail.com, gary@garyguo.net, bjorn3_gh@protonmail.com, lossin@kernel.org, a.hindborg@kernel.org, aliceryhl@google.com, tmgross@umich.edu Cc: driver-core@lists.linux.dev, rust-for-linux@vger.kernel.org, linux-kernel@vger.kernel.org, Danilo Krummrich Subject: [PATCH v2 5/5] rust: devres: embed struct devres_node directly Date: Fri, 13 Feb 2026 23:07:15 +0100 Message-ID: <20260213220718.82835-6-dakr@kernel.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260213220718.82835-1-dakr@kernel.org> References: <20260213220718.82835-1-dakr@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Currently, the Devres container uses devm_add_action() to register a devres callback. devm_add_action() allocates a struct action_devres, which on top of struct devres_node, just keeps a data pointer and release function pointer. This is an unnecessary indirection, given that analogous to struct devres, the Devres container can just embed a struct devres_node directly without an additional allocation. In contrast to struct devres, we don't need to force an alignment of ARCH_DMA_MINALIGN (as struct devres does to account for the worst case) since we have generics in Rust. I.e. the compiler already ensures correct alignment of the embedded T in Devres. Thus, get rid of devm_add_action() and instead embed a struct devres_node directly. Signed-off-by: Danilo Krummrich Acked-by: Greg Kroah-Hartman Reviewed-by: Alice Ryhl --- rust/kernel/devres.rs | 182 +++++++++++++++++++++++++++++++----------- 1 file changed, 135 insertions(+), 47 deletions(-) diff --git a/rust/kernel/devres.rs b/rust/kernel/devres.rs index 6afe196be42c..4c1efad758c7 100644 --- a/rust/kernel/devres.rs +++ b/rust/kernel/devres.rs @@ -23,9 +23,22 @@ rcu, Arc, // }, - types::ForeignOwnable, + types::{ + ForeignOwnable, + Opaque, // + }, }; =20 +/// Inner type that embeds a `struct devres_node` and the `Revocable`. +#[repr(C)] +#[pin_data] +struct Inner { + #[pin] + node: Opaque, + #[pin] + data: Revocable, +} + /// This abstraction is meant to be used by subsystems to containerize [`D= evice`] bound resources to /// manage their lifetime. /// @@ -111,12 +124,63 @@ /// ``` pub struct Devres { dev: ARef, - /// Pointer to [`Self::devres_callback`]. - /// - /// Has to be stored, since Rust does not guarantee to always return t= he same address for a - /// function. However, the C API uses the address as a key. - callback: unsafe extern "C" fn(*mut c_void), - data: Arc>, + inner: Arc>, +} + +// Calling the FFI functions from the `base` module directly from the `Dev= res` impl may result in +// them being called directly from driver modules. This happens since the = Rust compiler will use +// monomorphisation, so it might happen that functions are instantiated wi= thin the calling driver +// module. For now, work around this with `#[inline(never)]` helpers. +// +// TODO: Remove once a more generic solution has been implemented. For ins= tance, we may be able to +// leverage `bindgen` to take care of this depending on whether a symbol i= s (already) exported. +mod base { + use kernel::{ + bindings, + prelude::*, // + }; + + #[inline(never)] + #[allow(clippy::missing_safety_doc)] + pub(super) unsafe fn devres_node_init( + node: *mut bindings::devres_node, + release: bindings::dr_node_release_t, + free: bindings::dr_node_free_t, + ) { + // SAFETY: Safety requirements are the same as `bindings::devres_n= ode_init`. + unsafe { bindings::devres_node_init(node, release, free) } + } + + #[inline(never)] + #[allow(clippy::missing_safety_doc)] + pub(super) unsafe fn devres_set_node_dbginfo( + node: *mut bindings::devres_node, + name: *const c_char, + size: usize, + ) { + // SAFETY: Safety requirements are the same as `bindings::devres_s= et_node_dbginfo`. + unsafe { bindings::devres_set_node_dbginfo(node, name, size) } + } + + #[inline(never)] + #[allow(clippy::missing_safety_doc)] + pub(super) unsafe fn devres_node_add( + dev: *mut bindings::device, + node: *mut bindings::devres_node, + ) { + // SAFETY: Safety requirements are the same as `bindings::devres_n= ode_add`. + unsafe { bindings::devres_node_add(dev, node) } + } + + #[inline(never)] + #[allow(clippy::missing_safety_doc)] + pub(super) unsafe fn devres_node_remove( + dev: *mut bindings::device, + node: *mut bindings::devres_node, + ) -> bool { + // SAFETY: Safety requirements are the same as `bindings::devres_n= ode_remove`. + unsafe { bindings::devres_node_remove(dev, node) } + } } =20 impl Devres { @@ -128,58 +192,82 @@ pub fn new(dev: &Device, data: impl PinInit= ) -> Result where Error: From, { - let callback =3D Self::devres_callback; - let data =3D Arc::pin_init(Revocable::new(data), GFP_KERNEL)?; - let devres_data =3D data.clone(); + let inner =3D Arc::pin_init::( + try_pin_init!(Inner { + node <- Opaque::ffi_init(|node: *mut bindings::devres_node= | { + // SAFETY: `node` is a valid pointer to an uninitializ= ed `struct devres_node`. + unsafe { + base::devres_node_init( + node, + Some(Self::devres_node_release), + Some(Self::devres_node_free_node), + ) + }; + + // SAFETY: `node` is a valid pointer to an uninitializ= ed `struct devres_node`. + unsafe { + base::devres_set_node_dbginfo( + node, + // TODO: Use `core::any::type_name::()` onc= e we are able to convert + // the `&str` to a NULL terminated `&CStr` wit= hout additional + // allocation. + c"Devres".as_char_ptr(), + core::mem::size_of::>(), + ) + }; + }), + data <- Revocable::new(data), + }), + GFP_KERNEL, + )?; =20 // SAFETY: - // - `dev.as_raw()` is a pointer to a valid bound device. - // - `data` is guaranteed to be a valid for the duration of the li= fetime of `Self`. - // - `devm_add_action()` is guaranteed not to call `callback` for = the entire lifetime of - // `dev`. - to_result(unsafe { - bindings::devm_add_action( - dev.as_raw(), - Some(callback), - Arc::as_ptr(&data).cast_mut().cast(), - ) - })?; - - // `devm_add_action()` was successful and has consumed the referen= ce count. - core::mem::forget(devres_data); + // - `dev` is a valid pointer to a bound `struct device`. + // - `node` is a valid pointer to a `struct devres_node`. + // - `devres_node_add()` is guaranteed not to call `devres_node_re= lease()` for the entire + // lifetime of `dev`. + unsafe { base::devres_node_add(dev.as_raw(), inner.node.get()) }; + + // Take additional reference count for `devres_node_add()`. + core::mem::forget(inner.clone()); =20 Ok(Self { dev: dev.into(), - callback, - data, + inner, }) } =20 fn data(&self) -> &Revocable { - &self.data + &self.inner.data } =20 #[allow(clippy::missing_safety_doc)] - unsafe extern "C" fn devres_callback(ptr: *mut kernel::ffi::c_void) { - // SAFETY: In `Self::new` we've passed a valid pointer of `Revocab= le` to - // `devm_add_action()`, hence `ptr` must be a valid pointer to `Re= vocable`. - let data =3D unsafe { Arc::from_raw(ptr.cast::>()) }; + unsafe extern "C" fn devres_node_release( + _dev: *mut bindings::device, + node: *mut bindings::devres_node, + ) { + let node =3D Opaque::cast_from(node); + + // SAFETY: `node` is in the same allocation as its container. + let inner =3D unsafe { kernel::container_of!(node, Inner, node)= }; + + // SAFETY: `inner` is a valid `Inner` pointer. + let inner =3D unsafe { &*inner }; =20 - data.revoke(); + inner.data.revoke(); + } + + #[allow(clippy::missing_safety_doc)] + unsafe extern "C" fn devres_node_free_node(node: *mut bindings::devres= _node) { + // SAFETY: `node` points to the entire `Inner` allocation. + drop(unsafe { Arc::from_raw(node.cast::>()) }); } =20 - fn remove_action(&self) -> bool { + fn remove_node(&self) -> bool { // SAFETY: - // - `self.dev` is a valid `Device`, - // - the `action` and `data` pointers are the exact same ones as g= iven to - // `devm_add_action()` previously, - (unsafe { - bindings::devm_remove_action_nowarn( - self.dev.as_raw(), - Some(self.callback), - core::ptr::from_ref(self.data()).cast_mut().cast(), - ) - } =3D=3D 0) + // - `self.device().as_raw()` is a valid pointer to a bound `struc= t device`. + // - `self.inner.node.get()` is a valid pointer to a `struct devre= s_node`. + unsafe { base::devres_node_remove(self.device().as_raw(), self.inn= er.node.get()) } } =20 /// Return a reference of the [`Device`] this [`Devres`] instance has = been created with. @@ -261,12 +349,12 @@ fn drop(&mut self) { // SAFETY: When `drop` runs, it is guaranteed that nobody is acces= sing the revocable data // anymore, hence it is safe not to wait for the grace period to f= inish. if unsafe { self.data().revoke_nosync() } { - // We revoked `self.data` before the devres action did, hence = try to remove it. - if self.remove_action() { + // We revoked `self.data` before devres did, hence try to remo= ve it. + if self.remove_node() { // SAFETY: In `Self::new` we have taken an additional refe= rence count of `self.data` - // for `devm_add_action()`. Since `remove_action()` was su= ccessful, we have to drop + // for `devres_node_add()`. Since `remove_node()` was succ= essful, we have to drop // this additional reference count. - drop(unsafe { Arc::from_raw(Arc::as_ptr(&self.data)) }); + drop(unsafe { Arc::from_raw(Arc::as_ptr(&self.inner)) }); } } } --=20 2.53.0