Zen5+ AMD CPUs have a larger RSB (64 entries on Zen5), and use all of it in the host context. The hypervisor needs to set up a couple things before it's exposed to guests. This patch adds the support to enable guests to drop their software mitigations in favour of the hardware one. The feature isn't yet part of an APM update that details its working, and previous versions of the patch were RFC for that reason. I'm now dropping the RFC tag, because these patches have been out for a while, and I also have this writeup: https://amitshah.net/2024/11/eraps-reduces-software-tax-for-hardware-bugs/ which may be more detailsl than what will eventually appear in the APM anyway. v5: * Drop RFC tag * Add separate VMCB01/VMCB02 handling to ensure both L1 and L2 guests are not affected by each other's RSB entries * Rename vmcb_flush_guest_rap() back to vmcb_set_flush_guest_rap(). The previous name did not feel right because the call to the function only sets a bit in the VMCB which the CPU acts on much later (at VMRUN). v4: * Address Sean's comments from v3 * remove a bunch of comments in favour of a better commit message * Drop patch 1 from the series - Josh's patches handle the most common case, and the AutoIBRS-disabled case can be tackled later if required after Josh's patches have been merged upstream. v3: * rebase on top of Josh's RSB tweaks series * with that rebase, only the non-AutoIBRS case needs special ERAPS support. AutoIBRS is currently disabled when SEV-SNP is active (commit acaa4b5c4c8) * remove comment about RSB_CLEAR_LOOPS and the size of the RSB -- it's not necessary anymore with the rework * remove comment from patch 2 in svm.c in favour of the commit message v2: * reword comments to highlight context switch as the main trigger for RSB flushes in hardware (Dave Hansen) * Split out outdated comment updates in (v1) patch1 to be a standalone patch1 in this series, to reinforce RSB filling is only required for RSB poisoning cases for AMD * Remove mentions of BTC/BTC_NO (Andrew Cooper) * Add braces in case stmt (kernel test robot) * s/boot_cpu_has/cpu_feature_enabled (Boris Petkov) Amit Shah (1): x86: kvm: svm: set up ERAPS support for guests arch/x86/include/asm/cpufeatures.h | 1 + arch/x86/include/asm/svm.h | 6 +++++- arch/x86/kvm/cpuid.c | 10 +++++++++- arch/x86/kvm/svm/svm.c | 14 ++++++++++++++ arch/x86/kvm/svm/svm.h | 20 ++++++++++++++++++++ 5 files changed, 49 insertions(+), 2 deletions(-) -- 2.49.0
