* [PATCH v2 0/4] s390: enable Rust support and add required arch glue
@ 2026-05-19 15:12 Jan Polensky
2026-05-19 15:12 ` [PATCH v2 1/4] s390/bug: Provide ARCH_WARN_ASM for Rust WARN/BUG support Jan Polensky
` (3 more replies)
0 siblings, 4 replies; 7+ messages in thread
From: Jan Polensky @ 2026-05-19 15:12 UTC (permalink / raw)
To: hca, gor, agordeev, ojeda, peterz, jpoimboe, jbaron, aliceryhl
Cc: borntraeger, svens, boqun, gary, bjorn3_gh, lossin, a.hindborg,
tmgross, dakr, rostedt, ardb, linux-s390, rust-for-linux,
linux-kernel
Rust support on s390 requires a small set of architecture-specific pieces
before the generic Rust kernel infrastructure can be used.
The series wires up s390 as a Rust-capable 64-bit architecture, adds the
missing assembly interfaces needed by Rust for WARN/BUG reporting and for
static branches, and adjusts bindgen parameters to avoid repr layout
conflicts caused by packed and aligned s390 structures.
s390 currently requires a rustc due to -Zpacked-stack, and the
minimum tool version gating is adjusted accordingly.
Link: https://github.com/Rust-for-Linux/linux/issues/2
Tested against: rustc 1.96.0-beta.7 (6be5f81e1 2026-05-17)
Changes since v1:
- strip the -nightly suffix in min-tool-version.sh (thanks miguel and alice)
- ARCH_JUMP_TABLE_ENTRY() moved up to align comments properly (thanks Gary)
- removed MONCODE_BUG to prevent 0U in non-C context in assembler (noted by Sashiko - AI)
- prevent environment pollution by explicit initialization mflag := (noted by Sashiko - AI)
Jan Polensky (4):
s390/bug: Provide ARCH_WARN_ASM for Rust WARN/BUG support
s390/jump_label: Implement ARCH_STATIC_BRANCH_JUMP_ASM and
ARCH_STATIC_BRANCH_ASM macros
rust/bindgen_parameters: Mark s390 types as opaque to prevent repr
conflicts
s390: enable Rust support
Documentation/rust/arch-support.rst | 1 +
arch/s390/Kconfig | 1 +
arch/s390/Makefile | 29 +++++++++++++++----------
arch/s390/include/asm/bug.h | 12 +++++++++++
arch/s390/include/asm/jump_label.h | 33 +++++++++++++++++------------
rust/Makefile | 1 +
rust/bindgen_parameters | 7 ++++++
scripts/generate_rust_target.rs | 2 ++
scripts/min-tool-version.sh | 6 +++++-
9 files changed, 66 insertions(+), 26 deletions(-)
base-commit: ab5fce87a778cb780a05984a2ca448f2b41aafbf
--
2.51.0
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH v2 1/4] s390/bug: Provide ARCH_WARN_ASM for Rust WARN/BUG support
2026-05-19 15:12 [PATCH v2 0/4] s390: enable Rust support and add required arch glue Jan Polensky
@ 2026-05-19 15:12 ` Jan Polensky
2026-05-19 15:12 ` [PATCH v2 2/4] s390/jump_label: Implement ARCH_STATIC_BRANCH_JUMP_ASM and ARCH_STATIC_BRANCH_ASM macros Jan Polensky
` (2 subsequent siblings)
3 siblings, 0 replies; 7+ messages in thread
From: Jan Polensky @ 2026-05-19 15:12 UTC (permalink / raw)
To: hca, gor, agordeev, ojeda, peterz, jpoimboe, jbaron, aliceryhl
Cc: borntraeger, svens, boqun, gary, bjorn3_gh, lossin, a.hindborg,
tmgross, dakr, rostedt, ardb, linux-s390, rust-for-linux,
linux-kernel
Rust WARN and BUG support relies on ARCH_WARN_ASM to emit __bug_table
entries. On s390 the macro is missing, so Rust code cannot generate
proper WARN/BUG metadata for the kernel's bug reporting infrastructure.
Define ARCH_WARN_ASM to produce the same assembly sequence and
__bug_table entry format as the existing s390 BUG handling, including
the monitor call. Define ARCH_WARN_REACHABLE as empty since s390 does
not provide reachability analysis for warning paths.
Signed-off-by: Jan Polensky <japo@linux.ibm.com>
---
arch/s390/include/asm/bug.h | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/arch/s390/include/asm/bug.h b/arch/s390/include/asm/bug.h
index 59017fd3d935..a72439370f62 100644
--- a/arch/s390/include/asm/bug.h
+++ b/arch/s390/include/asm/bug.h
@@ -4,6 +4,7 @@
#include <linux/compiler.h>
#include <linux/const.h>
+#include <linux/stringify.h>
#define MONCODE_BUG _AC(0, U)
#define MONCODE_BUG_ARG _AC(1, U)
@@ -121,6 +122,17 @@ do { \
#define HAVE_ARCH_BUG_FORMAT
#define HAVE_ARCH_BUG_FORMAT_ARGS
+#define ARCH_WARN_ASM(file, line, flags, size) \
+ ".section .rodata.str,\"aMS\",@progbits,1\n" \
+ "9:\n" \
+ ".asciz \"\"\n" /* Empty string for compatibility */ \
+ ".previous\n" \
+ "0:\n" \
+ __stringify(mc 0(%r0),0) "\n" \
+ __BUG_ENTRY("9b", file, line, flags, size)
+
+#define ARCH_WARN_REACHABLE
+
#endif /* CONFIG_BUG && CONFIG_CC_HAS_ASM_IMMEDIATE_STRINGS */
#endif /* __ASSEMBLER__ */
--
2.51.0
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH v2 2/4] s390/jump_label: Implement ARCH_STATIC_BRANCH_JUMP_ASM and ARCH_STATIC_BRANCH_ASM macros
2026-05-19 15:12 [PATCH v2 0/4] s390: enable Rust support and add required arch glue Jan Polensky
2026-05-19 15:12 ` [PATCH v2 1/4] s390/bug: Provide ARCH_WARN_ASM for Rust WARN/BUG support Jan Polensky
@ 2026-05-19 15:12 ` Jan Polensky
2026-05-19 15:12 ` [PATCH v2 3/4] rust/bindgen_parameters: Mark s390 types as opaque to prevent repr conflicts Jan Polensky
2026-05-19 15:12 ` [PATCH v2 4/4] s390: enable Rust support Jan Polensky
3 siblings, 0 replies; 7+ messages in thread
From: Jan Polensky @ 2026-05-19 15:12 UTC (permalink / raw)
To: hca, gor, agordeev, ojeda, peterz, jpoimboe, jbaron, aliceryhl
Cc: borntraeger, svens, boqun, gary, bjorn3_gh, lossin, a.hindborg,
tmgross, dakr, rostedt, ardb, linux-s390, rust-for-linux,
linux-kernel
Rust static branch support needs the s390 jump label instruction sequence
and __jump_table emission in a reusable form. The current implementation
embeds the sequence directly in the C asm goto blocks, which cannot be
shared with Rust.
Introduce ARCH_STATIC_BRANCH_ASM and ARCH_STATIC_BRANCH_JUMP_ASM to
describe the brcl sequences for the likely-false and likely-true cases
and to emit the same __jump_table entries as before. Switch the existing
C helpers to use the new macros to avoid duplication without changing
the generated code.
Signed-off-by: Jan Polensky <japo@linux.ibm.com>
---
arch/s390/include/asm/jump_label.h | 33 +++++++++++++++++-------------
1 file changed, 19 insertions(+), 14 deletions(-)
diff --git a/arch/s390/include/asm/jump_label.h b/arch/s390/include/asm/jump_label.h
index d9cbc18f6b2e..0e28c90dc242 100644
--- a/arch/s390/include/asm/jump_label.h
+++ b/arch/s390/include/asm/jump_label.h
@@ -19,19 +19,29 @@
#define JUMP_LABEL_STATIC_KEY_CONSTRAINT "jdd"
#endif
+#define ARCH_JUMP_TABLE_ENTRY(key, label, local_label) \
+ ".pushsection __jump_table,\"aw\"\n" \
+ ".balign 8\n" \
+ ".long " local_label "-.," label "-.\n" \
+ ".quad " key "-.\n" \
+ ".popsection\n"
+
/*
* We use a brcl 0,<offset> instruction for jump labels so it
* can be easily distinguished from a hotpatch generated instruction.
*/
+#define ARCH_STATIC_BRANCH_ASM(key, label) \
+ "0: brcl 0," label "\n" \
+ ARCH_JUMP_TABLE_ENTRY(key, label, "0b")
+
+#define ARCH_STATIC_BRANCH_JUMP_ASM(key, label) \
+ "0: brcl 15," label "\n" \
+ ARCH_JUMP_TABLE_ENTRY(key, label, "0b")
+
static __always_inline bool arch_static_branch(struct static_key *key, bool branch)
{
- asm goto("0: brcl 0,%l[label]\n"
- ".pushsection __jump_table,\"aw\"\n"
- ".balign 8\n"
- ".long 0b-.,%l[label]-.\n"
- ".quad %0+%1-.\n"
- ".popsection\n"
- : : JUMP_LABEL_STATIC_KEY_CONSTRAINT (key), "i" (branch) : : label);
+ asm goto(ARCH_STATIC_BRANCH_ASM("%0+%1", "%l[label]")
+ : : JUMP_LABEL_STATIC_KEY_CONSTRAINT (key), "i" (branch) : : label);
return false;
label:
return true;
@@ -39,13 +49,8 @@ static __always_inline bool arch_static_branch(struct static_key *key, bool bran
static __always_inline bool arch_static_branch_jump(struct static_key *key, bool branch)
{
- asm goto("0: brcl 15,%l[label]\n"
- ".pushsection __jump_table,\"aw\"\n"
- ".balign 8\n"
- ".long 0b-.,%l[label]-.\n"
- ".quad %0+%1-.\n"
- ".popsection\n"
- : : JUMP_LABEL_STATIC_KEY_CONSTRAINT (key), "i" (branch) : : label);
+ asm goto(ARCH_STATIC_BRANCH_JUMP_ASM("%0+%1", "%l[label]")
+ : : JUMP_LABEL_STATIC_KEY_CONSTRAINT (key), "i" (branch) : : label);
return false;
label:
return true;
--
2.51.0
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH v2 3/4] rust/bindgen_parameters: Mark s390 types as opaque to prevent repr conflicts
2026-05-19 15:12 [PATCH v2 0/4] s390: enable Rust support and add required arch glue Jan Polensky
2026-05-19 15:12 ` [PATCH v2 1/4] s390/bug: Provide ARCH_WARN_ASM for Rust WARN/BUG support Jan Polensky
2026-05-19 15:12 ` [PATCH v2 2/4] s390/jump_label: Implement ARCH_STATIC_BRANCH_JUMP_ASM and ARCH_STATIC_BRANCH_ASM macros Jan Polensky
@ 2026-05-19 15:12 ` Jan Polensky
2026-05-19 15:12 ` [PATCH v2 4/4] s390: enable Rust support Jan Polensky
3 siblings, 0 replies; 7+ messages in thread
From: Jan Polensky @ 2026-05-19 15:12 UTC (permalink / raw)
To: hca, gor, agordeev, ojeda, peterz, jpoimboe, jbaron, aliceryhl
Cc: borntraeger, svens, boqun, gary, bjorn3_gh, lossin, a.hindborg,
tmgross, dakr, rostedt, ardb, linux-s390, rust-for-linux,
linux-kernel
Bindgen attempts to generate Rust layouts for a number of s390 structs
that are packed but contain, or transitively contain, aligned fields.
Rust rejects such layouts with E0588 ("packed type cannot transitively
contain a #[repr(align)] type").
Add the affected s390 types to the opaque type list so bindgen emits
opaque blob types instead of full representations. This matches existing
workarounds for x86 types such as alt_instr and x86_msi_data.
References: https://lore.kernel.org/all/e5c7aa10-590d-0d20-dd3b-385bee2377e7@intel.com/
Reviewed-by: Gary Guo <gary@garyguo.net>
Signed-off-by: Jan Polensky <japo@linux.ibm.com>
---
rust/bindgen_parameters | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/rust/bindgen_parameters b/rust/bindgen_parameters
index 6f02d9720ad2..8402b0c93545 100644
--- a/rust/bindgen_parameters
+++ b/rust/bindgen_parameters
@@ -14,6 +14,13 @@
--opaque-type alt_instr
--opaque-type x86_msi_data
--opaque-type x86_msi_addr_lo
+# s390-only: same packed/align issue as above (E0588).
+--opaque-type lowcore
+--opaque-type tod_clock
+--opaque-type tpi_info
+--opaque-type uv_cb.*
+--opaque-type uv_secret.*
+--opaque-type zpci_fib
# If SMP is disabled, `arch_spinlock_t` is defined as a ZST which triggers a Rust
# warning. We don't need to peek into it anyway.
--
2.51.0
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH v2 4/4] s390: enable Rust support
2026-05-19 15:12 [PATCH v2 0/4] s390: enable Rust support and add required arch glue Jan Polensky
` (2 preceding siblings ...)
2026-05-19 15:12 ` [PATCH v2 3/4] rust/bindgen_parameters: Mark s390 types as opaque to prevent repr conflicts Jan Polensky
@ 2026-05-19 15:12 ` Jan Polensky
2026-05-19 15:45 ` Gary Guo
3 siblings, 1 reply; 7+ messages in thread
From: Jan Polensky @ 2026-05-19 15:12 UTC (permalink / raw)
To: hca, gor, agordeev, ojeda, peterz, jpoimboe, jbaron, aliceryhl
Cc: borntraeger, svens, boqun, gary, bjorn3_gh, lossin, a.hindborg,
tmgross, dakr, rostedt, ardb, linux-s390, rust-for-linux,
linux-kernel
Enable building Rust code on s390 by wiring the architecture into the
kernel Rust infrastructure.
Add s390 to the Rust arch support documentation, provide the s390 Rust
target and required compiler flags, and set the bindgen target for
arch/s390. Adjust the Rust target generation and minimum rustc version
gating so the s390 setup is handled explicitly.
The Rust toolchain uses the "s390x" triple naming for the 64 bit target.
Rust support is currently incompatible with CONFIG_EXPOLINE, which
relies on compiler support for the -mindirect-branch= and
-mfunction_return= options. Therefore, select HAVE_RUST only when
EXPOLINE is disabled.
Signed-off-by: Jan Polensky <japo@linux.ibm.com>
---
Documentation/rust/arch-support.rst | 1 +
arch/s390/Kconfig | 1 +
arch/s390/Makefile | 29 ++++++++++++++++++-----------
rust/Makefile | 1 +
scripts/generate_rust_target.rs | 2 ++
scripts/min-tool-version.sh | 6 +++++-
6 files changed, 28 insertions(+), 12 deletions(-)
diff --git a/Documentation/rust/arch-support.rst b/Documentation/rust/arch-support.rst
index 6e6a515d0899..ce9804b8226c 100644
--- a/Documentation/rust/arch-support.rst
+++ b/Documentation/rust/arch-support.rst
@@ -19,6 +19,7 @@ Architecture Level of support Constraints
``arm64`` Maintained Little Endian only.
``loongarch`` Maintained \-
``riscv`` Maintained ``riscv64`` and LLVM/Clang only.
+``s390`` Maintained \-
``um`` Maintained \-
``x86`` Maintained ``x86_64`` only.
============= ================ ==============================================
diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig
index ecbcbb781e40..26951781d74d 100644
--- a/arch/s390/Kconfig
+++ b/arch/s390/Kconfig
@@ -248,6 +248,7 @@ config S390
select HAVE_RELIABLE_STACKTRACE
select HAVE_RETHOOK
select HAVE_RSEQ
+ select HAVE_RUST if !EXPOLINE
select HAVE_SAMPLE_FTRACE_DIRECT
select HAVE_SAMPLE_FTRACE_DIRECT_MULTI
select HAVE_SETUP_PER_CPU_AREA
diff --git a/arch/s390/Makefile b/arch/s390/Makefile
index 297976b41088..8e1239668f8c 100644
--- a/arch/s390/Makefile
+++ b/arch/s390/Makefile
@@ -35,25 +35,32 @@ KBUILD_CFLAGS_DECOMPRESSOR += $(if $(CONFIG_DEBUG_INFO),-g)
KBUILD_CFLAGS_DECOMPRESSOR += $(if $(CONFIG_DEBUG_INFO_DWARF4), $(call cc-option, -gdwarf-4,))
KBUILD_CFLAGS_DECOMPRESSOR += $(if $(CONFIG_CC_NO_ARRAY_BOUNDS),-Wno-array-bounds)
+KBUILD_RUSTFLAGS += --target=s390x-unknown-none-softfloat -Zpacked-stack -Ctarget-feature=+backchain
+
UTS_MACHINE := s390x
STACK_SIZE := $(if $(CONFIG_KASAN),65536,$(if $(CONFIG_KMSAN),65536,16384))
CHECKFLAGS += -D__s390__ -D__s390x__
export LD_BFD
-mflags-$(CONFIG_MARCH_Z10) := -march=z10
-mflags-$(CONFIG_MARCH_Z196) := -march=z196
-mflags-$(CONFIG_MARCH_ZEC12) := -march=zEC12
-mflags-$(CONFIG_MARCH_Z13) := -march=z13
-mflags-$(CONFIG_MARCH_Z14) := -march=z14
-mflags-$(CONFIG_MARCH_Z15) := -march=z15
-mflags-$(CONFIG_MARCH_Z16) := -march=z16
-mflags-$(CONFIG_MARCH_Z17) := -march=z17
+march-name-$(CONFIG_MARCH_Z10) := z10
+march-name-$(CONFIG_MARCH_Z196) := z196
+march-name-$(CONFIG_MARCH_ZEC12) := zEC12
+march-name-$(CONFIG_MARCH_Z13) := z13
+march-name-$(CONFIG_MARCH_Z14) := z14
+march-name-$(CONFIG_MARCH_Z15) := z15
+march-name-$(CONFIG_MARCH_Z16) := z16
+march-name-$(CONFIG_MARCH_Z17) := z17
-export CC_FLAGS_MARCH := $(mflags-y)
+mflags :=
+mflags += -march=$(march-name-y)
-aflags-y += $(mflags-y)
-cflags-y += $(mflags-y)
+export CC_FLAGS_MARCH := $(mflags)
+
+aflags-y += $(mflags)
+cflags-y += $(mflags)
+
+KBUILD_RUSTFLAGS += -Ctarget-cpu=$(march-name-y)
cflags-$(CONFIG_MARCH_Z10_TUNE) += -mtune=z10
cflags-$(CONFIG_MARCH_Z196_TUNE) += -mtune=z196
diff --git a/rust/Makefile b/rust/Makefile
index b9e9f512cec3..77460502f576 100644
--- a/rust/Makefile
+++ b/rust/Makefile
@@ -403,6 +403,7 @@ BINDGEN_TARGET_x86 := x86_64-linux-gnu
BINDGEN_TARGET_arm64 := aarch64-linux-gnu
BINDGEN_TARGET_arm := arm-linux-gnueabi
BINDGEN_TARGET_loongarch := loongarch64-linux-gnusf
+BINDGEN_TARGET_s390 := s390x-linux-gnu
# This is only for i386 UM builds, which need the 32-bit target not -m32
BINDGEN_TARGET_i386 := i386-linux-gnu
BINDGEN_TARGET_um := $(BINDGEN_TARGET_$(SUBARCH))
diff --git a/scripts/generate_rust_target.rs b/scripts/generate_rust_target.rs
index 38b3416bb979..8f1df6819d0b 100644
--- a/scripts/generate_rust_target.rs
+++ b/scripts/generate_rust_target.rs
@@ -256,6 +256,8 @@ fn main() {
}
} else if cfg.has("LOONGARCH") {
panic!("loongarch uses the builtin rustc loongarch64-unknown-none-softfloat target");
+ } else if cfg.has("S390") {
+ panic!("s390 uses the builtin rustc s390x-unknown-none-softfloat target");
} else {
panic!("Unsupported architecture");
}
diff --git a/scripts/min-tool-version.sh b/scripts/min-tool-version.sh
index b96ec2d379b6..296acf8f71aa 100755
--- a/scripts/min-tool-version.sh
+++ b/scripts/min-tool-version.sh
@@ -31,7 +31,11 @@ llvm)
fi
;;
rustc)
- echo 1.85.0
+ if [ "$SRCARCH" = "s390" ]; then
+ echo 1.96.0
+ else
+ echo 1.85.0
+ fi
;;
bindgen)
echo 0.71.1
--
2.51.0
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH v2 4/4] s390: enable Rust support
2026-05-19 15:12 ` [PATCH v2 4/4] s390: enable Rust support Jan Polensky
@ 2026-05-19 15:45 ` Gary Guo
2026-05-21 16:27 ` Jan Polensky
0 siblings, 1 reply; 7+ messages in thread
From: Gary Guo @ 2026-05-19 15:45 UTC (permalink / raw)
To: Jan Polensky, hca, gor, agordeev, ojeda, peterz, jpoimboe,
jbaron, aliceryhl
Cc: borntraeger, svens, boqun, gary, bjorn3_gh, lossin, a.hindborg,
tmgross, dakr, rostedt, ardb, linux-s390, rust-for-linux,
linux-kernel
On Tue May 19, 2026 at 4:12 PM BST, Jan Polensky wrote:
> Enable building Rust code on s390 by wiring the architecture into the
> kernel Rust infrastructure.
>
> Add s390 to the Rust arch support documentation, provide the s390 Rust
> target and required compiler flags, and set the bindgen target for
> arch/s390. Adjust the Rust target generation and minimum rustc version
> gating so the s390 setup is handled explicitly.
>
> The Rust toolchain uses the "s390x" triple naming for the 64 bit target.
>
> Rust support is currently incompatible with CONFIG_EXPOLINE, which
> relies on compiler support for the -mindirect-branch= and
> -mfunction_return= options. Therefore, select HAVE_RUST only when
> EXPOLINE is disabled.
>
> Signed-off-by: Jan Polensky <japo@linux.ibm.com>
> ---
> Documentation/rust/arch-support.rst | 1 +
> arch/s390/Kconfig | 1 +
> arch/s390/Makefile | 29 ++++++++++++++++++-----------
> rust/Makefile | 1 +
> scripts/generate_rust_target.rs | 2 ++
> scripts/min-tool-version.sh | 6 +++++-
> 6 files changed, 28 insertions(+), 12 deletions(-)
>
> diff --git a/Documentation/rust/arch-support.rst b/Documentation/rust/arch-support.rst
> index 6e6a515d0899..ce9804b8226c 100644
> --- a/Documentation/rust/arch-support.rst
> +++ b/Documentation/rust/arch-support.rst
> @@ -19,6 +19,7 @@ Architecture Level of support Constraints
> ``arm64`` Maintained Little Endian only.
> ``loongarch`` Maintained \-
> ``riscv`` Maintained ``riscv64`` and LLVM/Clang only.
> +``s390`` Maintained \-
> ``um`` Maintained \-
> ``x86`` Maintained ``x86_64`` only.
> ============= ================ ==============================================
> diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig
> index ecbcbb781e40..26951781d74d 100644
> --- a/arch/s390/Kconfig
> +++ b/arch/s390/Kconfig
> @@ -248,6 +248,7 @@ config S390
> select HAVE_RELIABLE_STACKTRACE
> select HAVE_RETHOOK
> select HAVE_RSEQ
> + select HAVE_RUST if !EXPOLINE
> select HAVE_SAMPLE_FTRACE_DIRECT
> select HAVE_SAMPLE_FTRACE_DIRECT_MULTI
> select HAVE_SETUP_PER_CPU_AREA
> diff --git a/arch/s390/Makefile b/arch/s390/Makefile
> index 297976b41088..8e1239668f8c 100644
> --- a/arch/s390/Makefile
> +++ b/arch/s390/Makefile
> @@ -35,25 +35,32 @@ KBUILD_CFLAGS_DECOMPRESSOR += $(if $(CONFIG_DEBUG_INFO),-g)
> KBUILD_CFLAGS_DECOMPRESSOR += $(if $(CONFIG_DEBUG_INFO_DWARF4), $(call cc-option, -gdwarf-4,))
> KBUILD_CFLAGS_DECOMPRESSOR += $(if $(CONFIG_CC_NO_ARRAY_BOUNDS),-Wno-array-bounds)
>
> +KBUILD_RUSTFLAGS += --target=s390x-unknown-none-softfloat -Zpacked-stack -Ctarget-feature=+backchain
> +
> UTS_MACHINE := s390x
> STACK_SIZE := $(if $(CONFIG_KASAN),65536,$(if $(CONFIG_KMSAN),65536,16384))
> CHECKFLAGS += -D__s390__ -D__s390x__
>
> export LD_BFD
>
> -mflags-$(CONFIG_MARCH_Z10) := -march=z10
> -mflags-$(CONFIG_MARCH_Z196) := -march=z196
> -mflags-$(CONFIG_MARCH_ZEC12) := -march=zEC12
> -mflags-$(CONFIG_MARCH_Z13) := -march=z13
> -mflags-$(CONFIG_MARCH_Z14) := -march=z14
> -mflags-$(CONFIG_MARCH_Z15) := -march=z15
> -mflags-$(CONFIG_MARCH_Z16) := -march=z16
> -mflags-$(CONFIG_MARCH_Z17) := -march=z17
> +march-name-$(CONFIG_MARCH_Z10) := z10
> +march-name-$(CONFIG_MARCH_Z196) := z196
> +march-name-$(CONFIG_MARCH_ZEC12) := zEC12
> +march-name-$(CONFIG_MARCH_Z13) := z13
> +march-name-$(CONFIG_MARCH_Z14) := z14
> +march-name-$(CONFIG_MARCH_Z15) := z15
> +march-name-$(CONFIG_MARCH_Z16) := z16
> +march-name-$(CONFIG_MARCH_Z17) := z17
>
> -export CC_FLAGS_MARCH := $(mflags-y)
> +mflags :=
> +mflags += -march=$(march-name-y)
Why not just
mflags := -march=$(march-name-y)
?
Best,
Gary
>
> -aflags-y += $(mflags-y)
> -cflags-y += $(mflags-y)
> +export CC_FLAGS_MARCH := $(mflags)
> +
> +aflags-y += $(mflags)
> +cflags-y += $(mflags)
> +
> +KBUILD_RUSTFLAGS += -Ctarget-cpu=$(march-name-y)
>
> cflags-$(CONFIG_MARCH_Z10_TUNE) += -mtune=z10
> cflags-$(CONFIG_MARCH_Z196_TUNE) += -mtune=z196
> diff --git a/rust/Makefile b/rust/Makefile
> index b9e9f512cec3..77460502f576 100644
> --- a/rust/Makefile
> +++ b/rust/Makefile
> @@ -403,6 +403,7 @@ BINDGEN_TARGET_x86 := x86_64-linux-gnu
> BINDGEN_TARGET_arm64 := aarch64-linux-gnu
> BINDGEN_TARGET_arm := arm-linux-gnueabi
> BINDGEN_TARGET_loongarch := loongarch64-linux-gnusf
> +BINDGEN_TARGET_s390 := s390x-linux-gnu
> # This is only for i386 UM builds, which need the 32-bit target not -m32
> BINDGEN_TARGET_i386 := i386-linux-gnu
> BINDGEN_TARGET_um := $(BINDGEN_TARGET_$(SUBARCH))
> diff --git a/scripts/generate_rust_target.rs b/scripts/generate_rust_target.rs
> index 38b3416bb979..8f1df6819d0b 100644
> --- a/scripts/generate_rust_target.rs
> +++ b/scripts/generate_rust_target.rs
> @@ -256,6 +256,8 @@ fn main() {
> }
> } else if cfg.has("LOONGARCH") {
> panic!("loongarch uses the builtin rustc loongarch64-unknown-none-softfloat target");
> + } else if cfg.has("S390") {
> + panic!("s390 uses the builtin rustc s390x-unknown-none-softfloat target");
> } else {
> panic!("Unsupported architecture");
> }
> diff --git a/scripts/min-tool-version.sh b/scripts/min-tool-version.sh
> index b96ec2d379b6..296acf8f71aa 100755
> --- a/scripts/min-tool-version.sh
> +++ b/scripts/min-tool-version.sh
> @@ -31,7 +31,11 @@ llvm)
> fi
> ;;
> rustc)
> - echo 1.85.0
> + if [ "$SRCARCH" = "s390" ]; then
> + echo 1.96.0
> + else
> + echo 1.85.0
> + fi
> ;;
> bindgen)
> echo 0.71.1
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH v2 4/4] s390: enable Rust support
2026-05-19 15:45 ` Gary Guo
@ 2026-05-21 16:27 ` Jan Polensky
0 siblings, 0 replies; 7+ messages in thread
From: Jan Polensky @ 2026-05-21 16:27 UTC (permalink / raw)
To: Gary Guo, hca, gor, agordeev, ojeda, peterz, jpoimboe, jbaron, aliceryhl
Cc: borntraeger, svens, boqun, bjorn3_gh, lossin, a.hindborg,
tmgross, dakr, rostedt, ardb, linux-s390, rust-for-linux,
linux-kernel
On Tue, May 19, 2026 at 04:45:33PM +0100, Gary Guo wrote:
> On Tue May 19, 2026 at 4:12 PM BST, Jan Polensky wrote:
> > Enable building Rust code on s390 by wiring the architecture into the
[snip]
> Why not just
>
> mflags := -march=$(march-name-y)
>
> ?
>
> Best,
> Gary
Thanks Gary,
noted and updated accordingly.
Best regards,
Jan
>
> >
> > -aflags-y += $(mflags-y)
> > -cflags-y += $(mflags-y)
[snip]
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2026-05-21 16:27 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-05-19 15:12 [PATCH v2 0/4] s390: enable Rust support and add required arch glue Jan Polensky
2026-05-19 15:12 ` [PATCH v2 1/4] s390/bug: Provide ARCH_WARN_ASM for Rust WARN/BUG support Jan Polensky
2026-05-19 15:12 ` [PATCH v2 2/4] s390/jump_label: Implement ARCH_STATIC_BRANCH_JUMP_ASM and ARCH_STATIC_BRANCH_ASM macros Jan Polensky
2026-05-19 15:12 ` [PATCH v2 3/4] rust/bindgen_parameters: Mark s390 types as opaque to prevent repr conflicts Jan Polensky
2026-05-19 15:12 ` [PATCH v2 4/4] s390: enable Rust support Jan Polensky
2026-05-19 15:45 ` Gary Guo
2026-05-21 16:27 ` Jan Polensky
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®