Currently all Rust modules using the module! macro are placed at
initcall level 6 (device_initcall). Some modules need to initialize
earlier in the boot sequence to provide services that other subsystems
depend on.
Add an InitCallLevel enum representing all eight standard initcall
levels (pure through late) and map each to its corresponding
.initcallN.init ELF section.
Expose this as an optional `initcall` field in the module! macro.
When omitted, the default remains level 6 (device) so existing
modules are unaffected. Example usage:
module! {
...
initcall: subsys,
}
This only affects built-in modules; loadable modules always enter
through init_module() regardless of the declared level.
Signed-off-by: Matthew Wood <[email protected]>
---
rust/macros/lib.rs | 4 ++++
rust/macros/module.rs | 56 ++++++++++++++++++++++++++++++++++++++++++-
2 files changed, 59 insertions(+), 1 deletion(-)
diff --git a/rust/macros/lib.rs b/rust/macros/lib.rs
index 83dcc89a425a..cfde59e81cdd 100644
--- a/rust/macros/lib.rs
+++ b/rust/macros/lib.rs
@@ -135,6 +135,10 @@
/// - `alias`: array of ASCII string literals of the alias names of the
kernel module.
/// - `firmware`: array of ASCII string literals of the firmware files of
/// the kernel module.
+/// - `initcall`: initcall level for built-in modules. Valid values are:
+/// `pure` (0), `core` (1), `postcore` (2), `arch` (3), `subsys` (4),
+/// `fs` (5), `device` (6, the default), and `late` (7).
+/// This only affects built-in modules; loadable modules always use
`init_module()`.
#[proc_macro]
pub fn module(input: TokenStream) -> TokenStream {
module::module(parse_macro_input!(input))
diff --git a/rust/macros/module.rs b/rust/macros/module.rs
index 4d2e144fa6de..1e210fee4506 100644
--- a/rust/macros/module.rs
+++ b/rust/macros/module.rs
@@ -436,6 +436,53 @@ macro_rules! parse_ordered_fields {
}
}
+#[derive(Clone, Copy, Debug, PartialEq, Eq)]
+enum InitCallLevel {
+ Pure,
+ Core,
+ PostCore,
+ Arch,
+ Subsys,
+ Fs,
+ Device,
+ Late,
+}
+
+impl InitCallLevel {
+ fn section(&self) -> &'static str {
+ match self {
+ Self::Pure => ".initcall0.init",
+ Self::Core => ".initcall1.init",
+ Self::PostCore => ".initcall2.init",
+ Self::Arch => ".initcall3.init",
+ Self::Subsys => ".initcall4.init",
+ Self::Fs => ".initcall5.init",
+ Self::Device => ".initcall6.init",
+ Self::Late => ".initcall7.init",
+ }
+ }
+}
+
+impl Parse for InitCallLevel {
+ fn parse(input: ParseStream<'_>) -> Result<Self> {
+ let ident: Ident = input.call(Ident::parse_any)?;
+ match ident.to_string().as_str() {
+ "pure" => Ok(Self::Pure),
+ "core" => Ok(Self::Core),
+ "postcore" => Ok(Self::PostCore),
+ "arch" => Ok(Self::Arch),
+ "subsys" => Ok(Self::Subsys),
+ "fs" => Ok(Self::Fs),
+ "device" => Ok(Self::Device),
+ "late" => Ok(Self::Late),
+ _ => Err(Error::new_spanned(
+ ident,
+ "invalid initcall level. Valid values are: pure, core,
postcore, arch, subsys, fs, device, late",
+ )),
+ }
+ }
+}
+
struct Parameter {
name: Ident,
ptype: Type,
@@ -480,6 +527,7 @@ pub(crate) struct ModuleInfo {
firmware: Option<Punctuated<AsciiLitStr, Token![,]>>,
imports_ns: Option<Punctuated<AsciiLitStr, Token![,]>>,
params: Option<Punctuated<Parameter, Token![,]>>,
+ initcall: Option<InitCallLevel>,
}
impl Parse for ModuleInfo {
@@ -515,6 +563,7 @@ fn parse(input: ParseStream<'_>) -> Result<Self> {
braced!(list in input);
Punctuated::parse_terminated(&list)?
},
+ initcall => input.parse()?,
);
Ok(ModuleInfo {
@@ -527,6 +576,7 @@ fn parse(input: ParseStream<'_>) -> Result<Self> {
firmware,
imports_ns,
params,
+ initcall,
})
}
}
@@ -542,6 +592,7 @@ pub(crate) fn module(info: ModuleInfo) ->
Result<TokenStream> {
firmware,
imports_ns,
params: _,
+ initcall,
} = &info;
// Rust does not allow hyphens in identifiers, use underscore instead.
@@ -587,7 +638,10 @@ pub(crate) fn module(info: ModuleInfo) ->
Result<TokenStream> {
let ident_init = format_ident!("__{ident}_init");
let ident_exit = format_ident!("__{ident}_exit");
let ident_initcall = format_ident!("__{ident}_initcall");
- let initcall_section = ".initcall6.init";
+ let initcall_section = initcall
+ .as_ref()
+ .unwrap_or(&InitCallLevel::Device)
+ .section();
let global_asm = format!(
r#".section "{initcall_section}", "a"
--
2.52.0
