Commit 69c9dfa2 authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

KVM: nSVM: move map argument out of enter_svm_guest_mode 



Unmapping the nested VMCB in enter_svm_guest_mode is a bit of a wart,
since the map argument is not used elsewhere in the function.  There are
just two callers, and those are also the place where kvm_vcpu_map is
called, so it is cleaner to unmap there.

Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent df7e0681

arch/x86/kvm/svm/nested.c

+6 −8
Original line number Diff line number Diff line
@@ -229,7 +229,7 @@ static bool nested_vmcb_checks(struct vmcb *vmcb) 
}



void enter_svm_guest_mode(struct vcpu_svm *svm, u64 vmcb_gpa,

			  struct vmcb *nested_vmcb, struct kvm_host_map *map)

			  struct vmcb *nested_vmcb)

{

	bool evaluate_pending_interrupts =

		is_intercept(svm, INTERCEPT_VINTR) ||
@@ -304,8 +304,6 @@ void enter_svm_guest_mode(struct vcpu_svm *svm, u64 vmcb_gpa, 
	svm->vmcb->control.pause_filter_thresh =

		nested_vmcb->control.pause_filter_thresh;



	kvm_vcpu_unmap(&svm->vcpu, map, true);



	/* Enter Guest-Mode */

	enter_guest_mode(&svm->vcpu);
@@ -368,10 +366,7 @@ int nested_svm_vmrun(struct vcpu_svm *svm) 
		nested_vmcb->control.exit_code_hi = 0;

		nested_vmcb->control.exit_info_1  = 0;

		nested_vmcb->control.exit_info_2  = 0;



		kvm_vcpu_unmap(&svm->vcpu, &map, true);



		return ret;

		goto out;

	}



	trace_kvm_nested_vmrun(svm->vmcb->save.rip, vmcb_gpa,
@@ -414,7 +409,7 @@ int nested_svm_vmrun(struct vcpu_svm *svm) 
	copy_vmcb_control_area(hsave, vmcb);



	svm->nested.nested_run_pending = 1;

	enter_svm_guest_mode(svm, vmcb_gpa, nested_vmcb, &map);

	enter_svm_guest_mode(svm, vmcb_gpa, nested_vmcb);



	if (!nested_svm_vmrun_msrpm(svm)) {

		svm->vmcb->control.exit_code    = SVM_EXIT_ERR;
@@ -425,6 +420,9 @@ int nested_svm_vmrun(struct vcpu_svm *svm) 
		nested_svm_vmexit(svm);

	}



out:

	kvm_vcpu_unmap(&svm->vcpu, &map, true);



	return ret;

}

arch/x86/kvm/svm/svm.c

+2 −1
Original line number Diff line number Diff line
@@ -3814,7 +3814,8 @@ static int svm_pre_leave_smm(struct kvm_vcpu *vcpu, const char *smstate) 
		if (kvm_vcpu_map(&svm->vcpu, gpa_to_gfn(vmcb), &map) == -EINVAL)

			return 1;

		nested_vmcb = map.hva;

		enter_svm_guest_mode(svm, vmcb, nested_vmcb, &map);

		enter_svm_guest_mode(svm, vmcb, nested_vmcb);

		kvm_vcpu_unmap(&svm->vcpu, &map, true);

	}

	return 0;

}

arch/x86/kvm/svm/svm.h

+1 −1
Original line number Diff line number Diff line
@@ -395,7 +395,7 @@ static inline bool nested_exit_on_nmi(struct vcpu_svm *svm) 
}



void enter_svm_guest_mode(struct vcpu_svm *svm, u64 vmcb_gpa,

			  struct vmcb *nested_vmcb, struct kvm_host_map *map);

			  struct vmcb *nested_vmcb);

int nested_svm_vmrun(struct vcpu_svm *svm);

void nested_svm_vmloadsave(struct vmcb *from_vmcb, struct vmcb *to_vmcb);

int nested_svm_vmexit(struct vcpu_svm *svm);