Commit 0a758290 authored by Vitaly Kuznetsov's avatar Vitaly Kuznetsov Committed by Paolo Bonzini
Browse files

KVM: nSVM: Introduce svm_copy_vmrun_state() 



Separate the code setting non-VMLOAD-VMSAVE state from
svm_set_nested_state() into its own function. This is going to be
re-used from svm_enter_smm()/svm_leave_smm().

Signed-off-by: default avatarVitaly Kuznetsov <vkuznets@redhat.com>
Message-Id: <20210628104425.391276-4-vkuznets@redhat.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent fb79f566

arch/x86/kvm/svm/nested.c

+22 −18
Original line number Diff line number Diff line
@@ -701,6 +701,27 @@ int nested_svm_vmrun(struct kvm_vcpu *vcpu) 
	return ret;

}



/* Copy state save area fields which are handled by VMRUN */

void svm_copy_vmrun_state(struct vmcb_save_area *from_save,

			  struct vmcb_save_area *to_save)

{

	to_save->es = from_save->es;

	to_save->cs = from_save->cs;

	to_save->ss = from_save->ss;

	to_save->ds = from_save->ds;

	to_save->gdtr = from_save->gdtr;

	to_save->idtr = from_save->idtr;

	to_save->rflags = from_save->rflags | X86_EFLAGS_FIXED;

	to_save->efer = from_save->efer;

	to_save->cr0 = from_save->cr0;

	to_save->cr3 = from_save->cr3;

	to_save->cr4 = from_save->cr4;

	to_save->rax = from_save->rax;

	to_save->rsp = from_save->rsp;

	to_save->rip = from_save->rip;

	to_save->cpl = 0;

}



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

{

	to_vmcb->save.fs = from_vmcb->save.fs;
@@ -1364,28 +1385,11 @@ static int svm_set_nested_state(struct kvm_vcpu *vcpu, 


	svm->nested.vmcb12_gpa = kvm_state->hdr.svm.vmcb_pa;



	svm->vmcb01.ptr->save.es = save->es;

	svm->vmcb01.ptr->save.cs = save->cs;

	svm->vmcb01.ptr->save.ss = save->ss;

	svm->vmcb01.ptr->save.ds = save->ds;

	svm->vmcb01.ptr->save.gdtr = save->gdtr;

	svm->vmcb01.ptr->save.idtr = save->idtr;

	svm->vmcb01.ptr->save.rflags = save->rflags | X86_EFLAGS_FIXED;

	svm->vmcb01.ptr->save.efer = save->efer;

	svm->vmcb01.ptr->save.cr0 = save->cr0;

	svm->vmcb01.ptr->save.cr3 = save->cr3;

	svm->vmcb01.ptr->save.cr4 = save->cr4;

	svm->vmcb01.ptr->save.rax = save->rax;

	svm->vmcb01.ptr->save.rsp = save->rsp;

	svm->vmcb01.ptr->save.rip = save->rip;

	svm->vmcb01.ptr->save.cpl = 0;



	svm_copy_vmrun_state(save, &svm->vmcb01.ptr->save);

	nested_load_control_from_vmcb12(svm, ctl);



	svm_switch_vmcb(svm, &svm->nested.vmcb02);



	nested_vmcb02_prepare_control(svm);



	kvm_make_request(KVM_REQ_GET_NESTED_STATE_PAGES, vcpu);

	ret = 0;

out_free:

arch/x86/kvm/svm/svm.h

+2 −0
Original line number Diff line number Diff line
@@ -464,6 +464,8 @@ void svm_leave_nested(struct vcpu_svm *svm); 
void svm_free_nested(struct vcpu_svm *svm);

int svm_allocate_nested(struct vcpu_svm *svm);

int nested_svm_vmrun(struct kvm_vcpu *vcpu);

void svm_copy_vmrun_state(struct vmcb_save_area *from_save,

			  struct vmcb_save_area *to_save);

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

int nested_svm_vmexit(struct vcpu_svm *svm);