iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

KVM: selftests: Split off load_evmcs() from load_vmcs()

Browse Source 
In preparation to putting Hyper-V specific test pages to a dedicated
struct, move eVMCS load logic from load_vmcs(). Tests call load_vmcs()
directly and the only one which needs 'enlightened' version is
evmcs_test so there's not much gain in having this merged.

Temporary pass both GPA and HVA to load_evmcs().

Reviewed-by: Sean Christopherson <seanjc@google.com>
Signed-off-by: Vitaly Kuznetsov <vkuznets@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <20221101145426.251680-42-vkuznets@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Vitaly Kuznetsov 2022-11-01 15:54:19 +01:00 committed by Paolo Bonzini
parent e8f3d23c02
commit cd8f11bd6b
3 changed files with 22 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tools/testing/selftests/kvm/include/x86_64/evmcs.h
View File

@ -256,6 +256,16 @@ static inline int evmcs_vmptrld(uint64_t vmcs_pa, void *vmcs)
return 0; return 0;
} }
static inline bool load_evmcs(uint64_t enlightened_vmcs_gpa, void *enlightened_vmcs)
{
if (evmcs_vmptrld(enlightened_vmcs_gpa, enlightened_vmcs))
return false;
current_evmcs->revision_id = EVMCS_VERSION;
return true;
}
static inline int evmcs_vmptrst(uint64_t *value) static inline int evmcs_vmptrst(uint64_t *value)
{ {
*value = current_vp_assist->current_nested_vmcs & *value = current_vp_assist->current_nested_vmcs &

28
tools/testing/selftests/kvm/lib/x86_64/vmx.c
View File

@ -171,26 +171,18 @@ bool prepare_for_vmx_operation(struct vmx_pages *vmx)
bool load_vmcs(struct vmx_pages *vmx) bool load_vmcs(struct vmx_pages *vmx)
{ {
if (!enable_evmcs) { /* Load a VMCS. */
/* Load a VMCS. */ *(uint32_t *)(vmx->vmcs) = vmcs_revision();
*(uint32_t *)(vmx->vmcs) = vmcs_revision(); if (vmclear(vmx->vmcs_gpa))
if (vmclear(vmx->vmcs_gpa)) return false;
return false;
if (vmptrld(vmx->vmcs_gpa)) if (vmptrld(vmx->vmcs_gpa))
return false; return false;
/* Setup shadow VMCS, do not load it yet. */ /* Setup shadow VMCS, do not load it yet. */
*(uint32_t *)(vmx->shadow_vmcs) = *(uint32_t *)(vmx->shadow_vmcs) = vmcs_revision() | 0x80000000ul;
vmcs_revision() | 0x80000000ul; if (vmclear(vmx->shadow_vmcs_gpa))
if (vmclear(vmx->shadow_vmcs_gpa)) return false;
return false;
} else {
if (evmcs_vmptrld(vmx->enlightened_vmcs_gpa,
vmx->enlightened_vmcs))
return false;
current_evmcs->revision_id = EVMCS_VERSION;
}
return true; return true;
} }

4
tools/testing/selftests/kvm/x86_64/evmcs_test.c
View File

@ -81,10 +81,10 @@ void guest_code(struct vmx_pages *vmx_pages)
enable_vp_assist(vmx_pages->vp_assist_gpa, vmx_pages->vp_assist); enable_vp_assist(vmx_pages->vp_assist_gpa, vmx_pages->vp_assist);
evmcs_enable(); evmcs_enable();
GUEST_ASSERT(vmx_pages->vmcs_gpa);
GUEST_ASSERT(prepare_for_vmx_operation(vmx_pages)); GUEST_ASSERT(prepare_for_vmx_operation(vmx_pages));
GUEST_SYNC(3); GUEST_SYNC(3);
GUEST_ASSERT(load_vmcs(vmx_pages)); GUEST_ASSERT(load_evmcs(vmx_pages->enlightened_vmcs_gpa,
vmx_pages->enlightened_vmcs));
GUEST_ASSERT(vmptrstz() == vmx_pages->enlightened_vmcs_gpa); GUEST_ASSERT(vmptrstz() == vmx_pages->enlightened_vmcs_gpa);
GUEST_SYNC(4); GUEST_SYNC(4);