From: Gary Guo <gary@garyguo.net>
To: "Benno Lossin" <lossin@kernel.org>,
"Miguel Ojeda" <ojeda@kernel.org>,
"Boqun Feng" <boqun@kernel.org>,
"Björn Roy Baron" <bjorn3_gh@protonmail.com>,
"Andreas Hindborg" <a.hindborg@kernel.org>,
"Alice Ryhl" <aliceryhl@google.com>,
"Trevor Gross" <tmgross@umich.edu>,
"Danilo Krummrich" <dakr@kernel.org>,
"Daniel Almeida" <daniel.almeida@collabora.com>,
"Tamir Duberstein" <tamird@kernel.org>,
"Alexandre Courbot" <acourbot@nvidia.com>,
"Onur Özkan" <work@onurozkan.dev>
Cc: linux-kernel@vger.kernel.org, rust-for-linux@vger.kernel.org,
Gary Guo <gary@garyguo.net>
Subject: [PATCH 02/20] rust: pin-init: internal: pin_data: infer self-referential struct
Date: Thu, 08 Oct 2026 14:23:49 +0200 [thread overview]
Message-ID: <20261008-dev-selfref-v1-2-6c1eb269fe57@garyguo.net> (raw)
In-Reply-To: <20261008-dev-selfref-v1-0-6c1eb269fe57@garyguo.net>
As a first step towards adding self-referential data structures in
pin-init, add parsing support.
Scan all field types for unbounded lifetimes, and if the names that of
fields, it is inferred as a self-referential field lifetime. No explicit
annotations are supported yet.
Signed-off-by: Gary Guo <gary@garyguo.net>
---
rust/pin-init/internal/src/pin_data.rs | 162 ++++++++++++++++++++++++++++++++-
rust/pin-init/internal/src/util.rs | 94 ++++++++++++++++++-
2 files changed, 253 insertions(+), 3 deletions(-)
diff --git a/rust/pin-init/internal/src/pin_data.rs b/rust/pin-init/internal/src/pin_data.rs
index 03e893cf5475..cf6142cd656d 100644
--- a/rust/pin-init/internal/src/pin_data.rs
+++ b/rust/pin-init/internal/src/pin_data.rs
@@ -1,5 +1,7 @@
// SPDX-License-Identifier: Apache-2.0 OR MIT
+use std::collections::{BTreeMap, BTreeSet};
+
use proc_macro2::TokenStream;
use quote::{format_ident, quote, ToTokens};
use syn::{
@@ -7,8 +9,10 @@
parse_quote, parse_quote_spanned,
punctuated::Punctuated,
spanned::Spanned,
+ visit::Visit,
visit_mut::VisitMut,
- Field, Fields, Generics, Index, Item, ItemStruct, Member, PathSegment, Type, TypePath,
+ Field, Fields, Generics, Ident, Index, Item, ItemStruct, Lifetime, Member, PathSegment, Type,
+ TypePath,
};
use crate::{
@@ -48,10 +52,69 @@ fn to_tokens(&self, tokens: &mut TokenStream) {
}
}
+/// Description of how a field is borrowed.
+#[derive(Clone, Copy, Default, PartialEq, Eq)]
+enum BorrowedKind {
+ /// Implicitly inferreed.
+ #[default]
+ Shared,
+}
+
+/// Information about a borrowed field.
+#[expect(unused)]
+struct BorrowedInfo {
+ kind: BorrowedKind,
+ /// Field lifetime for this field.
+ lifetime: Lifetime,
+}
+
+#[derive(Clone, Copy, Default, PartialEq, Eq)]
+enum Variance {
+ /// Implicitly inferred variance.
+ #[default]
+ Covariant,
+}
+
+/// Information about field lifetimes captured in a type.
+#[expect(unused)]
+struct Capture {
+ variance: Variance,
+ /// Lifetime to be captured.
+ lifetime: Lifetime,
+}
+
+impl std::borrow::Borrow<Lifetime> for Capture {
+ fn borrow(&self) -> &Lifetime {
+ &self.lifetime
+ }
+}
+
+impl PartialEq for Capture {
+ fn eq(&self, other: &Self) -> bool {
+ self.lifetime == other.lifetime
+ }
+}
+
+impl Eq for Capture {}
+
+impl PartialOrd for Capture {
+ fn partial_cmp(&self, other: &Self) -> Option<std::cmp::Ordering> {
+ Some(self.cmp(other))
+ }
+}
+
+impl Ord for Capture {
+ fn cmp(&self, other: &Self) -> std::cmp::Ordering {
+ self.lifetime.cmp(&other.lifetime)
+ }
+}
+
struct FieldInfo {
field: Field,
member: Member,
pinned: bool,
+ borrowed: Option<BorrowedInfo>,
+ captures: BTreeSet<Capture>,
}
struct StructInfo {
@@ -59,6 +122,7 @@ struct StructInfo {
struct_: ItemStruct,
fields: Vec<FieldInfo>,
is_tuple_struct: bool,
+ self_referential: bool,
}
pub(crate) fn expand_with_cfg(
@@ -147,7 +211,22 @@ fn expand(
replacer.visit_fields_mut(&mut struct_.fields);
let is_tuple_struct = matches!(struct_.fields, Fields::Unnamed(_));
- let fields: Vec<FieldInfo> = struct_
+
+ // Collect all bound lifetimes from generics.
+ let bound_lifetimes: BTreeSet<&Lifetime> =
+ struct_.generics.lifetimes().map(|x| &x.lifetime).collect();
+ // Collect all fields.
+ let field_idx_map: BTreeMap<Ident, usize> = struct_
+ .fields
+ .iter()
+ .enumerate()
+ .filter_map(|(index, field)| Some((field.ident.clone()?, index)))
+ .collect();
+
+ // Keep track on fields being implicitly borrowed by being mentioned.
+ let mut implicitly_borrowed = BTreeSet::new();
+
+ let mut fields: Vec<FieldInfo> = struct_
.fields
.into_iter()
.enumerate()
@@ -166,16 +245,88 @@ fn expand(
}),
};
+ let mut captures = BTreeSet::new();
+ let wildcard_variance = Variance::default();
+
+ // Infer lifetime based on the field referenced.
+ // Bound lifetimes from struct generics take priority.
+ //
+ // For example,
+ // ```
+ // struct Foo<'a> {
+ // bar: &'a (),
+ // a: u32,
+ // }
+ // ```
+ // would not be inferred as self-referential because `'a` is already bound by the
+ // struct generics.
+ Lifetime::visitor(|lt| {
+ if bound_lifetimes.contains(lt) || captures.contains(lt) {
+ return;
+ }
+
+ if !field_idx_map.contains_key(<.ident) {
+ dcx.error(
+ lt,
+ format!("`{lt}` is neither a lifetime in generics nor a field name"),
+ );
+ return;
+ }
+
+ captures.insert(Capture {
+ variance: wildcard_variance,
+ lifetime: lt.clone(),
+ });
+ })
+ .visit_type(&field.ty);
+
+ for capture in captures.iter() {
+ implicitly_borrowed.insert(capture.lifetime.ident.clone());
+ }
+
FieldInfo {
field,
member,
pinned,
+ borrowed: None,
+ captures,
}
})
.collect();
+ for field_name in implicitly_borrowed.into_iter() {
+ let field = &mut fields[field_idx_map[&field_name]];
+
+ // If field is not explicit marked as borrowed, infer a shared borrow.
+ if field.borrowed.is_none() {
+ field.borrowed = Some(BorrowedInfo {
+ kind: BorrowedKind::Shared,
+ // Obtaining from `field` instead of `field_name` for the correct span.
+ lifetime: Lifetime::from_ident(&field.member.as_ident()),
+ });
+ }
+ }
+
+ // Check that field lifetimes do not appear in the bounds.
+ Lifetime::visitor(|lt| {
+ if bound_lifetimes.contains(<) {
+ return;
+ }
+
+ if field_idx_map.contains_key(<.ident) {
+ // Forbid the use of field lifetimes within bounds.
+ dcx.error(lt, "field lifetimes cannot be used in bounds");
+ }
+
+ // Otherwise this is completely unbound. Let Rust compiler produce that error instead.
+ })
+ .visit_generics(&struct_.generics);
+
struct_.fields = Fields::Unit;
let info = StructInfo {
+ self_referential: fields
+ .iter()
+ .any(|f| !f.captures.is_empty() || f.borrowed.is_some()),
args,
struct_,
fields,
@@ -195,6 +346,13 @@ fn expand(
}
}
+ if info.self_referential {
+ dcx.error(
+ &info.struct_.ident,
+ "self-referential support is not fully implemented",
+ );
+ }
+
let struct_def = generate_struct_def(&info);
let unpin_impl = generate_unpin_impl(&info);
let drop_impl = generate_drop_impl(&info);
diff --git a/rust/pin-init/internal/src/util.rs b/rust/pin-init/internal/src/util.rs
index 3ce498cea754..67ebb333710f 100644
--- a/rust/pin-init/internal/src/util.rs
+++ b/rust/pin-init/internal/src/util.rs
@@ -1,8 +1,12 @@
// SPDX-License-Identifier: Apache-2.0 OR MIT
+use std::collections::BTreeSet;
+
use proc_macro2::{Ident, TokenStream};
use quote::{format_ident, ToTokens};
-use syn::{Attribute, GenericParam, Generics, Index, Member, Token};
+use syn::{
+ visit::Visit, Attribute, BoundLifetimes, GenericParam, Generics, Index, Lifetime, Member, Token,
+};
use crate::DiagCtxt;
@@ -237,3 +241,91 @@ fn to_tokens(&self, tokens: &mut TokenStream) {
.to_tokens(tokens);
}
}
+
+pub(crate) trait LifetimeExt {
+ /// Get a visitor that call the provided function for all unbound lifetimes.
+ fn visitor<'a>(f: impl FnMut(&'a Lifetime)) -> impl Visit<'a>;
+
+ /// Obtain a lifetime from a identifier.
+ ///
+ /// The created lifetime has the same span.
+ fn from_ident(ident: &Ident) -> Self;
+}
+
+impl LifetimeExt for Lifetime {
+ fn visitor<'a>(f: impl FnMut(&'a Lifetime)) -> impl Visit<'a> {
+ LifetimeVisitor {
+ bound: BTreeSet::new(),
+ visit: f,
+ }
+ }
+
+ fn from_ident(ident: &Ident) -> Self {
+ Lifetime {
+ apostrophe: ident.span(),
+ ident: ident.clone(),
+ }
+ }
+}
+
+struct LifetimeVisitor<'a, F> {
+ bound: BTreeSet<&'a Lifetime>,
+ visit: F,
+}
+
+impl<'a, F> LifetimeVisitor<'a, F> {
+ fn with_bound_lifetimes(
+ &mut self,
+ bound: Option<&'a BoundLifetimes>,
+ f: impl FnOnce(&mut Self),
+ ) {
+ // In case the type includes a lifetime binder, e.g. `dyn for<'a> Foo`,
+ // the lifetimes in the binder are bound and should not be visited.
+
+ let mut to_remove = Vec::new();
+ if let Some(bound) = bound {
+ for lt in &bound.lifetimes {
+ let GenericParam::Lifetime(lt) = lt else {
+ continue;
+ };
+ if !self.bound.contains(&<.lifetime) {
+ self.bound.insert(<.lifetime);
+ to_remove.push(<.lifetime);
+ }
+ }
+ }
+
+ f(self);
+
+ for lt in to_remove {
+ self.bound.remove(lt);
+ }
+ }
+}
+
+impl<'a, F: FnMut(&'a Lifetime)> Visit<'a> for LifetimeVisitor<'a, F> {
+ fn visit_lifetime(&mut self, lt: &'a Lifetime) {
+ if lt.ident == "static" {
+ return;
+ }
+
+ if !self.bound.contains(lt) {
+ (self.visit)(lt);
+ }
+ }
+
+ fn visit_trait_bound(&mut self, bound: &'a syn::TraitBound) {
+ self.with_bound_lifetimes(bound.lifetimes.as_ref(), |this| {
+ this.visit_path(&bound.path)
+ });
+ }
+
+ fn visit_type_bare_fn(&mut self, bare_fn: &'a syn::TypeBareFn) {
+ self.with_bound_lifetimes(bare_fn.lifetimes.as_ref(), |this| {
+ for input in bare_fn.inputs.iter() {
+ this.visit_bare_fn_arg(input);
+ }
+ this.visit_return_type(&bare_fn.output);
+ });
+ }
+}
--
2.54.0
next prev parent reply other threads:[~2026-10-08 12:24 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-10-08 12:23 [PATCH 00/20] rust: pin-init: create self references safely Gary Guo
2026-10-08 12:23 ` [PATCH 01/20] kbuild: rust: allow `clippy::comparison_chain` globally Gary Guo
2026-10-08 12:23 ` Gary Guo [this message]
2026-10-08 12:23 ` [PATCH 03/20] rust: pin-init: internal: pin_data: rewrite fields that borrow others Gary Guo
2026-10-08 12:23 ` [PATCH 04/20] rust: pin-init: internal: pin_data: pin borrowed fields with wrapper Gary Guo
2026-10-08 12:23 ` [PATCH 05/20] rust: pin-init: internal: pin_data: teach drop check about generics that cannot dangle Gary Guo
2026-10-08 12:23 ` [PATCH 06/20] rust: pin-init: internal: pin_data: self-referential drop order checks Gary Guo
2026-10-08 12:23 ` [PATCH 07/20] rust: pin-init: internal: pin_data: check covariance of self-referential fields Gary Guo
2026-10-08 12:23 ` [PATCH 08/20] rust: pin-init: internal: pin_data: implement initialization of borrowed structs Gary Guo
2026-10-08 12:23 ` [PATCH 09/20] rust: pin-init: internal: pin_data: project self-referential fields Gary Guo
2026-10-08 12:23 ` [PATCH 10/20] rust: pin-init: internal: pin_data: add `with_project` method Gary Guo
2026-10-08 12:23 ` [PATCH 11/20] rust: pin-init: internal: pin_data: enable self-referential support Gary Guo
2026-10-08 12:23 ` [PATCH 12/20] rust: pin-init: internal: pin_data: allow lifetime to be shortened per field drop order Gary Guo
2026-10-08 12:24 ` [PATCH 13/20] rust: pin-init: internal: pin_data: parse explicit `#[borrowed]` annotation Gary Guo
2026-10-08 12:24 ` [PATCH 14/20] rust: pin-init: internal: pin_data: support mutable borrows Gary Guo
2026-10-08 12:24 ` [PATCH 15/20] rust: pin-init: internal: pin_data: parse explicit `#[uses]` annotation Gary Guo
2026-10-08 12:24 ` [PATCH 16/20] rust: pin-init: internal: pin_data: make field lifetime invariance imply type invariance Gary Guo
2026-10-08 12:24 ` [PATCH 17/20] rust: pin-init: internal: pin_data: complete invariant borrow support Gary Guo
2026-10-08 12:24 ` [PATCH 18/20] rust: pin-init: internal: pin_data: perform AST lifetime replacement if possible Gary Guo
2026-10-08 12:24 ` [PATCH 19/20] rust: pin-init: internal: pin_data: support shared projection Gary Guo
2026-10-08 12:24 ` [PATCH 20/20] rust: pin-init: internal: pin_data: support existential lifetimes Gary Guo
2026-10-08 16:20 ` [PATCH 00/20] rust: pin-init: create self references safely Benno Lossin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20261008-dev-selfref-v1-2-6c1eb269fe57@garyguo.net \
--to=gary@garyguo.net \
--cc=a.hindborg@kernel.org \
--cc=acourbot@nvidia.com \
--cc=aliceryhl@google.com \
--cc=bjorn3_gh@protonmail.com \
--cc=boqun@kernel.org \
--cc=dakr@kernel.org \
--cc=daniel.almeida@collabora.com \
--cc=linux-kernel@vger.kernel.org \
--cc=lossin@kernel.org \
--cc=ojeda@kernel.org \
--cc=rust-for-linux@vger.kernel.org \
--cc=tamird@kernel.org \
--cc=tmgross@umich.edu \
--cc=work@onurozkan.dev \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®