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

hv: nested: remove vcpu->arch.nested.current_vmcs12_ptr

Browse Source 
This variable represents the L1 GPA of the current VMCS12.  But it's
no longer needed in the multiple active VMCS12 case, which uses the
following variables for this purpose.

- nested->current_vvmcs refers to the vvmcs[] entry which contains the
  cached current VMCS12, its associated VMCS02, and other context info.

- nested->current_vvmcs->vmcs12_gpa refers to the L1 GPA of this
  current VMCS12.

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-09-06 10:43:55 -07:00 committed by wenlingz
parent 799a4d332a
commit 4e54c3880b
2 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -738,7 +738,6 @@ int32_t vmxon_vmexit_handler(struct acrn_vcpu *vcpu)
vcpu->arch.nested.control_fields_dirty = false; vcpu->arch.nested.control_fields_dirty = false;
vcpu->arch.nested.in_l2_guest = false; vcpu->arch.nested.in_l2_guest = false;
vcpu->arch.nested.vmxon_ptr = vmptr_gpa; vcpu->arch.nested.vmxon_ptr = vmptr_gpa;
vcpu->arch.nested.current_vmcs12_ptr = INVALID_GPA;
vcpu->arch.nested.current_vvmcs = NULL; vcpu->arch.nested.current_vvmcs = NULL;
nested_vmx_result(VMsucceed, 0); nested_vmx_result(VMsucceed, 0);
@ -784,7 +783,6 @@ int32_t vmxoff_vmexit_handler(struct acrn_vcpu *vcpu)
vcpu->arch.nested.host_state_dirty = false; vcpu->arch.nested.host_state_dirty = false;
vcpu->arch.nested.control_fields_dirty = false; vcpu->arch.nested.control_fields_dirty = false;
vcpu->arch.nested.in_l2_guest = false; vcpu->arch.nested.in_l2_guest = false;
vcpu->arch.nested.current_vmcs12_ptr = INVALID_GPA;
vcpu->arch.nested.current_vvmcs = NULL; vcpu->arch.nested.current_vvmcs = NULL;
(void)memset(vcpu->arch.nested.vvmcs[0].vmcs02, 0U, PAGE_SIZE); (void)memset(vcpu->arch.nested.vvmcs[0].vmcs02, 0U, PAGE_SIZE);
@ -819,7 +817,7 @@ int32_t vmread_vmexit_handler(struct acrn_vcpu *vcpu)
uint32_t vmcs_field; uint32_t vmcs_field;
if (check_vmx_permission(vcpu)) { if (check_vmx_permission(vcpu)) {
if (vcpu->arch.nested.current_vmcs12_ptr == INVALID_GPA) { if ((cur_vvmcs == NULL) || (cur_vvmcs->vmcs12_gpa == INVALID_GPA)) {
nested_vmx_result(VMfailInvalid, 0); nested_vmx_result(VMfailInvalid, 0);
} else { } else {
/* TODO: VMfailValid for invalid VMCS fields */ /* TODO: VMfailValid for invalid VMCS fields */
@ -854,7 +852,7 @@ int32_t vmwrite_vmexit_handler(struct acrn_vcpu *vcpu)
uint32_t vmcs_field; uint32_t vmcs_field;
if (check_vmx_permission(vcpu)) { if (check_vmx_permission(vcpu)) {
if (vcpu->arch.nested.current_vmcs12_ptr == INVALID_GPA) { if ((cur_vvmcs == NULL) || (cur_vvmcs->vmcs12_gpa == INVALID_GPA)) {
nested_vmx_result(VMfailInvalid, 0); nested_vmx_result(VMfailInvalid, 0);
} else { } else {
/* TODO: VMfailValid for invalid VMCS fields */ /* TODO: VMfailValid for invalid VMCS fields */
@ -1052,8 +1050,7 @@ static void clear_vmcs02(struct acrn_vcpu *vcpu, struct acrn_vvmcs *vvmcs)
sync_vmcs02_to_vmcs12(&vvmcs->vmcs12); sync_vmcs02_to_vmcs12(&vvmcs->vmcs12);
/* flush cached VMCS12 back to L1 guest */ /* flush cached VMCS12 back to L1 guest */
(void)copy_to_gpa(vcpu->vm, (void *)&vvmcs->vmcs12, (void)copy_to_gpa(vcpu->vm, (void *)&vvmcs->vmcs12, vvmcs->vmcs12_gpa, sizeof(struct acrn_vmcs12));
vcpu->arch.nested.current_vmcs12_ptr, sizeof(struct acrn_vmcs12));
/* /*
* The current VMCS12 has been flushed out, so that the active VMCS02 * The current VMCS12 has been flushed out, so that the active VMCS02
@ -1064,8 +1061,8 @@ static void clear_vmcs02(struct acrn_vcpu *vcpu, struct acrn_vvmcs *vvmcs)
/* This VMCS can no longer refer to any shadow EPT */ /* This VMCS can no longer refer to any shadow EPT */
put_nept_desc(vvmcs->vmcs12.ept_pointer); put_nept_desc(vvmcs->vmcs12.ept_pointer);
/* no current VMCS12 */ /* This vvmcs[] entry doesn't cache a VMCS12 any more */
vcpu->arch.nested.current_vmcs12_ptr = INVALID_GPA; vvmcs->vmcs12_gpa = INVALID_GPA;
} }
/* /*
@ -1086,11 +1083,11 @@ int32_t vmptrld_vmexit_handler(struct acrn_vcpu *vcpu)
nested_vmx_result(VMfailValid, VMXERR_VMPTRLD_VMXON_POINTER); nested_vmx_result(VMfailValid, VMXERR_VMPTRLD_VMXON_POINTER);
} else if (!validate_vmcs_revision_id(vcpu, vmcs12_gpa)) { } else if (!validate_vmcs_revision_id(vcpu, vmcs12_gpa)) {
nested_vmx_result(VMfailValid, VMXERR_VMPTRLD_INCORRECT_VMCS_REVISION_ID); nested_vmx_result(VMfailValid, VMXERR_VMPTRLD_INCORRECT_VMCS_REVISION_ID);
} else if (nested->current_vmcs12_ptr == vmcs12_gpa) { } else if ((nested->current_vvmcs != NULL) && (nested->current_vvmcs->vmcs12_gpa == vmcs12_gpa)) {
/* VMPTRLD current VMCS12, do nothing */ /* VMPTRLD current VMCS12, do nothing */
nested_vmx_result(VMsucceed, 0); nested_vmx_result(VMsucceed, 0);
} else { } else {
if (nested->current_vmcs12_ptr != INVALID_GPA) { if (vvmcs->vmcs12_gpa != INVALID_GPA) {
/* /*
* L1 hypervisor VMPTRLD a new VMCS12, or VMPTRLD a VMCLEARed VMCS12. * L1 hypervisor VMPTRLD a new VMCS12, or VMPTRLD a VMCLEARed VMCS12.
* The current VMCS12 remains active but ACRN needs to sync the content of it * The current VMCS12 remains active but ACRN needs to sync the content of it
@ -1136,8 +1133,8 @@ int32_t vmptrld_vmexit_handler(struct acrn_vcpu *vcpu)
/* VMCS02 is referenced by VMCS01 Link Pointer */ /* VMCS02 is referenced by VMCS01 Link Pointer */
enable_vmcs_shadowing(vvmcs); enable_vmcs_shadowing(vvmcs);
vvmcs->vmcs12_gpa = vmcs12_gpa;
nested->current_vvmcs = vvmcs; nested->current_vvmcs = vvmcs;
nested->current_vmcs12_ptr = vmcs12_gpa;
nested_vmx_result(VMsucceed, 0); nested_vmx_result(VMsucceed, 0);
} }
} }
@ -1162,7 +1159,7 @@ int32_t vmclear_vmexit_handler(struct acrn_vcpu *vcpu)
} else if (vmcs12_gpa == nested->vmxon_ptr) { } else if (vmcs12_gpa == nested->vmxon_ptr) {
nested_vmx_result(VMfailValid, VMXERR_VMCLEAR_VMXON_POINTER); nested_vmx_result(VMfailValid, VMXERR_VMCLEAR_VMXON_POINTER);
} else { } else {
if (vcpu->arch.nested.current_vmcs12_ptr == vmcs12_gpa) { if (vvmcs->vmcs12_gpa == vmcs12_gpa) {
/* /*
* The target VMCS12 is active and current. * The target VMCS12 is active and current.
* VMCS02 is active and being used as a shadow VMCS. * VMCS02 is active and being used as a shadow VMCS.
@ -1376,7 +1373,7 @@ static void nested_vmentry(struct acrn_vcpu *vcpu, bool is_launch)
struct acrn_vvmcs *cur_vvmcs = vcpu->arch.nested.current_vvmcs; struct acrn_vvmcs *cur_vvmcs = vcpu->arch.nested.current_vvmcs;
struct acrn_vmcs12 *vmcs12 = &cur_vvmcs->vmcs12; struct acrn_vmcs12 *vmcs12 = &cur_vvmcs->vmcs12;
if (vcpu->arch.nested.current_vmcs12_ptr == INVALID_GPA) { if ((cur_vvmcs == NULL) || (cur_vvmcs->vmcs12_gpa == INVALID_GPA)) {
nested_vmx_result(VMfailInvalid, 0); nested_vmx_result(VMfailInvalid, 0);
} else if (is_launch && (vmcs12->launch_state != VMCS12_LAUNCH_STATE_CLEAR)) { } else if (is_launch && (vmcs12->launch_state != VMCS12_LAUNCH_STATE_CLEAR)) {
nested_vmx_result(VMfailValid, VMXERR_VMLAUNCH_NONCLEAR_VMCS); nested_vmx_result(VMfailValid, VMXERR_VMLAUNCH_NONCLEAR_VMCS);

2
hypervisor/include/arch/x86/asm/guest/nested.h
View File

@ -332,12 +332,12 @@ int32_t invvpid_vmexit_handler(struct acrn_vcpu *vcpu);
struct acrn_vvmcs { struct acrn_vvmcs {
uint8_t vmcs02[PAGE_SIZE]; /* VMCS to run L2 and as Link Pointer in VMCS01 */ uint8_t vmcs02[PAGE_SIZE]; /* VMCS to run L2 and as Link Pointer in VMCS01 */
struct acrn_vmcs12 vmcs12; /* To cache L1's VMCS12*/ struct acrn_vmcs12 vmcs12; /* To cache L1's VMCS12*/
uint64_t vmcs12_gpa; /* The corresponding L1 GPA for this VMCS12 */
} __aligned(PAGE_SIZE); } __aligned(PAGE_SIZE);
struct acrn_nested { struct acrn_nested {
struct acrn_vvmcs vvmcs[1]; struct acrn_vvmcs vvmcs[1];
struct acrn_vvmcs *current_vvmcs; /* Refer to the current loaded VMCS12 */ struct acrn_vvmcs *current_vvmcs; /* Refer to the current loaded VMCS12 */
uint64_t current_vmcs12_ptr; /* GPA */
uint64_t vmxon_ptr; /* GPA */ uint64_t vmxon_ptr; /* GPA */
bool vmxon; /* To indicate if vCPU entered VMX operation */ bool vmxon; /* To indicate if vCPU entered VMX operation */
bool in_l2_guest; /* To indicate if vCPU is currently in Guest mode (from L1's perspective) */ bool in_l2_guest; /* To indicate if vCPU is currently in Guest mode (from L1's perspective) */