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

[PATCH] rust: cfi: fix `patchable-function-entry` starting version

Posted by Miguel Ojeda 2 months ago

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")
Signed-off-by: Miguel Ojeda <ojeda@kernel.org>
---
 init/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/init/Kconfig b/init/Kconfig
index 4ea2a161d362..89bbd0b8bdb7 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -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
-- 
2.46.2

Re: [PATCH] rust: cfi: fix `patchable-function-entry` starting version

Posted by Miguel Ojeda 2 months ago

On Wed, Sep 25, 2024 at 4:20 PM Miguel Ojeda <ojeda@kernel.org> wrote:
>
> 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")
> Signed-off-by: Miguel Ojeda <ojeda@kernel.org>

Applied to `rust-fixes` -- thanks everyone!

Cheers,
Miguel

Re: [PATCH] rust: cfi: fix `patchable-function-entry` starting version

Posted by Fiona Behrens 2 months ago


On 25 Sep 2024, at 16:19, Miguel Ojeda wrote:

> 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")
> Signed-off-by: Miguel Ojeda <ojeda@kernel.org>

Hit this today, nice that it’s now fixed

Reviewed-by: Fiona Behrens <me@kloenk.dev>

> ---
>  init/Kconfig | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/init/Kconfig b/init/Kconfig
> index 4ea2a161d362..89bbd0b8bdb7 100644
> --- a/init/Kconfig
> +++ b/init/Kconfig
> @@ -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
> -- 
> 2.46.2

Re: [PATCH] rust: cfi: fix `patchable-function-entry` starting version

Posted by Alice Ryhl 2 months ago

On Wed, Sep 25, 2024 at 4:20 PM Miguel Ojeda <ojeda@kernel.org> wrote:
>
> 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")
> Signed-off-by: Miguel Ojeda <ojeda@kernel.org>

Reviewed-by: Alice Ryhl <aliceryhl@google.com>