diff options
| author | Miguel Ojeda <ojeda@kernel.org> | 2026-10-18 19:54:57 +0200 |
|---|---|---|
| committer | Miguel Ojeda <ojeda@kernel.org> | 2026-11-17 07:17:46 +0100 |
| commit | 1eaa31fa41125db78a50abef7f0a35aa22af40d0 (patch) | |
| tree | eb991495d726d6b37f1273c5a33e0e69a736150b /include/uapi/linux | |
| parent | 1846c049cfe325abe0be8d1ea50eda16aa02d1a8 (diff) | |
x86/rust: use `-Zindirect-branch-cs-prefix` for RETPOLINE builds
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 4a1e02b15ac1 ("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: https://github.com/rust-lang/rust/issues/116852 [1]
Link: https://github.com/rust-lang/compiler-team/issues/899 [2]
Link: https://github.com/rust-lang/rust/pull/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>
Diffstat (limited to 'include/uapi/linux')
0 files changed, 0 insertions, 0 deletions
