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

hv: code cleanup in run_vcpu()

Browse Source 
- wrap a new function exec_vmentry() to reduce code duplication.
- remove exec_vmread(VMX_GUEST_RSP) since ACRN doesn't need to know
  guest RSP in run time.

Tracked-On: #6289
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-08-20 19:12:41 -07:00 committed by wenlingz
parent ee12daff84
commit b7e9a68923
1 changed files with 18 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -602,6 +602,21 @@ int32_t create_vcpu(uint16_t pcpu_id, struct acrn_vm *vm, struct acrn_vcpu **rtn
return ret; return ret;
} }
/**
* @pre ctx != NULL
*/
static inline int32_t exec_vmentry(struct run_context *ctx, int32_t launch_type, int32_t ibrs_type)
{
#ifdef CONFIG_L1D_FLUSH_VMENTRY_ENABLED
cpu_l1d_flush();
#endif
/* Mitigation for MDS vulnerability, overwrite CPU internal buffers */
cpu_internal_buffers_clear();
return vmx_vmrun(ctx, launch_type, ibrs_type);
}
/* /*
* @pre vcpu != NULL * @pre vcpu != NULL
*/ */
@ -689,15 +704,8 @@ int32_t run_vcpu(struct acrn_vcpu *vcpu)
msr_write(MSR_IA32_PRED_CMD, PRED_SET_IBPB); msr_write(MSR_IA32_PRED_CMD, PRED_SET_IBPB);
} }
#ifdef CONFIG_L1D_FLUSH_VMENTRY_ENABLED
cpu_l1d_flush();
#endif
/*Mitigation for MDS vulnerability, overwrite CPU internal buffers */
cpu_internal_buffers_clear();
/* Launch the VM */ /* Launch the VM */
status = vmx_vmrun(ctx, VM_LAUNCH, ibrs_type); status = exec_vmentry(ctx, VM_LAUNCH, ibrs_type);
/* See if VM launched successfully */ /* See if VM launched successfully */
if (status == 0) { if (status == 0) {
@ -712,17 +720,10 @@ int32_t run_vcpu(struct acrn_vcpu *vcpu)
*/ */
instlen = vcpu->arch.inst_len; instlen = vcpu->arch.inst_len;
rip = vcpu_get_rip(vcpu); rip = vcpu_get_rip(vcpu);
exec_vmwrite(VMX_GUEST_RIP, ((rip+(uint64_t)instlen) & exec_vmwrite(VMX_GUEST_RIP, rip + instlen);
0xFFFFFFFFFFFFFFFFUL));
#ifdef CONFIG_L1D_FLUSH_VMENTRY_ENABLED
cpu_l1d_flush();
#endif
/* Mitigation for MDS vulnerability, overwrite CPU internal buffers */
cpu_internal_buffers_clear();
/* Resume the VM */ /* Resume the VM */
status = vmx_vmrun(ctx, VM_RESUME, ibrs_type); status = exec_vmentry(ctx, VM_RESUME, ibrs_type);
} }
vcpu->reg_cached = 0UL; vcpu->reg_cached = 0UL;
@ -738,8 +739,6 @@ int32_t run_vcpu(struct acrn_vcpu *vcpu)
ia32_efer = vcpu_get_efer(vcpu); ia32_efer = vcpu_get_efer(vcpu);
cr0 = vcpu_get_cr0(vcpu); cr0 = vcpu_get_cr0(vcpu);
set_vcpu_mode(vcpu, cs_attr, ia32_efer, cr0); 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 */