From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pg1-f178.google.com (mail-pg1-f178.google.com [209.85.215.178]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8516723F26A for ; Wed, 28 Jan 2026 23:24:03 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.178 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769642644; cv=none; b=o5vpLr1zwSbKH0Tctps7tmngPVEkO7GOMxA+kYQSZvjF0ZiYNZcwp8TwnZrfKkxhRUHYfI82F0g2Ddlj8EQWEIA0JgrtqWBiwHEAqQwM9sTRqGoHWFsHooaS1JwkoCSf0RODkgG0cGtZCycUVqqjKM6W4Y6A3JCuPOowSHM5yXw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769642644; c=relaxed/simple; bh=x68kyFMcXCVl2ap3eh7O4CQGneM+mz/6DOkFyCpzqd0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=bBvM2uNvkDlfteqXYIrytMyTkpMxDj6oOcfFZrpKvDVXlfER39CKa6oQEIvPj1e9zNp9Hr4gcjWYxj/U99oZTXTqrFmXXdLaEP2u8T+cIGLO/8QpN0dXXskX2knmFH3r/UNqn7muVy8B8EZDxJDJ8JTPz9rPtk+hR+0WspBzwfs= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=Bl7IjTGE; arc=none smtp.client-ip=209.85.215.178 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Bl7IjTGE" Received: by mail-pg1-f178.google.com with SMTP id 41be03b00d2f7-c648bc907ebso189922a12.3 for ; Wed, 28 Jan 2026 15:24:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1769642643; x=1770247443; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:feedback-id:from:to:cc:subject :date:message-id:reply-to; bh=Kr5A9uFY8WKbxdwaztWr2I99L6qNUiDvl4AMlkp9MKU=; b=Bl7IjTGEuYk1Bj1d37VQ8OJYN+f+ScN5iMTJcNHXVdHPmx6jY2KiEjmCYuVF6JdsMN F3L2SVHSRsIW/CR4yEPweFX7XvRayTGoADhcKxoH8kFD31YupZzqU5oCdkXG4qjxA86D PU4S1F3f1xTmvxyjeyCgIrXBP0n78X29KcDG6rcy/aPjl07hebeTAdJyZFk6pUDRNYnR k8YRUx0/an5IoPybJDNnC3jRe7PH2TT0PQ2f1OUbCtHR5fEFGfuKKnx8SJ9Z01ihrvtr pMoQIRnWeDdUuImnCKBzz0YNkrEJV5FxyeUUmS/pQYHB+Uo7ZkzO8GkScd6/cDmmfhxF +UFw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1769642643; x=1770247443; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:feedback-id:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=Kr5A9uFY8WKbxdwaztWr2I99L6qNUiDvl4AMlkp9MKU=; b=kz8e6zlKEIYDe6q6MhaWmQK1tLFTW6HdKEKPVQAaY1iwOfppDT7Aoa0KMUtUWxQRBp xkhZE/X5K74MXO3Gho71Y9J7kfHoJnVHdFcoRgnDVWa1sLE5SyVUjRxH54B2cAj/yyPm BzY6fGlef8Cipc3b3YIkX9xtFPbXDA1vQ8qmBGBX38B8yqiO5RS+3jj2VBsdBVDUZZ+f 1MZFZ+e0OHPaNK4IzA4+5R/n0T8tm2+beOr1N38bzQ/L6r7ozMOIjIQJFw4uFFBLRhEn WdvevIbaJVEcaGYerpgaN/nTsrueAn5HInrWIH3RXS8RcVeYLC0uC0Xe2sJuGg6YbB0E tzRg== X-Forwarded-Encrypted: i=1; AJvYcCWrJJp/4KquhpIgA5LJ1NGKCmF/MthnVBFFpYLXVihYsyrFdTUcLhMYyHbaWE6kAlkTwwo=@vger.kernel.org X-Gm-Message-State: AOJu0Yy2SmELx4PwPAQPAof0Pe1ujOpGtr9oeYZe3rWZpqEZoxCdlzs/ 9rv7LUYCqKv8J+5QnFf92WgXXpHTfzkCS56GCoNEYUZj7yZberfQcYIKbUi1KQ== X-Gm-Gg: AZuq6aKV3DAOVylD5iDM/3Jg6sjH0lRCsS7jLzI1s9MLcMi94AouiOF85xTzaY6UIAH SaqZvzM/IABMeJFvw6MVDLggn2Z88dyH6uWZmN8hgb+x1UTI5WsUCL0xWz6hYrmB4PMlu2pkI6I nf3oYEKICF/lUEZkbjKJRjDrNEJZyGDb9cBJwte0MeJQPXLRpdf06XERmCJAauC4pZxr/N6oEDS D9Mn2h3CFM79zk+KTaD04v/R7WLvd4AhlxvAFlApz177Vy1/V1UJjoakWc3TcUNYZq7dK7zKa35 B9tH+PRzj1T5CFSgVzD4Y8UjTemvFqmJqxHVi9oYa6r5WPeGG60WGKLJMb7bQpLI35vIIU6ELFE qu01WJdBFu/xdDMiYcTrcfQXmXQ5i3iPjZDPQcNDrczTOBw4zlOmAhpeXmx8Ir+4Coy53XpMkD3 xh+/3+G7pD8mva53TpCxWWyito4ShpjKg856acgHmmb3z16c3FqlMa22MEWodAn8MzpDqBLI+tr EX1pb0gVhed234= X-Received: by 2002:a05:620a:d81:b0:8c5:310d:3b3a with SMTP id af79cd13be357-8c70b8f6964mr868040985a.70.1769637219381; Wed, 28 Jan 2026 13:53:39 -0800 (PST) Received: from fauth-a1-smtp.messagingengine.com (fauth-a1-smtp.messagingengine.com. [103.168.172.200]) by smtp.gmail.com with ESMTPSA id af79cd13be357-8c711d61c6fsm263878285a.47.2026.01.28.13.53.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 28 Jan 2026 13:53:38 -0800 (PST) Received: from phl-compute-03.internal (phl-compute-03.internal [10.202.2.43]) by mailfauth.phl.internal (Postfix) with ESMTP id 09698F4006C; Wed, 28 Jan 2026 16:53:38 -0500 (EST) Received: from phl-frontend-03 ([10.202.2.162]) by phl-compute-03.internal (MEProxy); Wed, 28 Jan 2026 16:53:38 -0500 X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeefgedrtddtgdduieeggeehucetufdoteggodetrf dotffvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfurfetoffkrfgpnffqhgenuceu rghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmnecujf gurhephffvvefufffkofgjfhgggfestdekredtredttdenucfhrhhomhepuehoqhhunhcu hfgvnhhguceosghoqhhunhdrfhgvnhhgsehgmhgrihhlrdgtohhmqeenucggtffrrghtth gvrhhnpeegleejiedthedvheeggfejveefjeejkefgveffieeujefhueeigfegueehgeeg gfenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpegsoh hquhhnodhmvghsmhhtphgruhhthhhpvghrshhonhgrlhhithihqdeiledvgeehtdeigedq udejjeekheehhedvqdgsohhquhhnrdhfvghngheppehgmhgrihhlrdgtohhmsehfihigmh gvrdhnrghmvgdpnhgspghrtghpthhtohepgedvpdhmohguvgepshhmthhpohhuthdprhgt phhtthhopehlihhnuhigqdhkvghrnhgvlhesvhhgvghrrdhkvghrnhgvlhdrohhrghdprh gtphhtthhopehruhhsthdqfhhorhdqlhhinhhugiesvhhgvghrrdhkvghrnhgvlhdrohhr ghdprhgtphhtthhopehrtghusehvghgvrhdrkhgvrhhnvghlrdhorhhgpdhrtghpthhtoh epghhrvghgkhhhsehlihhnuhigfhhouhhnuggrthhiohhnrdhorhhgpdhrtghpthhtohep rghrvhgvsegrnhgurhhoihgurdgtohhmpdhrtghpthhtohepthhkjhhoshesrghnughroh hiugdrtghomhdprhgtphhtthhopegsrhgruhhnvghrsehkvghrnhgvlhdrohhrghdprhgt phhtthhopegtmhhllhgrmhgrshesghhoohhglhgvrdgtohhmpdhrtghpthhtoheprghlih gtvghrhihhlhesghhoohhglhgvrdgtohhm X-ME-Proxy: Feedback-ID: iad51458e:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Wed, 28 Jan 2026 16:53:37 -0500 (EST) From: Boqun Feng To: linux-kernel@vger.kernel.org, rust-for-linux@vger.kernel.org, rcu@vger.kernel.org Cc: Greg Kroah-Hartman , =?UTF-8?q?Arve=20Hj=C3=B8nnev=C3=A5g?= , Todd Kjos , Christian Brauner , Carlos Llamas , Alice Ryhl , Miguel Ojeda , Boqun Feng , Gary Guo , =?UTF-8?q?Bj=C3=B6rn=20Roy=20Baron?= , Benno Lossin , Andreas Hindborg , Trevor Gross , Danilo Krummrich , "Paul E. McKenney" , Frederic Weisbecker , Neeraj Upadhyay , Joel Fernandes , Josh Triplett , Uladzislau Rezki , Steven Rostedt , Mathieu Desnoyers , Lai Jiangshan , Zqiang , FUJITA Tomonori , Lyude Paul , Thomas Gleixner , Anna-Maria Behnsen , John Stultz , Stephen Boyd , "Yury Norov (NVIDIA)" , Vitaly Wool , Tamir Duberstein , Viresh Kumar , Daniel Almeida , Mitchell Levy , David Gow , Peter Novak , =?UTF-8?q?Jos=C3=A9=20Exp=C3=B3sito?= Subject: [RFC PATCH 3/7] rust: workqueue: Add HasField support for Work Date: Wed, 28 Jan 2026 13:53:26 -0800 Message-ID: <20260128215330.58410-4-boqun.feng@gmail.com> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20260128215330.58410-1-boqun.feng@gmail.com> References: <20260128215330.58410-1-boqun.feng@gmail.com> Precedence: bulk X-Mailing-List: rcu@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Implement `HasWork` via `HasField` so that manually impl_has_work!() is no longer needed. Signed-off-by: Boqun Feng --- rust/kernel/workqueue.rs | 60 +++++++++++++++++++++++++--------------- 1 file changed, 38 insertions(+), 22 deletions(-) diff --git a/rust/kernel/workqueue.rs b/rust/kernel/workqueue.rs index 706e833e9702..2dcfd3eace39 100644 --- a/rust/kernel/workqueue.rs +++ b/rust/kernel/workqueue.rs @@ -34,19 +34,17 @@ //! //! ``` //! use kernel::sync::Arc; -//! use kernel::workqueue::{self, impl_has_work, new_work, Work, WorkItem}; +//! use kernel::workqueue::{self, new_work, Work, WorkItem}; //! +//! #[derive(HasField)] //! #[pin_data] //! struct MyStruct { //! value: i32, //! #[pin] +//! #[field] //! work: Work, //! } //! -//! impl_has_work! { -//! impl HasWork for MyStruct { self.work } -//! } -//! //! impl MyStruct { //! fn new(value: i32) -> Result> { //! Arc::pin_init(pin_init!(MyStruct { @@ -76,23 +74,21 @@ //! //! ``` //! use kernel::sync::Arc; -//! use kernel::workqueue::{self, impl_has_work, new_work, Work, WorkItem}; +//! use kernel::workqueue::{self, new_work, Work, WorkItem}; //! +//! #[derive(HasField)] //! #[pin_data] //! struct MyStruct { //! value_1: i32, //! value_2: i32, //! #[pin] +//! #[field] //! work_1: Work, //! #[pin] +//! #[field] //! work_2: Work, //! } //! -//! impl_has_work! { -//! impl HasWork for MyStruct { self.work_1 } -//! impl HasWork for MyStruct { self.work_2 } -//! } -//! //! impl MyStruct { //! fn new(value_1: i32, value_2: i32) -> Result> { //! Arc::pin_init(pin_init!(MyStruct { @@ -188,6 +184,11 @@ use crate::{ alloc::{AllocError, Flags}, container_of, + field::{ + Field, + HasField, // + }, + macros::HasField, prelude::*, sync::Arc, sync::LockClassKey, @@ -349,9 +350,11 @@ pub fn try_spawn( /// A helper type used in [`try_spawn`]. /// /// [`try_spawn`]: Queue::try_spawn +#[derive(HasField)] #[pin_data] struct ClosureWork { #[pin] + #[field] work: Work>, func: Option, } @@ -534,19 +537,17 @@ pub unsafe fn raw_get(ptr: *const Self) -> *mut bindings::work_struct { /// Declares that a type contains a [`Work`]. /// -/// The intended way of using this trait is via the [`impl_has_work!`] macro. You can use the macro -/// like this: +/// The intended way of using this trait is via the `#[derive(HasField)]` macro. You can use the +/// macro like this: /// -/// ```no_run -/// use kernel::workqueue::{impl_has_work, Work}; +/// ``` +/// use kernel::workqueue::Work; /// +/// #[derive(HasField)] /// struct MyWorkItem { +/// #[field] /// work_field: Work, /// } -/// -/// impl_has_work! { -/// impl HasWork for MyWorkItem { self.work_field } -/// } /// ``` /// /// Note that since the [`Work`] type is annotated with an id, you can have several `work_struct` @@ -559,7 +560,6 @@ pub unsafe fn raw_get(ptr: *const Self) -> *mut bindings::work_struct { /// - `work_container_of(raw_get_work(ptr)) == ptr` for any `ptr: *mut Self`. /// - `raw_get_work(work_container_of(ptr)) == ptr` for any `ptr: *mut Work`. /// -/// [`impl_has_work!`]: crate::impl_has_work /// [`raw_get_work`]: HasWork::raw_get_work /// [`work_container_of`]: HasWork::work_container_of pub unsafe trait HasWork { @@ -627,8 +627,24 @@ unsafe fn work_container_of( } pub use impl_has_work; -impl_has_work! { - impl{T} HasWork for ClosureWork { self.work } +impl Field for Work {} + +/// SAFETY: Per the safety requirement of `HasField`, `raw_get_field()` and `field_container_of()` +/// return valid pointers and are true inverses of each other, hence the implementation below +/// fulfills `HasWork`'s safety requirement as well. +unsafe impl>, const ID: u64> HasWork for T { + #[inline] + unsafe fn raw_get_work(ptr: *mut Self) -> *mut Work { + // SAFETY: Per the function safety requirement, `ptr` is a valid pointer. + unsafe { >>::raw_get_field(ptr) } + } + + #[inline] + unsafe fn work_container_of(ptr: *mut Work) -> *mut Self { + // SAFETY: Per the function safety requirement, `ptr` is a valid pointer, and it points to + // a work field in struct `T`. + unsafe { >>::field_container_of(ptr) } + } } /// Links for a delayed work item. -- 2.50.1 (Apple Git-155)