Skip to contentSkip to conversation

rust: cfi: fix `patchable-function-entry` starting version

PATCH Applied Miguel Ojeda 4 participants 4 messages Sep 25, 2024 – Sep 26, 2024 Rust

lore
Share & tools
lore

Miguel Ojeda

author maintainer
#0 lore raw

PATCH 1/1 rust: cfi: fix `patchable-function-entry` starting version

The -Zpatchable-function-entry flag is available since Rust 1.81.0, not Rust 1.80.0, i.e. commit ac7595fdb1ee ("Support for -Z patchable-function-entry") in upstream Rust.

Fixes ca627e636551 ("rust: cfi: add support for CFI_CLANG with Rust")
---
 init/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
init/Kconfig +1 -1
index 4ea2a161d362..89bbd0b8bdb7 100644
@@ -1911,7 +1911,7 @@ config RUST
 	depends on !DEBUG_INFO_BTF || PAHOLE_HAS_LANG_EXCLUDE
 	depends on !CFI_CLANG || RUSTC_VERSION >= 107900 && $(cc-option,-fsanitize=kcfi -fsanitize-cfi-icall-experimental-normalize-integers)
 	select CFI_ICALL_NORMALIZE_INTEGERS if CFI_CLANG
-	depends on !CALL_PADDING || RUSTC_VERSION >= 108000
+	depends on !CALL_PADDING || RUSTC_VERSION >= 108100
 	depends on !KASAN_SW_TAGS
 	help
 	  Enables Rust support in the kernel.

base-commit: a2f11547052001bd448ccec81dd1e68409078fbb

Signature · 1 line
2.46.2
reviewer Reviewed-by on v1 1/1
#1 lore raw
Quoted 7 lines · Miguel Ojeda

The -Zpatchable-function-entry flag is available since Rust 1.81.0, not Rust 1.80.0, i.e. commit ac7595fdb1ee ("Support for -Z patchable-function-entry") in upstream Rust.

Fixes ca627e636551 ("rust: cfi: add support for CFI_CLANG with Rust")
Reviewed-by on v1 1/1
#2 lore raw
In reply to Miguel Ojeda
Quoted 6 lines · Miguel Ojeda

The -Zpatchable-function-entry flag is available since Rust 1.81.0, not Rust 1.80.0, i.e. commit ac7595fdb1ee ("Support for -Z patchable-function-entry") in upstream Rust.

Fixes ca627e636551 ("rust: cfi: add support for CFI_CLANG with Rust")

Hit this today, nice that it’s now fixed

Quoted 21 lines
---
 init/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
init/Kconfig +1 -1
index 4ea2a161d362..89bbd0b8bdb7 100644
@@ -1911,7 +1911,7 @@ config RUST
 	depends on !DEBUG_INFO_BTF || PAHOLE_HAS_LANG_EXCLUDE
 	depends on !CFI_CLANG || RUSTC_VERSION >= 107900 && $(cc-option,-fsanitize=kcfi -fsanitize-cfi-icall-experimental-normalize-integers)
 	select CFI_ICALL_NORMALIZE_INTEGERS if CFI_CLANG
-	depends on !CALL_PADDING || RUSTC_VERSION >= 108000
+	depends on !CALL_PADDING || RUSTC_VERSION >= 108100
 	depends on !KASAN_SW_TAGS
 	help
 	  Enables Rust support in the kernel.

base-commit: a2f11547052001bd448ccec81dd1e68409078fbb

Signature · 1 line
2.46.2
Applied
#3 lore raw
In reply to Miguel Ojeda
Quoted 7 lines · Miguel Ojeda

The -Zpatchable-function-entry flag is available since Rust 1.81.0, not Rust 1.80.0, i.e. commit ac7595fdb1ee ("Support for -Z patchable-function-entry") in upstream Rust.

Fixes ca627e636551 ("rust: cfi: add support for CFI_CLANG with Rust")

Applied to rust-fixes -- thanks everyone!

Cheers,
Miguel