Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

KVM: SVM: Activate nested state only when guest state is complete

Browse source 
Certain functions called during the emulated world switch
behave differently when the vcpu is running nested. This is
not the expected behavior during a world switch emulation.
This patch ensures that the nested state is activated only
if the vcpu is completly in nested state.

Signed-off-by: Joerg Roedel <joerg.roedel@amd.com>
Signed-off-by: Avi Kivity <avi@redhat.com>
This commit is contained in:
Joerg Roedel 2010-02-19 16:23:07 +01:00 committed by Avi Kivity
parent 88ab24adc7
commit 06fc777269
1 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
arch/x86/kvm/svm.c
View file

@ -1633,6 +1633,9 @@ static int nested_svm_vmexit(struct vcpu_svm *svm)
if (!nested_vmcb) if (!nested_vmcb)
return 1; return 1;
/* Exit nested SVM mode */
svm->nested.vmcb = 0;
/* Give the current vmcb to the guest */ /* Give the current vmcb to the guest */
disable_gif(svm); disable_gif(svm);
@ -1720,9 +1723,6 @@ static int nested_svm_vmexit(struct vcpu_svm *svm)
svm->vmcb->save.cpl = 0; svm->vmcb->save.cpl = 0;
svm->vmcb->control.exit_int_info = 0; svm->vmcb->control.exit_int_info = 0;
/* Exit nested SVM mode */
svm->nested.vmcb = 0;
nested_svm_unmap(page); nested_svm_unmap(page);
kvm_mmu_reset_context(&svm->vcpu); kvm_mmu_reset_context(&svm->vcpu);
@ -1757,14 +1757,14 @@ static bool nested_svm_vmrun(struct vcpu_svm *svm)
struct vmcb *hsave = svm->nested.hsave; struct vmcb *hsave = svm->nested.hsave;
struct vmcb *vmcb = svm->vmcb; struct vmcb *vmcb = svm->vmcb;
struct page *page; struct page *page;
u64 vmcb_gpa;
vmcb_gpa = svm->vmcb->save.rax;
nested_vmcb = nested_svm_map(svm, svm->vmcb->save.rax, &page); nested_vmcb = nested_svm_map(svm, svm->vmcb->save.rax, &page);
if (!nested_vmcb) if (!nested_vmcb)
return false; return false;
/* nested_vmcb is our indicator if nested SVM is activated */
svm->nested.vmcb = svm->vmcb->save.rax;
trace_kvm_nested_vmrun(svm->vmcb->save.rip - 3, svm->nested.vmcb, trace_kvm_nested_vmrun(svm->vmcb->save.rip - 3, svm->nested.vmcb,
nested_vmcb->save.rip, nested_vmcb->save.rip,
nested_vmcb->control.int_ctl, nested_vmcb->control.int_ctl,
@ -1879,6 +1879,9 @@ static bool nested_svm_vmrun(struct vcpu_svm *svm)
nested_svm_unmap(page); nested_svm_unmap(page);
/* nested_vmcb is our indicator if nested SVM is activated */
svm->nested.vmcb = vmcb_gpa;
enable_gif(svm); enable_gif(svm);
return true; return true;