Commit 2ac636a6 authored by Sean Christopherson's avatar Sean Christopherson Committed by Paolo Bonzini
Browse files

KVM: nSVM: Add VMLOAD/VMSAVE helper to deduplicate code 



Add another helper layer for VMLOAD+VMSAVE, the code is identical except
for the one line that determines which VMCB is the source and which is
the destination.

No functional change intended.

Signed-off-by: default avatarSean Christopherson <seanjc@google.com>
Message-Id: <20210205005750.3841462-5-seanjc@google.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 3a87c7e0

arch/x86/kvm/svm/svm.c

+12 −25
Original line number Diff line number Diff line
@@ -2118,7 +2118,7 @@ static int vmmcall_interception(struct kvm_vcpu *vcpu) 
	return kvm_emulate_hypercall(vcpu);

}



static int vmload_interception(struct kvm_vcpu *vcpu)

static int vmload_vmsave_interception(struct kvm_vcpu *vcpu, bool vmload)

{

	struct vcpu_svm *svm = to_svm(vcpu);

	struct vmcb *vmcb12;
@@ -2139,37 +2139,24 @@ static int vmload_interception(struct kvm_vcpu *vcpu) 


	ret = kvm_skip_emulated_instruction(vcpu);



	if (vmload)

		nested_svm_vmloadsave(vmcb12, svm->vmcb);

	else

		nested_svm_vmloadsave(svm->vmcb, vmcb12);



	kvm_vcpu_unmap(vcpu, &map, true);



	return ret;

}



static int vmsave_interception(struct kvm_vcpu *vcpu)

static int vmload_interception(struct kvm_vcpu *vcpu)

{

	struct vcpu_svm *svm = to_svm(vcpu);

	struct vmcb *vmcb12;

	struct kvm_host_map map;

	int ret;



	if (nested_svm_check_permissions(vcpu))

		return 1;



	ret = kvm_vcpu_map(vcpu, gpa_to_gfn(svm->vmcb->save.rax), &map);

	if (ret) {

		if (ret == -EINVAL)

			kvm_inject_gp(vcpu, 0);

		return 1;

	return vmload_vmsave_interception(vcpu, true);

}



	vmcb12 = map.hva;



	ret = kvm_skip_emulated_instruction(vcpu);



	nested_svm_vmloadsave(svm->vmcb, vmcb12);

	kvm_vcpu_unmap(vcpu, &map, true);



	return ret;

static int vmsave_interception(struct kvm_vcpu *vcpu)

{

	return vmload_vmsave_interception(vcpu, false);

}



static int vmrun_interception(struct kvm_vcpu *vcpu)