github/acrn-hypervisor
1
0
Fork 0
mirror of https://github.com/projectacrn/acrn-hypervisor.git synced 2025-08-15 06:44:58 +00:00
Code Issues Projects Releases Wiki Activity

hv: nested: update run_vcpu() function for nested case

Browse Source 
Since L2 guest vCPU mode and VPID are managed by L1 hypervisor, so we
can skip these handling in run_vcpu().

And be careful that we can't cache L2 registers in struct acrn_vcpu.

Tracked-On: #5923
Signed-off-by: Zide Chen <zide.chen@intel.com>
Acked-by: Eddie Dong <eddie.dong@intel.com>
This commit is contained in:
Zide Chen 2021-05-27 14:10:12 -07:00 committed by wenlingz
parent f97e8738fc
commit 6224678e20
1 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
hypervisor/arch/x86/guest/vcpu.c
View File

@ -633,7 +633,8 @@ int32_t run_vcpu(struct acrn_vcpu *vcpu)
pr_info("VM %d Starting VCPU %hu", pr_info("VM %d Starting VCPU %hu",
vcpu->vm->vm_id, vcpu->vcpu_id); vcpu->vm->vm_id, vcpu->vcpu_id);
if (vcpu->arch.vpid != 0U) { /* VMX_VPID for l2 guests is not managed in this way */
if (!is_vcpu_in_l2_guest(vcpu) && (vcpu->arch.vpid != 0U)) {
exec_vmwrite16(VMX_VPID, vcpu->arch.vpid); exec_vmwrite16(VMX_VPID, vcpu->arch.vpid);
} }
@ -699,16 +700,24 @@ int32_t run_vcpu(struct acrn_vcpu *vcpu)
vcpu->reg_cached = 0UL; vcpu->reg_cached = 0UL;
cs_attr = exec_vmread32(VMX_GUEST_CS_ATTR); /*
ia32_efer = vcpu_get_efer(vcpu); * - can not call vcpu_get_xxx() when vmcs02 is current, or it could mess up
cr0 = vcpu_get_cr0(vcpu); * the cached registers for the L1 guest
set_vcpu_mode(vcpu, cs_attr, ia32_efer, cr0); * - the L2 guests' vcpu mode is managed by L1 hypervisor
* - ctx->cpu_regs.regs.rsp doesn't cache nested guests' RSP
*/
if (!is_vcpu_in_l2_guest(vcpu)) {
cs_attr = exec_vmread32(VMX_GUEST_CS_ATTR);
ia32_efer = vcpu_get_efer(vcpu);
cr0 = vcpu_get_cr0(vcpu);
set_vcpu_mode(vcpu, cs_attr, ia32_efer, cr0);
ctx->cpu_regs.regs.rsp = exec_vmread(VMX_GUEST_RSP);
}
/* Obtain current VCPU instruction length */ /* Obtain current VCPU instruction length */
vcpu->arch.inst_len = exec_vmread32(VMX_EXIT_INSTR_LEN); vcpu->arch.inst_len = exec_vmread32(VMX_EXIT_INSTR_LEN);
ctx->cpu_regs.regs.rsp = exec_vmread(VMX_GUEST_RSP);
/* Obtain VM exit reason */ /* Obtain VM exit reason */
vcpu->arch.exit_reason = exec_vmread32(VMX_EXIT_REASON); vcpu->arch.exit_reason = exec_vmread32(VMX_EXIT_REASON);