Repository navigation
Add -Zindirect-branch-cs-prefix - #140740
Merged
Merged
Conversation
ojeda
force-pushed
the
indirect-branch-cs-prefix
branch
from
May 7, 2025 14:07
4422b3c to
0582d8f
Compare
45 of 81 tasks
ojeda
force-pushed
the
indirect-branch-cs-prefix
branch
from
May 7, 2025 14:16
0582d8f to
b0392c5
Compare
Contributor
Author
|
@rustbot label F-target_modifiers A-rust-for-linux |
This comment has been minimized.
This comment has been minimized.
Contributor
Author
|
The error is related to the base PR -- I think this one should be clean (modulo the marked |
ojeda
force-pushed
the
indirect-branch-cs-prefix
branch
from
May 7, 2025 15:01
b0392c5 to
f395de3
Compare
This comment has been minimized.
This comment has been minimized.
ojeda
force-pushed
the
indirect-branch-cs-prefix
branch
from
May 7, 2025 17:15
f395de3 to
a79ff99
Compare
This comment has been minimized.
This comment has been minimized.
Darksonn
reviewed
May 8, 2025
ojeda
force-pushed
the
indirect-branch-cs-prefix
branch
from
May 8, 2025 17:09
a79ff99 to
879a3bc
Compare
This comment has been minimized.
This comment has been minimized.
17 of 53 tasks
This comment was marked as resolved.
This comment was marked as resolved.
ojeda
force-pushed
the
indirect-branch-cs-prefix
branch
from
June 15, 2025 12:47
879a3bc to
331c2b6
Compare
ojeda
marked this pull request as ready for review
June 16, 2025 04:39
Collaborator
|
rustbot has assigned @compiler-errors. Use |
-Zindirect-branch-cs-prefix on top of -Zretpoline*-Zindirect-branch-cs-prefix
Member
|
Assigning same reviewer as #135927. r? @davidtwco |
This is intended to be used for Linux kernel RETPOLINE builds. Signed-off-by: Miguel Ojeda <ojeda@kernel.org>
ojeda
force-pushed
the
indirect-branch-cs-prefix
branch
from
August 17, 2025 14:52
74ebaf9 to
1a29d9c
Compare
Collaborator
|
This PR was rebased onto a different master commit! Check out the changes with our |
Contributor
Author
This is what I suspected in #140740 (comment) -- I have re-added the Apple one. |
Member
|
@bors r+ |
Contributor
jhpratt
added a commit
to jhpratt/rust
that referenced
this pull request
Aug 18, 2025
…=davidtwco Add `-Zindirect-branch-cs-prefix` Cc: `@azhogin` `@Darksonn` This goes on top of rust-lang#135927, i.e. please skip the first commit here. Please feel free to inherit it there. In fact, I am not sure if there is any use case for the flag without `-Zretpoline*`. GCC and Clang allow it, though. There is a `FIXME` for two `ignore`s in the test that I took from another test I did in the past -- they may be needed or not here since I didn't run the full CI. Either way, it is not critical. Tracking issue: rust-lang#116852. MCP: rust-lang/compiler-team#868.
jhpratt
added a commit
to jhpratt/rust
that referenced
this pull request
Aug 18, 2025
…=davidtwco Add `-Zindirect-branch-cs-prefix` Cc: ``@azhogin`` ``@Darksonn`` This goes on top of rust-lang#135927, i.e. please skip the first commit here. Please feel free to inherit it there. In fact, I am not sure if there is any use case for the flag without `-Zretpoline*`. GCC and Clang allow it, though. There is a `FIXME` for two `ignore`s in the test that I took from another test I did in the past -- they may be needed or not here since I didn't run the full CI. Either way, it is not critical. Tracking issue: rust-lang#116852. MCP: rust-lang/compiler-team#868.
bors
added a commit
that referenced
this pull request
Aug 19, 2025
Rollup of 33 pull requests Successful merges: - #139345 (Extend `QueryStability` to handle `IntoIterator` implementations) - #140740 (Add `-Zindirect-branch-cs-prefix`) - #142079 (nll-relate: improve hr opaque types support) - #142938 (implement std::fs::set_permissions_nofollow on unix) - #144767 (Correct some grammar in integer documentation) - #144906 (Require approval from t-infra instead of t-release on tier bumps) - #144983 (Rehome 37 `tests/ui/issues/` tests to other subdirectories under `tests/ui/`) - #145025 (run spellcheck as a tidy extra check in ci) - #145166 (suggest using `pub(crate)` for E0364) - #145255 (dec2flt: Provide more valid inputs examples) - #145306 (Add tracing to various miscellaneous functions) - #145336 (Hide docs for `core::unicode`) - #145429 (Couple of codegen_fn_attrs improvements) - #145452 (Do not strip binaries in bootstrap everytime if they are unchanged) - #145464 (Stabilize `const_pathbuf_osstring_new` feature) - #145474 (Properly recover from parenthesized use-bounds (precise capturing lists) plus small cleanups) - #145486 (Fix `unicode_data.rs` mention message) - #145493 (remove `should_render` in `PrintAttribute` derive) - #145505 (Simplify span caches) - #145510 (Visit and print async_fut local for async drop.) - #145511 (Rust build fails on OpenBSD after using file_lock feature) - #145532 (resolve: debug for block module) - #145533 (Reorder `lto` options from most to least optimizing) - #145537 (Do not consider a `T: !Sized` candidate to satisfy a `T: !MetaSized` obligation.) - #145538 (bufreader::Buffer::backshift: don't move the uninit bytes) - #145542 (triagebot: Don't warn no-mentions on subtree updates) - #145549 (Update rust maintainers in openharmony.md) - #145550 (Avoid using `()` in `derive(From)` output.) - #145556 (Allow stability attributes on extern crates) - #145560 (Remove unused `PartialOrd`/`Ord` from bootstrap) - #145568 (ignore frontmatters in `TokenStream::new`) - #145571 (remove myself from some adhoc-groups and pings) - #145576 (Add change tracker entry for `--timings`) r? `@ghost` `@rustbot` modify labels: rollup
jieyouxu
added a commit
to jieyouxu/rust
that referenced
this pull request
Aug 19, 2025
…=davidtwco Add `-Zindirect-branch-cs-prefix` Cc: `@azhogin` `@Darksonn` This goes on top of rust-lang#135927, i.e. please skip the first commit here. Please feel free to inherit it there. In fact, I am not sure if there is any use case for the flag without `-Zretpoline*`. GCC and Clang allow it, though. There is a `FIXME` for two `ignore`s in the test that I took from another test I did in the past -- they may be needed or not here since I didn't run the full CI. Either way, it is not critical. Tracking issue: rust-lang#116852. MCP: rust-lang/compiler-team#868.
This was referenced Aug 19, 2025
bors
added a commit
that referenced
this pull request
Aug 19, 2025
Rollup of 15 pull requests Successful merges: - #139345 (Extend `QueryStability` to handle `IntoIterator` implementations) - #140740 (Add `-Zindirect-branch-cs-prefix`) - #142079 (nll-relate: improve hr opaque types support) - #142938 (implement std::fs::set_permissions_nofollow on unix) - #143730 (fmt of non-decimal radix untangled) - #144767 (Correct some grammar in integer documentation) - #144906 (Require approval from t-infra instead of t-release on tier bumps) - #144983 (Rehome 37 `tests/ui/issues/` tests to other subdirectories under `tests/ui/`) - #145025 (run spellcheck as a tidy extra check in ci) - #145099 (rustc_target: Add the `32s` target feature for LoongArch) - #145166 (suggest using `pub(crate)` for E0364) - #145255 (dec2flt: Provide more valid inputs examples) - #145306 (Add tracing to various miscellaneous functions) - #145336 (Hide docs for `core::unicode`) - #145585 (Miri: fix handling of in-place argument and return place handling) r? `@ghost` `@rustbot` modify labels: rollup
rust-timer
added a commit
that referenced
this pull request
Aug 19, 2025
Rollup merge of #140740 - ojeda:indirect-branch-cs-prefix, r=davidtwco Add `-Zindirect-branch-cs-prefix` Cc: ``@azhogin`` ``@Darksonn`` This goes on top of #135927, i.e. please skip the first commit here. Please feel free to inherit it there. In fact, I am not sure if there is any use case for the flag without `-Zretpoline*`. GCC and Clang allow it, though. There is a `FIXME` for two `ignore`s in the test that I took from another test I did in the past -- they may be needed or not here since I didn't run the full CI. Either way, it is not critical. Tracking issue: #116852. MCP: rust-lang/compiler-team#868.
Kobzol
pushed a commit
to Kobzol/rust
that referenced
this pull request
Aug 19, 2025
Rollup of 15 pull requests Successful merges: - rust-lang#139345 (Extend `QueryStability` to handle `IntoIterator` implementations) - rust-lang#140740 (Add `-Zindirect-branch-cs-prefix`) - rust-lang#142079 (nll-relate: improve hr opaque types support) - rust-lang#142938 (implement std::fs::set_permissions_nofollow on unix) - rust-lang#143730 (fmt of non-decimal radix untangled) - rust-lang#144767 (Correct some grammar in integer documentation) - rust-lang#144906 (Require approval from t-infra instead of t-release on tier bumps) - rust-lang#144983 (Rehome 37 `tests/ui/issues/` tests to other subdirectories under `tests/ui/`) - rust-lang#145025 (run spellcheck as a tidy extra check in ci) - rust-lang#145099 (rustc_target: Add the `32s` target feature for LoongArch) - rust-lang#145166 (suggest using `pub(crate)` for E0364) - rust-lang#145255 (dec2flt: Provide more valid inputs examples) - rust-lang#145306 (Add tracing to various miscellaneous functions) - rust-lang#145336 (Hide docs for `core::unicode`) - rust-lang#145585 (Miri: fix handling of in-place argument and return place handling) r? `@ghost` `@rustbot` modify labels: rollup
This was referenced Aug 19, 2025
github-actions Bot
pushed a commit
to rust-lang/miri
that referenced
this pull request
Aug 20, 2025
Rollup of 15 pull requests Successful merges: - rust-lang/rust#139345 (Extend `QueryStability` to handle `IntoIterator` implementations) - rust-lang/rust#140740 (Add `-Zindirect-branch-cs-prefix`) - rust-lang/rust#142079 (nll-relate: improve hr opaque types support) - rust-lang/rust#142938 (implement std::fs::set_permissions_nofollow on unix) - rust-lang/rust#143730 (fmt of non-decimal radix untangled) - rust-lang/rust#144767 (Correct some grammar in integer documentation) - rust-lang/rust#144906 (Require approval from t-infra instead of t-release on tier bumps) - rust-lang/rust#144983 (Rehome 37 `tests/ui/issues/` tests to other subdirectories under `tests/ui/`) - rust-lang/rust#145025 (run spellcheck as a tidy extra check in ci) - rust-lang/rust#145099 (rustc_target: Add the `32s` target feature for LoongArch) - rust-lang/rust#145166 (suggest using `pub(crate)` for E0364) - rust-lang/rust#145255 (dec2flt: Provide more valid inputs examples) - rust-lang/rust#145306 (Add tracing to various miscellaneous functions) - rust-lang/rust#145336 (Hide docs for `core::unicode`) - rust-lang/rust#145585 (Miri: fix handling of in-place argument and return place handling) r? `@ghost` `@rustbot` modify labels: rollup
ojeda
added a commit
to Rust-for-Linux/linux
that referenced
this pull request
Nov 17, 2026
The C compiler is asked to add a `cs` prefix to the `call` and `jmp`
instructions that go through the indirect thunks for the `r8`-`r15`
registers, which makes them 6 bytes long instead of 5. That gives
`patch_retpoline()` enough room to inline them, e.g. as `lfence; call
*%r11` for `spectre_v2=retpoline,lfence`.
However, Rust code does not get the prefix, e.g. for a
`CONFIG_MITIGATION_RETPOLINE=y` build:
$ objdump -dr rust/kernel.o
...
e2b: e8 00 00 00 00 call e30 <...>
e2c: R_X86_64_PLT32 __x86_indirect_thunk_r11-0x4
Moreover, since commit 4a1e02b ("x86,retpoline: Optimize
patch_retpoline()"), `emit_indirect()` assumes there is enough room
for the inlined sequence -- e.g. with `spectre_v2=retpoline,lfence`,
the kernel warns and dies while patching a site inside `core`:
WARNING: arch/x86/kernel/alternative.c:736 at apply_retpolines+0x2ee/0x400, CPU#0: swapper/0/0
...
Call Trace:
<TASK>
? _RNvMs6_NtNtCshS2CUL9MEDn_4core3fmt8buildersNtB5_9DebugList21finish_non_exhaustive+0x5b/0xd0
...
alternative_instructions+0x1d/0x60
arch_cpu_finalize_init+0x5a/0xb0
start_kernel+0x1f4/0x280
Similarly, paranoid FineIBT rewrites each kCFI call site into a fixed
20-byte sequence, i.e. the 14 bytes of the kCFI check plus a 6-byte
call. For a 5-byte call, that overwrites the first byte of the next
instruction, corrupting Rust code:
SMP alternatives: Using paranoid FineIBT CFI
...
Oops: double fault: 0000 [#1]
...
RIP: 0010:_RNvNtCsdVypMZsLRAh_4core3fmt5write+0x1e9/0x210
Code: ... b8 68 81 16 9f 41 3b 43 f5 2e 4d 8d 5b f0 75 fd 41 ff e3 <cc> c0 eb 02 b0 01 ...
...
Kernel panic - not syncing: Fatal exception in interrupt
Non-paranoid FineIBT is not affected, since it only rewrites the kCFI
check and leaves the call itself to `apply_retpolines()`.
We added support for `-Zindirect-branch-cs-prefix` [1][2] in Rust 1.91.0
[3]. Thus pass it for `RETPOLINE` builds when possible, which makes all
sites indeed get the prefix:
e3c: 2e e8 00 00 00 00 cs call e42 <...>
e3e: R_X86_64_PLT32 __x86_indirect_thunk_r11-0x4
The kernel above boots fine with `spectre_v2=retpoline,lfence`, inlining
the Rust sites as well.
For older Rust compilers, set the LLVM module flag instead, which
has the same code-generation effect. This means that every Rust version
that the kernel supports gets the prefix, that the kernel boots fine with
`spectre_v2=retpoline,lfence`, and that paranoid FineIBT no longer
corrupts.
In addition, add it to our target modifier workaround for `rustdoc`.
Cc: stable@vger.kernel.org # 6.18.y+
Link: rust-lang/rust#116852 [1]
Link: rust-lang/compiler-team#899 [2]
Link: rust-lang/rust#140740 [3]
Reported-by: Kent Overstreet <kent.overstreet@linux.dev>
Acked-by: Borislav Petkov <bp@alien8.de>
Link: https://patch.msgid.link/20261018175457.87803-1-ojeda@kernel.org
Signed-off-by: Miguel Ojeda <ojeda@kernel.org>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Cc: @azhogin @Darksonn
This goes on top of #135927, i.e. please skip the first commit here. Please feel free to inherit it there.
In fact, I am not sure if there is any use case for the flag without
-Zretpoline*. GCC and Clang allow it, though.There is a
FIXMEfor twoignores in the test that I took from another test I did in the past -- they may be needed or not here since I didn't run the full CI. Either way, it is not critical.Tracking issue: #116852.
MCP: rust-lang/compiler-team#899.