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

KVM: x86: add kvm_leave_nested 



add kvm_leave_nested which wraps a call to nested_ops->leave_nested
into a function.

Cc: stable@vger.kernel.org
Signed-off-by: default avatarMaxim Levitsky <mlevitsk@redhat.com>
Message-Id: <20221103141351.50662-4-mlevitsk@redhat.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 16ae56d7

arch/x86/kvm/svm/nested.c

+0 −3
Original line number Diff line number Diff line
@@ -1146,9 +1146,6 @@ void svm_free_nested(struct vcpu_svm *svm) 
	svm->nested.initialized = false;

}



/*

 * Forcibly leave nested mode in order to be able to reset the VCPU later on.

 */

void svm_leave_nested(struct kvm_vcpu *vcpu)

{

	struct vcpu_svm *svm = to_svm(vcpu);

arch/x86/kvm/vmx/nested.c

+0 −3
Original line number Diff line number Diff line
@@ -6440,9 +6440,6 @@ static int vmx_get_nested_state(struct kvm_vcpu *vcpu, 
	return kvm_state.size;

}



/*

 * Forcibly leave nested mode in order to be able to reset the VCPU later on.

 */

void vmx_leave_nested(struct kvm_vcpu *vcpu)

{

	if (is_guest_mode(vcpu)) {

arch/x86/kvm/x86.c

+7 −1
Original line number Diff line number Diff line
@@ -628,6 +628,12 @@ static void kvm_queue_exception_vmexit(struct kvm_vcpu *vcpu, unsigned int vecto 
	ex->payload = payload;

}



/* Forcibly leave the nested mode in cases like a vCPU reset */

static void kvm_leave_nested(struct kvm_vcpu *vcpu)

{

	kvm_x86_ops.nested_ops->leave_nested(vcpu);

}



static void kvm_multiple_exception(struct kvm_vcpu *vcpu,

		unsigned nr, bool has_error, u32 error_code,

	        bool has_payload, unsigned long payload, bool reinject)
@@ -5195,7 +5201,7 @@ static int kvm_vcpu_ioctl_x86_set_vcpu_events(struct kvm_vcpu *vcpu, 


	if (events->flags & KVM_VCPUEVENT_VALID_SMM) {

		if (!!(vcpu->arch.hflags & HF_SMM_MASK) != events->smi.smm) {

			kvm_x86_ops.nested_ops->leave_nested(vcpu);

			kvm_leave_nested(vcpu);

			kvm_smm_changed(vcpu, events->smi.smm);

		}