evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

KVM: x86: clean up reexecute_instruction

Browse source 
Little cleanup for reexecute_instruction, also use gpa_to_gfn in
retry_instruction

Reviewed-by: Gleb Natapov <gleb@redhat.com>
Signed-off-by: Xiao Guangrong <xiaoguangrong@linux.vnet.ibm.com>
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
This commit is contained in:
Xiao Guangrong 2013-01-13 23:44:12 +08:00 • committed by Marcelo Tosatti
parent a843fac253
commit 22368028fe
1 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
arch/x86/kvm/x86.c
View file

@ -4759,19 +4759,18 @@ static bool reexecute_instruction(struct kvm_vcpu *vcpu, gva_t gva)
if (tdp_enabled) if (tdp_enabled)
return false; return false;
gpa = kvm_mmu_gva_to_gpa_system(vcpu, gva, NULL);
if (gpa == UNMAPPED_GVA)
return true; /* let cpu generate fault */
/* /*
* if emulation was due to access to shadowed page table * if emulation was due to access to shadowed page table
* and it failed try to unshadow page and re-enter the * and it failed try to unshadow page and re-enter the
* guest to let CPU execute the instruction. * guest to let CPU execute the instruction.
*/ */
if (kvm_mmu_unprotect_page_virt(vcpu, gva)) if (kvm_mmu_unprotect_page(vcpu->kvm, gpa_to_gfn(gpa)))
return true; return true;
gpa = kvm_mmu_gva_to_gpa_system(vcpu, gva, NULL);
if (gpa == UNMAPPED_GVA)
return true; /* let cpu generate fault */
/* /*
* Do not retry the unhandleable instruction if it faults on the * Do not retry the unhandleable instruction if it faults on the
* readonly host memory, otherwise it will goto a infinite loop: * readonly host memory, otherwise it will goto a infinite loop:
@ -4826,7 +4825,7 @@ static bool retry_instruction(struct x86_emulate_ctxt *ctxt,
if (!vcpu->arch.mmu.direct_map) if (!vcpu->arch.mmu.direct_map)
gpa = kvm_mmu_gva_to_gpa_write(vcpu, cr2, NULL); gpa = kvm_mmu_gva_to_gpa_write(vcpu, cr2, NULL);
kvm_mmu_unprotect_page(vcpu->kvm, gpa >> PAGE_SHIFT); kvm_mmu_unprotect_page(vcpu->kvm, gpa_to_gfn(gpa));
return true; return true;
} }