Commit e2e6e449 authored by Maxim Levitsky's avatar Maxim Levitsky Committed by Paolo Bonzini
Browse files

KVM: x86: nSVM: restore the L1 host state prior to resuming nested guest on SMM exit 



Otherwise guest entry code might see incorrect L1 state (e.g paging state).

Fixes: 37be407b ("KVM: nSVM: Fix L1 state corruption upon return from SMM")

Signed-off-by: default avatarMaxim Levitsky <mlevitsk@redhat.com>
Message-Id: <20210913140954.165665-3-mlevitsk@redhat.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 8d68bad6

arch/x86/kvm/svm/svm.c

+7 −5
Original line number Diff line number Diff line
@@ -4351,11 +4351,6 @@ static int svm_leave_smm(struct kvm_vcpu *vcpu, const char *smstate) 
			if (svm_allocate_nested(svm))

				return 1;



			vmcb12 = map.hva;



			nested_load_control_from_vmcb12(svm, &vmcb12->control);



			ret = enter_svm_guest_mode(vcpu, vmcb12_gpa, vmcb12);

			kvm_vcpu_unmap(vcpu, &map, true);



			/*
@@ -4369,6 +4364,13 @@ static int svm_leave_smm(struct kvm_vcpu *vcpu, const char *smstate) 
			svm_copy_vmrun_state(&svm->vmcb01.ptr->save,

					     map_save.hva + 0x400);



			/*

			 * Enter the nested guest now

			 */

			vmcb12 = map.hva;

			nested_load_control_from_vmcb12(svm, &vmcb12->control);

			ret = enter_svm_guest_mode(vcpu, vmcb12_gpa, vmcb12);



			kvm_vcpu_unmap(vcpu, &map_save, true);

		}

	}