KVM: VMX: Explicitly clear RFLAGS.CF and RFLAGS.ZF in VM-Exit RSB path
PATCH 1/1 KVM: VMX: Explicitly clear RFLAGS.CF and RFLAGS.ZF in VM-Exit RSB path
Clear CF and ZF in the VM-Exit path after doing __FILL_RETURN_BUFFER so that KVM doesn't interpret clobbered RFLAGS as a VM-Fail. Filling the RSB has always clobbered RFLAGS, its current incarnation just happens clear CF and ZF in the processs. Relying on the macro to clear CF and ZF is extremely fragile, e.g. commit 089dd8e53126e ("x86/speculation:
Change FILL_RETURN_BUFFER to work with objtool") tweaks the loop such that the ZF flag is always set.
--- arch/x86/kvm/vmx/vmenter.S | 3 +++ 1 file changed, 3 insertions(+)
arch/x86/kvm/vmx/vmenter.S +3 -0
@@ -82,6 +82,9 @@ SYM_FUNC_START(vmx_vmexit) /* IMPORTANT: Stuff the RSB immediately after VM-Exit, before RET! */ FILL_RETURN_BUFFER %_ASM_AX, RSB_CLEAR_LOOPS, X86_FEATURE_RETPOLINE + /* Clear RFLAGS.CF and RFLAGS.ZF to preserve VM-Exit, i.e. !VM-Fail. */ + or $1, %_ASM_AX + pop %_ASM_AX .Lvmexit_skip_rsb: #endif
Signature · 1 line
2.26.0
Quoted 25 lines · Sean Christopherson
Clear CF and ZF in the VM-Exit path after doing
__FILL_RETURN_BUFFERso that KVM doesn't interpret clobbered RFLAGS as a VM-Fail. Filling the RSB has always clobbered RFLAGS, its current incarnation just happens clear CF and ZF in the processs. Relying on the macro to clear CF and ZF is extremely fragile, e.g. commit089dd8e53126e("x86/speculation:
ChangeFILL_RETURN_BUFFERto work with objtool") tweaks the loop such that the ZF flag is always set.Reported-by Qian Cai <[email protected]>Cc Rick Edgecombe <[email protected]>Cc Peter Zijlstra (Intel) <[email protected]>Cc Josh Poimboeuf <[email protected]>Fixes f2fde6a5bcfcf ("KVM: VMX: Move RSB stuffing to before the first RET after VM-Exit")Signed-off-by Sean Christopherson <[email protected]>--- arch/x86/kvm/vmx/vmenter.S | 3 +++ 1 file changed, 3 insertions(+)arch/x86/kvm/vmx/vmenter.S +0
-0
arch/x86/kvm/vmx/vmenter.S SYM_FUNC_START(vmx_vmexit) · line 90
Quoted 9 lines
arch/x86/kvm/vmx/vmenter.S +3
-0@@ -82,6 +82,9 @@ SYM_FUNC_START(vmx_vmexit) /* IMPORTANT: Stuff the RSB immediately after VM-Exit, before RET! */ FILL_RETURN_BUFFER %_ASM_AX, RSB_CLEAR_LOOPS, X86_FEATURE_RETPOLINE + /* Clear RFLAGS.CF and RFLAGS.ZF to preserve VM-Exit, i.e. !VM-Fail. */ + or $1, %_ASM_AX + pop %_ASM_AX .Lvmexit_skip_rsb: #endif
Queued, thanks (for 5.7 so that it will never be broken in Linus's tree).
Paolo