Commit 52c47f58 authored by Sean Christopherson's avatar Sean Christopherson
Browse files

KVM: SVM: Use KVM's snapshot of the host's XCR0 for SEV-ES host state 

Use KVM's snapshot of the host's XCR0 when stuffing SEV-ES host state
instead of reading XCR0 from hardware.  XCR0 is only written during
boot, i.e. won't change while KVM is running (and KVM at large is hosed
if that doesn't hold true).

Link: https://lore.kernel.org/r/20240423221521.2923759-3-seanjc@google.com


Signed-off-by: default avatarSean Christopherson <seanjc@google.com>
parent 7974c064

arch/x86/kvm/svm/sev.c

+1 −1
Original line number Diff line number Diff line
@@ -3322,7 +3322,7 @@ void sev_es_prepare_switch_to_guest(struct vcpu_svm *svm, struct sev_es_save_are 
	 * isn't saved by VMRUN, that isn't already saved by VMSAVE (performed

	 * by common SVM code).

	 */

	hostsa->xcr0 = xgetbv(XCR_XFEATURE_ENABLED_MASK);

	hostsa->xcr0 = kvm_host.xcr0;

	hostsa->pkru = read_pkru();

	hostsa->xss = kvm_host.xss;