From nobody Sat Feb 7 22:34:19 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 770263358D1; Thu, 5 Feb 2026 22:47:54 +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=1770331674; cv=none; b=qHVmchcL9D7//WmxQSoydX8C2q5ogd6J3xniitMwWBp/HCRe/6FdQofec8B66e3917YJKhlCg1BgcrZsQwhWIwhkaHGQsQdHTVN8vVyU64A2h26jkex9uJcCdljLaqAafT5IUtUt8FSNrrBPHh7C9u6/Ix1axMndMrNXJHbbA7U= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1770331674; c=relaxed/simple; bh=pK/Qga/Jpf4ObpwFtGxESpW9MDWF5KFbPEvWA/njgrI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=LVUieqta6akd9jdr1Z2iyCLEaSbAZhIvuD96fGHC6LH2LhI+GImo8WgIhFTx2WBbXSNJza/bN7WeDQ5NLLPF9IxZ4GIau0vHyK9mLB0Kxm/mrKPFKaKUHIo2Qa5K/Sh6cM1ecU8OAu68dQ59qjWriB1VK4iMU2tb1YThYGhtkc8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=kCn36Ku3; 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="kCn36Ku3" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 386E1C19424; Thu, 5 Feb 2026 22:47:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1770331674; bh=pK/Qga/Jpf4ObpwFtGxESpW9MDWF5KFbPEvWA/njgrI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=kCn36Ku3sKLwVuTjFr3JaEBF2WhCWV6v/givcfqUugPL5qxT+FMdBzeiq1AT3Nsud D7nU6tBWCM3vPcFWVQgxCSI4iKsU/CQ3oHFfiUBhIm7GG2ccVpMQ7dafvuUo5ReipA vmf4WVatNJsqx+9D+c+ovgFqX9tRBJJAePJOG6ONNo7Ts/S6rkHdsXj6cOtZ2UK1W+ w8nbYaR3f4qnURVwOlM4kpIM8D0qZ3+NrlJkqcaylGos0KRG/tfUR3MR3NlA8f5E/k xavq7uCRld+fqctqt1pqTZbdvDixo2YbBfB+B+kRIwKX50hsPnC5ElBSCvNPa+LdQl 3nmcGlbkWTZxQ== 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 1/5] devres: move struct devres_node into base.h Date: Thu, 5 Feb 2026 23:31:24 +0100 Message-ID: <20260205224706.91996-3-dakr@kernel.org> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260205224706.91996-2-dakr@kernel.org> References: <20260205224706.91996-2-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 --- 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.52.0 From nobody Sat Feb 7 22:34:19 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 E286933A718; Thu, 5 Feb 2026 22:47:57 +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=1770331678; cv=none; b=kQlp6E4dLxbwHAhVCV7smjfNl8SvhBtQTB9zwqfWTID/tHZGIGLmybFPHg/qglZxYx5DIlR2d3v6DQvuZspIAJ5KtrzAkzGXxO9aErX8OCiUOS5f9VLo1J837+sBvJmxwGBE7UD6VmVrmUlBqXs3DvcHxLCGvjt42+s5EWks5Ls= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1770331678; c=relaxed/simple; bh=ICVLVypokoWC+bfJfZh1jhl3S5EXMKv+QsOC/Bsr+Es=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=IIObHlADSi0Jj0+nNPlEjWAwjlFTr9J9BqKMaNrYbd+QpXdbvri2HIvcWQUmpm4rAgiEvA8Zx17P8ijjaS/ZlxEwcVt4/KMslhFwQip331A+Y7W9B0vh4kgQYcaRzVdnkjd3vfy6AwYqrOiKHyCqX7ArLoc/krB+3y9IX+UCNbc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=QQzJWFr0; 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="QQzJWFr0" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 92578C19421; Thu, 5 Feb 2026 22:47:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1770331677; bh=ICVLVypokoWC+bfJfZh1jhl3S5EXMKv+QsOC/Bsr+Es=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=QQzJWFr0+ByxTxxRl80Ytte+ZgDWmcps1PysT8mE3v9B/fuukJfo/pYmPnEVHFQaz eQ+Ej+bQQVHBXZkzyOmRgwK7ciuhdA543zoal7QEW4zj80sWXHX4Qw+nN7uUu8o+1+ LxpOZ1DdkuEhK4p4DosvTVkJ/jDXHj7B5APWjmPpveiaUE2G4XpxXxiUTAHf7yhk6A AzUnORXzV16J6RFxiT8ZP3hlUkbPCITVRLGqFYn/2pfKPbrG/vWrKpchlTP1WFk37q SgncMrsSjhgOS/3kyMRV+AQVQ3cMbLsgQFyflgbdOVHJfEwaei2tzUblt7gOkP+ybu iSjg5DP6xO3dg== 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 2/5] devres: export devres_node_init() and devres_node_add() Date: Thu, 5 Feb 2026 23:31:25 +0100 Message-ID: <20260205224706.91996-4-dakr@kernel.org> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260205224706.91996-2-dakr@kernel.org> References: <20260205224706.91996-2-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 --- drivers/base/base.h | 3 +++ drivers/base/devres.c | 10 ++++++---- 2 files changed, 9 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..51d079acc9b3 100644 --- a/drivers/base/devres.c +++ b/drivers/base/devres.c @@ -36,14 +36,15 @@ 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; node->free_node =3D free_node; } +EXPORT_SYMBOL_GPL(devres_node_init); =20 static inline void free_node(struct devres_node *node) { @@ -256,12 +257,13 @@ 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 add_dr(dev, node); } +EXPORT_SYMBOL_GPL(devres_node_add); =20 /** * devres_add - Register device resource --=20 2.52.0 From nobody Sat Feb 7 22:34:19 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 368DC3346BB; Thu, 5 Feb 2026 22:48:01 +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=1770331681; cv=none; b=ZRh3dtCi4fK/Hk72dQK3mnm1e8Ucevuov1VaaKHglJJM6ZBiQUgYq1hCVc48KQwJH7M3mAcMet46/r5frAGrC7XW0RtTvtyYAxtRMY25y7jJYpvL/D3dIJb4aYcwb2rgNN8+/njEfkYfsaCjdgkCIEI2gCsTAg5KIVuHl01ZnRo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1770331681; c=relaxed/simple; bh=FOdadmQ+S2mCHDnQCUMOZD6q7lK1m9onAeTEGMHVtfc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=onG5G52AQPs3k/SPbyN9oDBUq1Ys6trMBGEY1kkfdbTP7BMQilwRuos4jkofA6Wb9JqF0mFAkU6BLRuS8WrQrVE7egVfycObfSFk77oNGC2K+HD7vU1+hNsKX1Ix1dAdH+mVlC8Z/gPXsXTZ6Y0YJSzvTvUyZBJ1UGoI+IoIsoQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=iVhj8NSe; 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="iVhj8NSe" Received: by smtp.kernel.org (Postfix) with ESMTPSA id F1F31C19424; Thu, 5 Feb 2026 22:47:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1770331680; bh=FOdadmQ+S2mCHDnQCUMOZD6q7lK1m9onAeTEGMHVtfc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=iVhj8NSep1JP8gOgjqk0JCzU/qMgsZlRwmjk+i1m3ClEgvmxzy2KN37Eb3EIJRFql 4Oo4/y78DGuzagh1z4Sb9DQ9qFDV8andDbDOEZjfpT4tr/c+Is9ze4VZAH4HNGihZj RANLb/SKW6ycrnk0KOnWl8i96dR+CGtEWO+lBHTThjgu9vm9T8iXJV1OUZ1cXtRr+K nyA13aGV4IUphQKZb2xg/nQvrUfRHd69p4ptPZOtK+NkLL/T09f4OF/Yk2QpMqplfh Z4/avTRi+1Xp/tZwJEVU+/jD4ANPgKffrbK8YsA4C1acfJaR/kJPepxLhoKoUURaec SxXHFgTkinmQA== 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 3/5] devres: add devres_node_remove() Date: Thu, 5 Feb 2026 23:31:26 +0100 Message-ID: <20260205224706.91996-5-dakr@kernel.org> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260205224706.91996-2-dakr@kernel.org> References: <20260205224706.91996-2-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 --- drivers/base/base.h | 1 + drivers/base/devres.c | 17 +++++++++++++++++ 2 files changed, 18 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 51d079acc9b3..54a41ae599d0 100644 --- a/drivers/base/devres.c +++ b/drivers/base/devres.c @@ -363,6 +363,23 @@ 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; +} +EXPORT_SYMBOL_GPL(devres_node_remove); + /** * devres_remove - Find a device resource and remove it * @dev: Device to find resource from --=20 2.52.0 From nobody Sat Feb 7 22:34:19 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 967353346BB; Thu, 5 Feb 2026 22:48:04 +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=1770331684; cv=none; b=Kw6+Z9G9pQIwUv0WyDImXK57oCHfye56owAR6zZomuK1Dp8xNnRrhUZdJqARB4uT0Arz4O1ImNMunIqHJGlUrDjUFdh/jHhdBrRl9b3r1kTCfa96ODmEQLQX5RIeV0zfeG04Pbu2OA9H/ya9vUh+JCEK1KSGWORU8M63G1o9TMY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1770331684; c=relaxed/simple; bh=VEdbtdw+/9sb6VaGFbTVQFlK6tbCe1e28MLlnk19tOM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Ngcl3KL4LCV39x4LGRGW8FYN3jdsUcdJXXF15prr266MQ5diAmpUnIZmlAzjjwzXeNi9xLA+9LsxclJScaD5BNBO7HCgZ2Yf0uDBzAn0CiJRJvOWbcsB7ZrsLJPwSIKuf2kX7e3pPnBpfYjH9gr/8edsRxrsG5TsLrCTy5pEMZU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=cYYHPDTt; 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="cYYHPDTt" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5A642C19421; Thu, 5 Feb 2026 22:48:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1770331684; bh=VEdbtdw+/9sb6VaGFbTVQFlK6tbCe1e28MLlnk19tOM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=cYYHPDTtFOpt4DoZNzAZiSOEQGMgvHCNnmvEJSDr7fixdBdGmKusCyEQigOMHKpqD 0OBpi2ABSxuP1bgNInajNS9CQLS6HBZmzOMdD9zpbrCA+MTArEnodwb1X53qyWArFC RXcRTrSmKIAWIKxcMSPZ4j42z6Y8CK8e8HNNTfepNHEzW06hO9YIVXDTisxMHOYptB kr0gdR3CppHxljlDJPQYaYaMod/lC8sFJLjoASTglvIeT2n1rWkXt6Ew/nsvCEoqnf PPR46le33iDafdW1mx7emNbgmKol+SrUQbFblTfukeTjlxC/FSwu31+lj4fXZyvhBP yM9DD1WEz004A== 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 4/5] devres: rename and export set_node_dbginfo() Date: Thu, 5 Feb 2026 23:31:27 +0100 Message-ID: <20260205224706.91996-6-dakr@kernel.org> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260205224706.91996-2-dakr@kernel.org> References: <20260205224706.91996-2-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 --- drivers/base/base.h | 2 ++ drivers/base/devres.c | 15 ++++++++------- 2 files changed, 10 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 54a41ae599d0..89c7a2e3cd53 100644 --- a/drivers/base/devres.c +++ b/drivers/base/devres.c @@ -51,12 +51,13 @@ 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; node->size =3D size; } +EXPORT_SYMBOL_GPL(devres_set_node_dbginfo); =20 #ifdef CONFIG_DEBUG_DEVRES static int log_devres =3D 0; @@ -190,7 +191,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); @@ -606,8 +607,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; @@ -795,7 +796,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; @@ -956,7 +957,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; } @@ -1027,7 +1028,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.52.0 From nobody Sat Feb 7 22:34:19 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 201463346BB; Thu, 5 Feb 2026 22:48:07 +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=1770331688; cv=none; b=SPVvPBnSOXPHhJw1lXaRWJj6FkQwHL0ZTeUpMwXongc80qLVz5i1Ge3OT3ZtHCzFmoe6eIqpivwL4cs+j+uLv+eFDj/StL+fgunepoQtbWKats2FE1kfBJsCVXQy/6s1lI2rRhtbmXJtf+z20+6cPluijxP7KhwccjhFmNGGVLE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1770331688; c=relaxed/simple; bh=/+nUu1fIuEPC3eN0fSi7JDz2gDsma6hdxXh3GVA9izk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=hH+/pf5AXYzIHpb3hpCLCWUc0+nhjTMZwycWLGc1Q9r98WuWM54UJvEzTm6RVHIWVs1iSqe1m1v3ktygowICVdH+GE8QX/KbQiER0BMaykd83f9DFj9uT3WvTml/FhA8IHDeX/VnaJrq1/eMq7zIwZK3MhGW7aQPCE8qUceQSWQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=LM5q94mr; 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="LM5q94mr" Received: by smtp.kernel.org (Postfix) with ESMTPSA id D0207C4CEF7; Thu, 5 Feb 2026 22:48:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1770331687; bh=/+nUu1fIuEPC3eN0fSi7JDz2gDsma6hdxXh3GVA9izk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=LM5q94mrj6UJVEVLoEIImdQU09mseqVv8OVHGvo9vdl7kLH9WYmJCI+L//MNZZZgP dxrvSdb1Q/HrQ2YPRsJKtM9od4KFlXq2AIEGc/C6I66sJr1uupjEJT6k/ysaimo1kK AHC6fZO/tRYokBLgKLTwiwsbI58qq5+3O0JyFsn4mlKWXedOe/jBoPZHhXDft2Z1mT SaFtkWiybBgcy3O0aGF+U/9r2j01xeK0Gam6C0hKSB3nFl/LD248Bz+UcwBInCXTE3 HDb5RYFYC78KiWc3+H23l/ffvqcObHJfU/g3bStx/FaSeZb1joPzrMpBEOsHzNgmy2 +rthVIS7AOuyQ== 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 5/5] rust: devres: embed struct devres_node directly Date: Thu, 5 Feb 2026 23:31:28 +0100 Message-ID: <20260205224706.91996-7-dakr@kernel.org> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260205224706.91996-2-dakr@kernel.org> References: <20260205224706.91996-2-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 --- rust/kernel/devres.rs | 123 ++++++++++++++++++++++++++---------------- 1 file changed, 78 insertions(+), 45 deletions(-) diff --git a/rust/kernel/devres.rs b/rust/kernel/devres.rs index ff66f561740a..649e34962c38 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,7 @@ /// ``` 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>, } =20 impl Devres { @@ -128,57 +136,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 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 { + bindings::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 { + bindings::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(), - ) - })?; + // - `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 { bindings::devres_node_add(dev.as_raw(), inner.node.get())= }; =20 - // Take additional reference count for `devm_add_action()`. - core::mem::forget(data.clone()); + // 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); =20 - data.revoke(); + // 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 }; + + 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 { bindings::devres_node_remove(self.device().as_raw(), self= .inner.node.get()) } } =20 /// Return a reference of the [`Device`] this [`Devres`] instance has = been created with. @@ -260,12 +293,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.52.0