]> git.ipfire.org Git - thirdparty/linux.git/commit
x86/bhi: Do not set BHI_DIS_S in 32-bit mode
authorPawan Gupta <pawan.kumar.gupta@linux.intel.com>
Mon, 5 May 2025 21:35:12 +0000 (14:35 -0700)
committerDave Hansen <dave.hansen@linux.intel.com>
Tue, 6 May 2025 15:18:59 +0000 (08:18 -0700)
commit073fdbe02c69c43fb7c0d547ec265c7747d4a646
tree453bb3e1a7c95014cea041fd2f1779594171db80
parent9f725eec8fc0b39bdc07dcc8897283c367c1a163
x86/bhi: Do not set BHI_DIS_S in 32-bit mode

With the possibility of intra-mode BHI via cBPF, complete mitigation for
BHI is to use IBHF (history fence) instruction with BHI_DIS_S set. Since
this new instruction is only available in 64-bit mode, setting BHI_DIS_S in
32-bit mode is only a partial mitigation.

Do not set BHI_DIS_S in 32-bit mode so as to avoid reporting misleading
mitigated status. With this change IBHF won't be used in 32-bit mode, also
remove the CONFIG_X86_64 check from emit_spectre_bhb_barrier().

Suggested-by: Josh Poimboeuf <jpoimboe@kernel.org>
Signed-off-by: Pawan Gupta <pawan.kumar.gupta@linux.intel.com>
Signed-off-by: Dave Hansen <dave.hansen@linux.intel.com>
Reviewed-by: Josh Poimboeuf <jpoimboe@kernel.org>
Reviewed-by: Alexandre Chartre <alexandre.chartre@oracle.com>
arch/x86/kernel/cpu/bugs.c
arch/x86/net/bpf_jit_comp.c