diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2024-02-25 10:22:21 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2024-02-25 10:22:21 -0800 |
| commit | 1eee4ef38ca15137379028a5a7b0f859bd1bb9b0 (patch) | |
| tree | 7e017de2e623925c05132fda5d6912d7211f13ac /arch/x86/include/asm/entry-common.h | |
| parent | 8c46ed3740e27aeba30866ea3da4bc41b08f98a4 (diff) | |
| parent | 43fb862de8f628c5db5e96831c915b9aebf62d33 (diff) | |
| download | lwn-1eee4ef38ca15137379028a5a7b0f859bd1bb9b0.tar.gz lwn-1eee4ef38ca15137379028a5a7b0f859bd1bb9b0.zip | |
Merge tag 'x86_urgent_for_v6.8_rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 fixes from Borislav Petkov:
- Make sure clearing CPU buffers using VERW happens at the latest
possible point in the return-to-userspace path, otherwise memory
accesses after the VERW execution could cause data to land in CPU
buffers again
* tag 'x86_urgent_for_v6.8_rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
KVM/VMX: Move VERW closer to VMentry for MDS mitigation
KVM/VMX: Use BT+JNC, i.e. EFLAGS.CF to select VMRESUME vs. VMLAUNCH
x86/bugs: Use ALTERNATIVE() instead of mds_user_clear static key
x86/entry_32: Add VERW just before userspace transition
x86/entry_64: Add VERW just before userspace transition
x86/bugs: Add asm helpers for executing VERW
Diffstat (limited to 'arch/x86/include/asm/entry-common.h')
| -rw-r--r-- | arch/x86/include/asm/entry-common.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/x86/include/asm/entry-common.h b/arch/x86/include/asm/entry-common.h index ce8f50192ae3..7e523bb3d2d3 100644 --- a/arch/x86/include/asm/entry-common.h +++ b/arch/x86/include/asm/entry-common.h @@ -91,7 +91,6 @@ static inline void arch_exit_to_user_mode_prepare(struct pt_regs *regs, static __always_inline void arch_exit_to_user_mode(void) { - mds_user_clear_cpu_buffers(); amd_clear_divider(); } #define arch_exit_to_user_mode arch_exit_to_user_mode |