| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <ec0cb997-099a-475a-9a7e-d3a1cb82b973@kernel.org>
Date: Tue, 4 Nov 2025 09:48:35 +0100
From: Daniel Gomez <da.gomez@...nel.org>
To: Stephen Rothwell <sfr@...b.auug.org.au>,
Uwe Kleine-König <ukleinek@...nel.org>,
Luis Chamberlain <mcgrof@...nel.org>, Daniel Gomez <da.gomez@...sung.com>,
Sami Tolvanen <samitolvanen@...gle.com>, Petr Pavlu <petr.pavlu@...e.com>
Cc: Andreas Hindborg <a.hindborg@...nel.org>,
Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
Linux Next Mailing List <linux-next@...r.kernel.org>,
Michal Wilczynski <m.wilczynski@...sung.com>
Subject: Re: linux-next: manual merge of the pwm tree with the modules tree
On 04/11/2025 00.54, Stephen Rothwell wrote:
> Hi all,
>
> [adding the modules tree contacts]
>
> On Tue, 4 Nov 2025 10:48:27 +1100 Stephen Rothwell <sfr@...b.auug.org.au> wrote:
>>
>> Today's linux-next merge of the pwm tree got a conflict in:
>>
>> rust/macros/module.rs
>>
>> between commits:
>>
>> 3809d7a89fe5 ("rust: module: use a reference in macros::module::module")
>> 0b24f9740f26 ("rust: module: update the module macro with module parameter support")
>>
>> from the modules tree and commit:
>>
>> 927687809649 ("rust: macros: Add support for 'imports_ns' to module!")
>>
>> from the pwm tree.
>>
>> I followed a supplied resolution from Uwe and Danieli, thanks. Though I
>> am just wondering (fromfollowing the pattern) if the "&ns" on line 545
>> should be "ns" - though I guess it would fail to build if so?
We missed that non-trivial reference refactor. Sorry about it.
In this case, ns is already a reference so, your guess is correct. It should be:
@@ -348,6 +351,11 @@ pub(crate) fn module(ts: TokenStream) -> TokenStream {
modinfo.emit("firmware", fw);
}
}
+ if let Some(imports) = &info.imports_ns {
+ for ns in imports {
+ modinfo.emit("import_ns", ns);
+ }
+ }
This is when Andreas' patch is applied before Michal's. To be clear, here's what
I mean:
HEAD -> rust: macros: Add support for 'imports_ns' to module!
rust: module: use a reference in macros::module::module
>>
>> I fixed it up (see below) and can carry the fix as necessary. This
>> is now fixed as far as linux-next is concerned, but any non trivial
>> conflicts should be mentioned to your upstream maintainer when your tree
>> is submitted for merging. You may also want to consider cooperating
>> with the maintainer of the conflicting tree to minimise any particularly
>> complex conflicts.
>>
>> --
>> Cheers,
>> Stephen Rothwell
>>
>> diff --cc rust/macros/module.rs
>> index d62e9c1e2a89,408cd1154875..000000000000
>> --- a/rust/macros/module.rs
>> +++ b/rust/macros/module.rs
>> @@@ -205,50 -98,7 +205,51 @@@ struct ModuleInfo
>> description: Option<String>,
>> alias: Option<Vec<String>>,
>> firmware: Option<Vec<String>>,
>> + imports_ns: Option<Vec<String>>,
>> + params: Option<Vec<Parameter>>,
>> +}
>> +
>> +#[derive(Debug)]
>> +struct Parameter {
>> + name: String,
>> + ptype: String,
>> + default: String,
>> + description: String,
>> +}
>> +
>> +fn expect_params(it: &mut token_stream::IntoIter) -> Vec<Parameter> {
>> + let params = expect_group(it);
>> + assert_eq!(params.delimiter(), Delimiter::Brace);
>> + let mut it = params.stream().into_iter();
>> + let mut parsed = Vec::new();
>> +
>> + loop {
>> + let param_name = match it.next() {
>> + Some(TokenTree::Ident(ident)) => ident.to_string(),
>> + Some(_) => panic!("Expected Ident or end"),
>> + None => break,
>> + };
>> +
>> + assert_eq!(expect_punct(&mut it), ':');
>> + let param_type = expect_ident(&mut it);
>> + let group = expect_group(&mut it);
>> + assert_eq!(group.delimiter(), Delimiter::Brace);
>> + assert_eq!(expect_punct(&mut it), ',');
>> +
>> + let mut param_it = group.stream().into_iter();
>> + let param_default = expect_param_default(&mut param_it);
>> + let param_description = expect_string_field(&mut param_it, "description");
>> + expect_end(&mut param_it);
>> +
>> + parsed.push(Parameter {
>> + name: param_name,
>> + ptype: param_type,
>> + default: param_default,
>> + description: param_description,
>> + })
>> + }
>> +
>> + parsed
>> }
>>
>> impl ModuleInfo {
>> @@@ -263,7 -113,7 +264,8 @@@
>> "license",
>> "alias",
>> "firmware",
>> + "imports_ns",
>> + "params",
>> ];
>> const REQUIRED_KEYS: &[&str] = &["type", "name", "license"];
>> let mut seen_keys = Vec::new();
>> @@@ -289,7 -139,7 +291,8 @@@
>> "license" => info.license = expect_string_ascii(it),
>> "alias" => info.alias = Some(expect_string_array(it)),
>> "firmware" => info.firmware = Some(expect_string_array(it)),
>> + "imports_ns" => info.imports_ns = Some(expect_string_array(it)),
>> + "params" => info.params = Some(expect_params(it)),
>> _ => panic!("Unknown key \"{key}\". Valid keys are: {EXPECTED_KEYS:?}."),
>> }
>>
>> @@@ -329,25 -179,30 +332,30 @@@ pub(crate) fn module(ts: TokenStream) -
>> // Rust does not allow hyphens in identifiers, use underscore instead.
>> let ident = info.name.replace('-', "_");
>> let mut modinfo = ModInfoBuilder::new(ident.as_ref());
>> - if let Some(authors) = info.authors {
>> + if let Some(authors) = &info.authors {
>> for author in authors {
>> - modinfo.emit("author", &author);
>> + modinfo.emit("author", author);
>> }
>> }
>> - if let Some(description) = info.description {
>> - modinfo.emit("description", &description);
>> + if let Some(description) = &info.description {
>> + modinfo.emit("description", description);
>> }
>> modinfo.emit("license", &info.license);
>> - if let Some(aliases) = info.alias {
>> + if let Some(aliases) = &info.alias {
>> for alias in aliases {
>> - modinfo.emit("alias", &alias);
>> + modinfo.emit("alias", alias);
>> }
>> }
>> - if let Some(firmware) = info.firmware {
>> + if let Some(firmware) = &info.firmware {
>> for fw in firmware {
>> - modinfo.emit("firmware", &fw);
>> + modinfo.emit("firmware", fw);
>> }
>> }
>> - if let Some(imports) = info.imports_ns {
>> ++ if let Some(imports) = &info.imports_ns {
>> + for ns in imports {
>> + modinfo.emit("import_ns", &ns);
Please, drop the '&'
+ modinfo.emit("import_ns", ns);
>> + }
>> + }
>>
>> // Built-in modules also export the `file` modinfo string.
>> let file =
>
Powered by blists - more mailing lists