rust: jump_label: skip arch-specific asm in `testlib` builds
Subsystems (2)
PATCH 1/1 rust: jump_label: skip arch-specific asm in `testlib` builds
From: FUJITA Tomonori <[email protected]>
Running make rusttest with ARCH= set to an architecture other than the host's fails, e.g. ARCH=arm64 on an x86_64 host:
error: alignment must be a power of 2
--> rust/kernel/jump_label.rs:51:13
|
51 | include!(concat!(env!("OBJTREE"), "/rust/kernel/generated_arch_static_branch_asm.rs"));
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
note: instantiated into assembly here
--> <inline asm>:3:10
|
3 | .align 3
| ^The reason is that rusttest builds the kernel crate as a host
library: it passes the CONFIG_* cfgs of the configured architecture, but not --target, so code generation happens for the host. arch_static_branch! then selects the arch-specific inline asm arm based on CONFIG_*, and the host assembler rejects it.
This does not happen with the current master because arch_static_branch! has no user inside the kernel crate itself yet, but fix it now to avoid surprises later.
--- rust/kernel/jump_label.rs | 12 ++++++++++++ 1 file changed, 12 insertions(+)
rust/kernel/jump_label.rs +12 -0
@@ -44,6 +44,7 @@ macro_rules! static_branch_unlikely {#[macro_export] #[doc(hidden)] +#[cfg(not(testlib))] #[cfg( CONFIG_JUMP_LABEL )] macro_rules! arch_static_branch { ($key:path, $keytyp:ty, $field:ident, $branch:expr) => {'my_label: {
@@ -61,6 +62,17 @@ macro_rules! arch_static_branch { }}; } +#[macro_export] +#[doc(hidden)] +#[cfg(testlib)] +#[cfg( CONFIG_JUMP_LABEL )] +macro_rules! arch_static_branch { + ($key:path, $keytyp:ty, $field:ident, $branch:expr) => { +// The asm falls through until patched, which never happens on the host. +false + }; +} +#[cfg( CONFIG_JUMP_LABEL )] pub use arch_static_branch;
base-commit: dc01dfb37b34beeefcfe1c3055364d41a4070c7e
Signature · 1 line
2.43.0
Miguel Ojeda
AppliedQuoted 24 lines · FUJITA Tomonori
From: FUJITA Tomonori <[email protected]>
Running
make rusttestwithARCH=set to an architecture other than the host's fails, e.g.ARCH=arm64on anx86_64host:error: alignment must be a power of 2
-->rust/kernel/jump_label.rs:51:13| 51 | include!(concat!(env!("OBJTREE"), "/rust/kernel/generated_arch_static_branch_asm.rs")); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | note: instantiated into assembly here --> <inline asm>:3:10 | 3 | .align 3 | ^The reason is that
rusttestbuilds the kernel crate as a host
library: it passes theCONFIG_*cfgs of the configured architecture, but not--target, so code generation happens for the host.arch_static_branch!then selects the arch-specific inline asm arm based on CONFIG_*, and the host assembler rejects it.
Quoted 5 lines
This does not happen with the current master because
arch_static_branch!has no user inside the kernel crate itself yet, but fix it now to avoid surprises later.Signed-off-by FUJITA Tomonori <[email protected]>
Applied to rust-fixes -- thanks!
[ Reworded slightly to clarify it "may fail in the future". - Miguel ]
Cheers,
Miguel