Received-SPF: pass (google.com: domain of linux-kernel+bounces-186475-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) client-ip=2604:1380:45d1:ec00::1;
From: Roland Xu <mu001999@outlook.com>
To: gregkh@linuxfoundation.org
Cc: ojeda@kernel.org,
	boqun.feng@gmail.com,
	rust-for-linux@vger.kernel.org,
	linux-kernel@vger.kernel.org,
	Roland Xu <mu001999@outlook.com>
Subject: [PATCH v3] rust: kernel: make impl_has_work compatible with more generics
Date: Thu, 23 May 2024 00:08:46 +0800
Message-ID:
 <ME0P282MB4890A180B99490CC65EF64FDCCEB2@ME0P282MB4890.AUSP282.PROD.OUTLOOK.COM>
In-Reply-To: <2024052258-trifocals-engaged-8d80@gregkh>
References: <2024052258-trifocals-engaged-8d80@gregkh>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
Precedence: bulk
MIME-Version: 1.0
X-MS-Exchange-MessageSentRepresentingType: 1
X-MS-PublicTrafficType: Email
X-MS-TrafficTypeDiagnostic: ME0P282MB4890:EE_|ME0P282MB4953:EE_
X-MS-Office365-Filtering-Correlation-Id: 49e2df24-60ee-4dfa-90c3-08dc7a797cbd
X-Microsoft-Antispam: BCL:0;
X-Microsoft-Antispam-Message-Info:
	mWtSJ3EJ9nw5nwFx/Kj3prgj0OrltqNnlLDzuisIkp9ina0R7Bhb0fP63rKrYs/3fhgPbTxJGLtCI1uINoTCWnpQ0o9B2Lf00s5HFvbmBWAZ7N98ptDM+Ip/K06Mjq/hRRgXOdOS7FBam9t61G2cup0FCfBmudcL34CgcNO11Y6xXcqlJSrPKPOkwHmwdX7dv9WP7y41CDlFLNumtDNsBVkMKIN3D2VGdjy4X7mx9H8ntmciozYP8euKwPunAXzXtVihwx8YIhN14JKnFGEhiysnBcAbUfO4sM6syCDTLG64tdQ/EO4MeT7QqvBJIZbVyq4AZDYxgxKU0msF9tJDDAHivd3jXODGbNAkwS/5jH6w1+GOpMLN1Krmxd77WQhACDJwJ8RofupnVI1wLOemu5kkhLwtiNtEKMFaf/1RUJpTjvklGY20ET8ELwgXnhvkIcQC0cL1Zjhxtndw0xCmVWEYc9CzLy/MxcBOIaJC5JjM/5mBIxpBBCM0NLNOYJxLRfXDVG0xABY3fV5N90QHMxZyhHRlWcjI4ZW+z6MPgpRcyIogoxIb+/c2CoHB0qnNhiAK8cZNW2/AOtHwgFjlmf72UxHJjkhTcjp6Liz4w2o=
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0:
	=?us-ascii?Q?orxWL2cIxSqrhwNItweEutGA3BTvPQQb8lGhf7GYNuLb5R5F1CPpfN9i6Ach?=
 =?us-ascii?Q?mU/48/TYU3r+4tF5aC0GunB1XT2m1qHYHVCcll+QQjcXCsbWjiLz6RntyUNe?=
 =?us-ascii?Q?XRdmi3L7JieVubnqhNazG8B+K2fgoAU23FxraKlhAjzlytlRqo+Dui1JIc1S?=
 =?us-ascii?Q?W7mSzUx3xEdbUAR8ptcarJQ80/B4kY9DOkzypz3x3mZn4+GmQgXHohDmfmyi?=
 =?us-ascii?Q?2ZEf06DwBh7rQdlQ6bbkG1wUtVvNVfw05kH74PIDsSzkJ/RkYJ6ZaJb9ssFk?=
 =?us-ascii?Q?o4aWcQacDZSsanUKJ3B2MMrS+4xHxmKSq5FfuBq5LPGle46NIhnQuTTDtKd7?=
 =?us-ascii?Q?GPLYfZLoPZEN936YO/C9b9PHvbsQCgU8YxGIG0PPax2CAkaToI0W7fffVENi?=
 =?us-ascii?Q?CK85ybNlv5YUd6u70uezvIYF874xkwyFc2c1rXTHn4FKzKAscRknP3CyJxC+?=
 =?us-ascii?Q?d3+FcOFuqPY+XFgNiqr4urXUPzs5F5obzM93J2LuA+rJXqGBO0zCw7UAqB3i?=
 =?us-ascii?Q?7v5/EqhMDcieV0DJyfx2UTxU/sijduBrYYj22YVYAIOeBpNz3gKet7hNq9Ok?=
 =?us-ascii?Q?VMzrzDcP8MlV7LURqOA2mVWJDqHCVZ25+ztyb5L7Vju1UGOQaP1WlEcr4i+J?=
 =?us-ascii?Q?/7s7lB73WBnJu+Um4hoPLTfblIIXU0Tpdvuq6u4Wnb5EtCqxLA0cBdmM9Kjg?=
 =?us-ascii?Q?4fxE12GHkztoE21+PG+YRuGJSCbycPjmcNgNR85DQF6i3meRFKSf/jNxMQnM?=
 =?us-ascii?Q?A8nUJvVi2PdK+5Bs5YN2I4gcotE6codJ+g3d9hMS6pNBY674u2COB9/D4Wee?=
 =?us-ascii?Q?2Sh7NyyW5QBWA3IbpNZwQfLm6gwukfTNsTBYuRGoVpHMb1Hh5QSO/Qcek+ve?=
 =?us-ascii?Q?EY+zuzDR3BvtKHPHYzjxfv/awA9tcIXVpKYr22MGFp7WHsfjT+ENiW2xkQas?=
 =?us-ascii?Q?DfcBu6do/Fl1jHP/veFm/Mtkp0myhyjj1CrAOxPND9j0EZYGLPVbqFqV2K0Z?=
 =?us-ascii?Q?xa3MbWYxWh4LKHaYj5jN6EIPGxdnna8UdO9xvNn74jGwJ+zHCm9gHv+zlo7f?=
 =?us-ascii?Q?oQn7iCflYgjn4vIv8dZuXw9u3RDeTnCJT+qs8OkpxLBCdpUgfBg06yn6jPTY?=
 =?us-ascii?Q?xrY04hZYGRGNizB4Ej+cf7s8yA2o0qPvzSsd2BAR43WGFPNOrRWuZV72DqLR?=
 =?us-ascii?Q?Z3H6LGHVkAqZgrcEEAUjBxqfX3Tzh3Z+JzBydAiRMSYv2gC9Lxx4jqQlzM0?=
 =?us-ascii?Q?=3D?=
X-OriginatorOrg: outlook.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 49e2df24-60ee-4dfa-90c3-08dc7a797cbd
X-MS-Exchange-CrossTenant-AuthSource: ME0P282MB4890.AUSP282.PROD.OUTLOOK.COM
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 May 2024 16:08:58.5026
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa
X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg:
	00000000-0000-0000-0000-000000000000
X-MS-Exchange-Transport-CrossTenantHeadersStamped: ME0P282MB4953

Make the impl_has_work macro compatible
with more complex generics such as
lifetimes and const generic arguments.

Signed-off-by: Roland Xu <mu001999@outlook.com>
---
 rust/kernel/workqueue.rs | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/rust/kernel/workqueue.rs b/rust/kernel/workqueue.rs
index 1cec63a2a..553a5cba2 100644
--- a/rust/kernel/workqueue.rs
+++ b/rust/kernel/workqueue.rs
@@ -482,24 +482,26 @@ unsafe fn work_container_of(ptr: *mut Work<T, ID>) -> *mut Self
 /// use kernel::sync::Arc;
 /// use kernel::workqueue::{self, impl_has_work, Work};
 ///
-/// struct MyStruct {
-///     work_field: Work<MyStruct, 17>,
+/// struct MyStruct<'a, T, const N: usize> {
+///     work_field: Work<MyStruct<'a, T, N>, 17>,
+///     f: fn(&'a [T; N]),
 /// }
 ///
 /// impl_has_work! {
-///     impl HasWork<MyStruct, 17> for MyStruct { self.work_field }
+///     impl{'a, T, const N: usize} HasWork<MyStruct<'a, T, N>, 17>
+///     for MyStruct<'a, T, N> { self.work_field }
 /// }
 /// ```
 #[macro_export]
 macro_rules! impl_has_work {
-    ($(impl$(<$($implarg:ident),*>)?
+    ($(impl$({$($generics:tt)*})?
        HasWork<$work_type:ty $(, $id:tt)?>
-       for $self:ident $(<$($selfarg:ident),*>)?
+       for $self:ty
        { self.$field:ident }
     )*) => {$(
         // SAFETY: The implementation of `raw_get_work` only compiles if the field has the right
         // type.
-        unsafe impl$(<$($implarg),*>)? $crate::workqueue::HasWork<$work_type $(, $id)?> for $self $(<$($selfarg),*>)? {
+        unsafe impl$(<$($generics)+>)? $crate::workqueue::HasWork<$work_type $(, $id)?> for $self {
             const OFFSET: usize = ::core::mem::offset_of!(Self, $field) as usize;
 
             #[inline]
@@ -515,7 +517,7 @@ unsafe fn raw_get_work(ptr: *mut Self) -> *mut $crate::workqueue::Work<$work_typ
 pub use impl_has_work;
 
 impl_has_work! {
-    impl<T> HasWork<Self> for ClosureWork<T> { self.work }
+    impl{T} HasWork<Self> for ClosureWork<T> { self.work }
 }
 
 unsafe impl<T, const ID: u64> WorkItemPointer<ID> for Arc<T>
-- 
2.45.0