arm: rust: Enable Rust support for ARMv7
Subsystems (3)
PATCH v2 1/1 arm: rust: Enable Rust support for ARMv7
This commit allows building ARMv7 kernels with Rust support.
The rust core library expects some __eabi_... functions that are not implemented in the kernel.
Those functions are some float operations and __aeabi_uldivmod. For now those are implemented with define_panicking_intrinsics!.
This is based on the code by Sven Van Asbroeck from the original rust branch and inspired by the AArch64 version by Jamie Cunliffe.
I have tested the rust samples and a custom simple MMIO module on hardware (De1SoC FPGA + Arm A9 CPU).
This only includes support for ARMv7, but supporting other sub-architectures in the future should be as simple as setting the correct rustc target.
---
Changes since V1 [1]:
- Removed unrelated whitespace change.
- Added target name to panic message in scripts/generate_rust_target.rs.
- Fixed the comment in rust/bindgen_parameters.
[1]: https://lore.kernel.org/rust-for-linux/[email protected]
--
Documentation/rust/arch-support.rst | 1 + arch/arm/Kconfig | 1 + arch/arm/Makefile | 1 + rust/Makefile | 8 ++++++++ rust/bindgen_parameters | 4 ++++ rust/compiler_builtins.rs | 24 ++++++++++++++++++++++++ scripts/generate_rust_target.rs | 4 +++- 7 files changed, 42 insertions(+), 1 deletion(-)
Documentation/rust/arch-support.rst +1 -0
@@ -15,6 +15,7 @@ support corresponds to ``S`` values in the ``MAINTAINERS`` file. ============= ================ ============================================== Architecture Level of support Constraints ============= ================ ============================================== +``arm`` Maintained ARMv7 Little Endian only. ``arm64`` Maintained Little Endian only. ``loongarch`` Maintained \- ``riscv`` Maintained ``riscv64`` only.
arch/arm/Kconfig +1 -0
@@ -126,6 +126,7 @@ config ARM select MMU_GATHER_RCU_TABLE_FREE if SMP && ARM_LPAE select HAVE_REGS_AND_STACK_ACCESS_API select HAVE_RSEQ + select HAVE_RUST if CPU_LITTLE_ENDIAN && CPU_32v7 select HAVE_STACKPROTECTOR select HAVE_SYSCALL_TRACEPOINTS select HAVE_UID16
arch/arm/Makefile +1 -0
@@ -150,6 +150,7 @@ endif KBUILD_CPPFLAGS +=$(cpp-y) KBUILD_CFLAGS +=$(CFLAGS_ABI) $(CFLAGS_ISA) $(arch-y) $(tune-y) $(call cc-option,-mshort-load-bytes,$(call cc-option,-malignment-traps,)) -msoft-float -Uarm KBUILD_AFLAGS +=$(CFLAGS_ABI) $(AFLAGS_ISA) -Wa,$(arch-y) $(tune-y) -include asm/unified.h -msoft-float +KBUILD_RUSTFLAGS += --target=arm-unknown-linux-gnueabi CHECKFLAGS += -D__arm__
rust/Makefile +8 -0
@@ -287,6 +287,7 @@ bindgen_skip_c_flags := -mno-fp-ret-in-387 -mpreferred-stack-boundary=% \ # Derived from `scripts/Makefile.clang`. BINDGEN_TARGET_x86 := x86_64-linux-gnu BINDGEN_TARGET_arm64 := aarch64-linux-gnu +BINDGEN_TARGET_arm := arm-linux-gnueabi BINDGEN_TARGET := $(BINDGEN_TARGET_$(SRCARCH)) # All warnings are inhibited since GCC builds are very experimental,
@@ -413,6 +414,13 @@ redirect-intrinsics = \ __muloti4 __multi3 \ __udivmodti4 __udivti3 __umodti3 +ifdef CONFIG_ARM + # Add eabi initrinsics for ARM 32-bit + redirect-intrinsics += \ + __aeabi_fadd __aeabi_fmul __aeabi_fcmpeq __aeabi_fcmple __aeabi_fcmplt __aeabi_fcmpun \ + __aeabi_dadd __aeabi_dmul __aeabi_dcmple __aeabi_dcmplt __aeabi_dcmpun \ + __aeabi_uldivmod +endif ifneq ($(or $(CONFIG_ARM64),$(and $(CONFIG_RISCV),$(CONFIG_64BIT))),) # These intrinsics are defined for ARM64 and RISCV64 redirect-intrinsics += \
rust/bindgen_parameters +4 -0
@@ -24,3 +24,7 @@ # These functions use the `__preserve_most` calling convention, which neither bindgen # nor Rust currently understand, and which Clang currently declares to be unstable. --blocklist-function __list_.*_report + +# Depending on how the architecture defines `ARCH_SLAB_MINALIGN`, `bindgen` might generate a binding. +# Disable this here as there is a `const` item that will always be generated in `bindings_helper.h` +--blocklist-item ARCH_SLAB_MINALIGN
rust/compiler_builtins.rs +24 -0
@@ -70,5 +70,29 @@ pub extern "C" fn $ident() { __umodti3, }); +#[cfg(target_arch = "arm" )] +define_panicking_intrinsics! ("`f32` should not be used" , { + __aeabi_fadd, + __aeabi_fmul, + __aeabi_fcmpeq, + __aeabi_fcmple, + __aeabi_fcmplt, + __aeabi_fcmpun, +}); + +#[cfg(target_arch = "arm" )] +define_panicking_intrinsics! ("`f64` should not be used" , { + __aeabi_dadd, + __aeabi_dmul, + __aeabi_dcmple, + __aeabi_dcmplt, + __aeabi_dcmpun, +}); + +#[cfg(target_arch = "arm" )] +define_panicking_intrinsics! ("`u64` division/modulo should not be used" , { + __aeabi_uldivmod, +}); +// NOTE: if you are adding a new intrinsic here, you should also add it to // `redirect-intrinsics` in `rust/Makefile`.
scripts/generate_rust_target.rs +3 -1
@@ -148,7 +148,9 @@ fn main() {let mut ts =TargetSpec ::new ();// `llvm-target`s are taken from `scripts/Makefile.clang`. -if cfg.has ("ARM64" ) { +if cfg.has ("ARM" ) { +panic! ("arm uses the builtin rustc arm-unknown-linux-gnueabi target" ); + }else if cfg.has ("ARM64" ) {panic! ("arm64 uses the builtin rustc aarch64-unknown-none target" ); }else if cfg.has ("RISCV" ) {if cfg.has ("64BIT" ) {
base-commit: 1613e604df0cd359cf2a7fbd9be7a0bcfacfabd0
Signature · 1 line
2.45.2
Thanks to all the contributors here! Works on an msm8960 (armv7a) device! :)
Logs:
https://pastebin.com/Y7NGzR9Q
Alice Ryhl
reviewerarch/arm/Makefile endif · line 153
Quoted 9 lines · Christian Schrefl
arch/arm/Makefile +1
-0@@ -150,6 +150,7 @@ endif KBUILD_CPPFLAGS +=$(cpp-y) KBUILD_CFLAGS +=$(CFLAGS_ABI) $(CFLAGS_ISA) $(arch-y) $(tune-y) $(call cc-option,-mshort-load-bytes,$(call cc-option,-malignment-traps,)) -msoft-float -Uarm KBUILD_AFLAGS +=$(CFLAGS_ABI) $(AFLAGS_ISA) -Wa,$(arch-y) $(tune-y) -include asm/unified.h -msoft-float +KBUILD_RUSTFLAGS += --target=arm-unknown-linux-gnueabi
On arm64 we use a target called aarch64-unknown-none. Should you also be using arm-unknown-none? Or maybe the arm64 target should be changed to aarch64-unknown-linux-gnueabi?
Alice
Quoted 17 lines · Alice Ryhl
arch/arm/Makefile endif · line 153
Quoted 9 lines · Christian Schrefl
arch/arm/Makefile +1
-0@@ -150,6 +150,7 @@ endif KBUILD_CPPFLAGS +=$(cpp-y) KBUILD_CFLAGS +=$(CFLAGS_ABI) $(CFLAGS_ISA) $(arch-y) $(tune-y) $(call cc-option,-mshort-load-bytes,$(call cc-option,-malignment-traps,)) -msoft-float -Uarm KBUILD_AFLAGS +=$(CFLAGS_ABI) $(AFLAGS_ISA) -Wa,$(arch-y) $(tune-y) -include asm/unified.h -msoft-float +KBUILD_RUSTFLAGS += --target=arm-unknown-linux-gnueabiOn arm64 we use a target called aarch64-unknown-none. Should you also be using arm-unknown-none? Or maybe the arm64 target should be changed to aarch64-unknown-linux-gnueabi?
Neither. EABI is highly specific to 32-bit ARM, no point in trying to align this between architectures.
Alice Ryhl
reviewerQuoted 20 lines · Ard Biesheuvel
Quoted 17 lines · Alice Ryhl
arch/arm/Makefile endif · line 153
Quoted 9 lines · Christian Schrefl
arch/arm/Makefile +1
-0@@ -150,6 +150,7 @@ endif KBUILD_CPPFLAGS +=$(cpp-y) KBUILD_CFLAGS +=$(CFLAGS_ABI) $(CFLAGS_ISA) $(arch-y) $(tune-y) $(call cc-option,-mshort-load-bytes,$(call cc-option,-malignment-traps,)) -msoft-float -Uarm KBUILD_AFLAGS +=$(CFLAGS_ABI) $(AFLAGS_ISA) -Wa,$(arch-y) $(tune-y) -include asm/unified.h -msoft-float +KBUILD_RUSTFLAGS += --target=arm-unknown-linux-gnueabiOn arm64 we use a target called aarch64-unknown-none. Should you also be using arm-unknown-none? Or maybe the arm64 target should be changed to aarch64-unknown-linux-gnueabi?
Quoted 2 lines
Neither. EABI is highly specific to 32-bit ARM, no point in trying to align this between architectures.
Ok. Thanks for the clarification.
Alice
Quoted 11 lines · Christian Schrefl
This commit allows building ARMv7 kernels with Rust support.
The rust core library expects some
__eabi_... functions that are not implemented in the kernel.
Those functions are some float operations and__aeabi_uldivmod. For now those are implemented withdefine_panicking_intrinsics!.This is based on the code by Sven Van Asbroeck from the original rust branch and inspired by the AArch64 version by Jamie Cunliffe.
Quoted 8 lines
I have tested the rust samples and a custom simple MMIO module on hardware (De1SoC FPGA + Arm A9 CPU).
This only includes support for ARMv7, but supporting other sub-architectures in the future should be as simple as setting the correct rustc target.
Signed-off-by Christian Schrefl <[email protected]>
With the clarification from Ard, I give:
Greetings,
Friendly Ping :)
This has been on the mailing list for quite some time with only a few responses.
Please let me know if something is needed from my side (like rebasing or wanted changes).
Cheers
Christian
Quoted 161 lines · Christian Schrefl
This commit allows building ARMv7 kernels with Rust support.
The rust core library expects some
__eabi_... functions that are not implemented in the kernel.
Those functions are some float operations and__aeabi_uldivmod. For now those are implemented withdefine_panicking_intrinsics!.This is based on the code by Sven Van Asbroeck from the original rust branch and inspired by the AArch64 version by Jamie Cunliffe.
I have tested the rust samples and a custom simple MMIO module on hardware (De1SoC FPGA + Arm A9 CPU).
This only includes support for ARMv7, but supporting other sub-architectures in the future should be as simple as setting the correct rustc target.
Signed-off-by Christian Schrefl <[email protected]>---
Changes since V1 [1]:
- Removed unrelated whitespace change.
- Added target name to panic message inscripts/generate_rust_target.rs.
- Fixed the comment inrust/bindgen_parameters.[1]: https://lore.kernel.org/rust-for-linux/[email protected]
--Documentation/rust/arch-support.rst | 1 + arch/arm/Kconfig | 1 + arch/arm/Makefile | 1 + rust/Makefile | 8 ++++++++ rust/bindgen_parameters | 4 ++++ rust/compiler_builtins.rs | 24 ++++++++++++++++++++++++ scripts/generate_rust_target.rs | 4 +++- 7 files changed, 42 insertions(+), 1 deletion(-)Documentation/rust/arch-support.rst +1
-0@@ -15,6 +15,7 @@ support corresponds to ``S`` values in the ``MAINTAINERS`` file. ============= ================ ============================================== Architecture Level of support Constraints ============= ================ ============================================== +``arm`` Maintained ARMv7 Little Endian only. ``arm64`` Maintained Little Endian only. ``loongarch`` Maintained \- ``riscv`` Maintained ``riscv64`` only.arch/arm/Kconfig +1
-0@@ -126,6 +126,7 @@ config ARM select MMU_GATHER_RCU_TABLE_FREE if SMP && ARM_LPAE select HAVE_REGS_AND_STACK_ACCESS_API select HAVE_RSEQ + select HAVE_RUST if CPU_LITTLE_ENDIAN && CPU_32v7 select HAVE_STACKPROTECTOR select HAVE_SYSCALL_TRACEPOINTS select HAVE_UID16arch/arm/Makefile +1
-0@@ -150,6 +150,7 @@ endif KBUILD_CPPFLAGS +=$(cpp-y) KBUILD_CFLAGS +=$(CFLAGS_ABI) $(CFLAGS_ISA) $(arch-y) $(tune-y) $(call cc-option,-mshort-load-bytes,$(call cc-option,-malignment-traps,)) -msoft-float -Uarm KBUILD_AFLAGS +=$(CFLAGS_ABI) $(AFLAGS_ISA) -Wa,$(arch-y) $(tune-y) -include asm/unified.h -msoft-float +KBUILD_RUSTFLAGS += --target=arm-unknown-linux-gnueabi CHECKFLAGS += -D__arm__rust/Makefile +8
-0@@ -287,6 +287,7 @@ bindgen_skip_c_flags := -mno-fp-ret-in-387 -mpreferred-stack-boundary=% \ # Derived from `scripts/Makefile.clang`. BINDGEN_TARGET_x86 := x86_64-linux-gnu BINDGEN_TARGET_arm64 := aarch64-linux-gnu +BINDGEN_TARGET_arm := arm-linux-gnueabi BINDGEN_TARGET := $(BINDGEN_TARGET_$(SRCARCH)) # All warnings are inhibited since GCC builds are very experimental,@@ -413,6 +414,13 @@ redirect-intrinsics = \ __muloti4 __multi3 \ __udivmodti4 __udivti3 __umodti3 +ifdef CONFIG_ARM + # Add eabi initrinsics for ARM 32-bit + redirect-intrinsics += \ + __aeabi_fadd __aeabi_fmul __aeabi_fcmpeq __aeabi_fcmple __aeabi_fcmplt __aeabi_fcmpun \ + __aeabi_dadd __aeabi_dmul __aeabi_dcmple __aeabi_dcmplt __aeabi_dcmpun \ + __aeabi_uldivmod +endif ifneq ($(or $(CONFIG_ARM64),$(and $(CONFIG_RISCV),$(CONFIG_64BIT))),) # These intrinsics are defined for ARM64 and RISCV64 redirect-intrinsics += \rust/bindgen_parameters +4
-0@@ -24,3 +24,7 @@ # These functions use the `__preserve_most` calling convention, which neither bindgen # nor Rust currently understand, and which Clang currently declares to be unstable. --blocklist-function __list_.*_report + +# Depending on how the architecture defines `ARCH_SLAB_MINALIGN`, `bindgen` might generate a binding. +# Disable this here as there is a `const` item that will always be generated in `bindings_helper.h` +--blocklist-item ARCH_SLAB_MINALIGNrust/compiler_builtins.rs +24
-0@@ -70,5 +70,29 @@ pub extern "C" fn $ident() { __umodti3, }); +#[cfg(target_arch = "arm" )] +define_panicking_intrinsics! ("`f32` should not be used" , { + __aeabi_fadd, + __aeabi_fmul, + __aeabi_fcmpeq, + __aeabi_fcmple, + __aeabi_fcmplt, + __aeabi_fcmpun, +}); + +#[cfg(target_arch = "arm" )] +define_panicking_intrinsics! ("`f64` should not be used" , { + __aeabi_dadd, + __aeabi_dmul, + __aeabi_dcmple, + __aeabi_dcmplt, + __aeabi_dcmpun, +}); + +#[cfg(target_arch = "arm" )] +define_panicking_intrinsics! ("`u64` division/modulo should not be used" , { + __aeabi_uldivmod, +}); +// NOTE: if you are adding a new intrinsic here, you should also add it to // `redirect-intrinsics` in `rust/Makefile`. scripts/generate_rust_target.rs +3
-1@@ -148,7 +148,9 @@ fn main() {let mut ts =TargetSpec ::new ();// `llvm-target`s are taken from `scripts/Makefile.clang`. -if cfg.has ("ARM64" ) { +if cfg.has ("ARM" ) { +panic! ("arm uses the builtin rustc arm-unknown-linux-gnueabi target" ); + }else if cfg.has ("ARM64" ) {panic! ("arm64 uses the builtin rustc aarch64-unknown-none target" ); }else if cfg.has ("RISCV" ) {if cfg.has ("64BIT" ) {base-commit:
1613e604df0cd359cf2a7fbd9be7a0bcfacfabd0
Quoted 2 lines · Christian Schrefl
This has been on the mailing list for quite some time with only a few responses.
Up to arm to take it -- if it helps, I tried the patch, including building, booting in QEMU, running the KUnit tests and loading the sample modules. Thus:
However, to keep our build Clippy-clean, it requires a a patch like:
https://lore.kernel.org/rust-for-linux/[email protected]/
which should ideally be applied together.
I hope that helps!
(Nit: please avoid top-posting, see https://subspace.kernel.org/etiquette.html)
Cheers,
Miguel
Ard Biesheuvel
Acked-by(cc Russell)
Quoted 4 lines · Miguel Ojeda
Quoted 1 line · Christian Schrefl
Quoted 9 lines
Quoted 1 line
This has been on the mailing list for quite some time with only a few responses.
Up to arm to take it -- if it helps, I tried the patch, including building, booting in QEMU, running the KUnit tests and loading the sample modules. Thus:
Acked-by Miguel Ojeda <[email protected]>Tested-by Miguel Ojeda <[email protected]>
If this needs to go via the ARM tree, it will need to go into Russell's patch tracker
Quoted 11 lines · Miguel Ojeda
Quoted 2 lines · Christian Schrefl
This has been on the mailing list for quite some time with only a few responses.
Up to arm to take it -- if it helps, I tried the patch, including building, booting in QEMU, running the KUnit tests and loading the sample modules. Thus:
Acked-by Miguel Ojeda <[email protected]>Tested-by Miguel Ojeda <[email protected]>
Did you apply it on 6.11-rc1?
Quoted 5 lines
However, to keep our build Clippy-clean, it requires a a patch like:
https://lore.kernel.org/rust-for-linux/[email protected]/which should ideally be applied together.
I think that I ran clippy, maybe that changed between 6.10 and 6.11.
Quoted 3 lines
I hope that helps!
(Nit: please avoid top-posting, see https://subspace.kernel.org/etiquette.html)
Sorry, I'm still getting used to using the mailing list.
Cheers,
Christian
Quoted 2 lines · Christian Schrefl
Did you apply it on 6.11-rc1?
Yeah.
Quoted 1 line
I think that I ran clippy, maybe that changed between 6.10 and 6.11.
It also triggers on top of v6.10-rc1 from a quick test (we had also this lint or similar even before we were in mainline, I think), but no worries, it is not a big deal :)
Cheers,
Miguel