From: Maxim Levitsky <mlevitsk@redhat.com>
To: Vitaly Kuznetsov <vkuznets@redhat.com>,
kvm@vger.kernel.org, Paolo Bonzini <pbonzini@redhat.com>
Cc: Sean Christopherson <seanjc@google.com>,
Wanpeng Li <wanpengli@tencent.com>,
Jim Mattson <jmattson@google.com>,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH v2 7/7] KVM: selftests: evmcs_test: Test that KVM_STATE_NESTED_EVMCS is never lost
Date: Mon, 24 May 2021 15:36:15 +0300 [thread overview]
Message-ID: <4b0f9fbea71bd779164e8a703f94fb68ae0d43df.camel@redhat.com> (raw)
In-Reply-To: <20210517135054.1914802-8-vkuznets@redhat.com>
On Mon, 2021-05-17 at 15:50 +0200, Vitaly Kuznetsov wrote:
> Do KVM_GET_NESTED_STATE/KVM_SET_NESTED_STATE for a freshly restored VM
> (before the first KVM_RUN) to check that KVM_STATE_NESTED_EVMCS is not
> lost.
>
> Signed-off-by: Vitaly Kuznetsov <vkuznets@redhat.com>
> ---
> .../testing/selftests/kvm/x86_64/evmcs_test.c | 64 +++++++++++--------
> 1 file changed, 38 insertions(+), 26 deletions(-)
>
> diff --git a/tools/testing/selftests/kvm/x86_64/evmcs_test.c b/tools/testing/selftests/kvm/x86_64/evmcs_test.c
> index 63096cea26c6..fcef347a681a 100644
> --- a/tools/testing/selftests/kvm/x86_64/evmcs_test.c
> +++ b/tools/testing/selftests/kvm/x86_64/evmcs_test.c
> @@ -121,14 +121,38 @@ void inject_nmi(struct kvm_vm *vm)
> vcpu_events_set(vm, VCPU_ID, &events);
> }
>
> +static void save_restore_vm(struct kvm_vm *vm)
> +{
> + struct kvm_regs regs1, regs2;
> + struct kvm_x86_state *state;
> +
> + state = vcpu_save_state(vm, VCPU_ID);
> + memset(®s1, 0, sizeof(regs1));
> + vcpu_regs_get(vm, VCPU_ID, ®s1);
> +
> + kvm_vm_release(vm);
> +
> + /* Restore state in a new VM. */
> + kvm_vm_restart(vm, O_RDWR);
> + vm_vcpu_add(vm, VCPU_ID);
> + vcpu_set_hv_cpuid(vm, VCPU_ID);
> + vcpu_enable_evmcs(vm, VCPU_ID);
> + vcpu_load_state(vm, VCPU_ID, state);
> + free(state);
> +
> + memset(®s2, 0, sizeof(regs2));
> + vcpu_regs_get(vm, VCPU_ID, ®s2);
> + TEST_ASSERT(!memcmp(®s1, ®s2, sizeof(regs2)),
> + "Unexpected register values after vcpu_load_state; rdi: %lx rsi: %lx",
> + (ulong) regs2.rdi, (ulong) regs2.rsi);
> +}
> +
> int main(int argc, char *argv[])
> {
> vm_vaddr_t vmx_pages_gva = 0;
>
> - struct kvm_regs regs1, regs2;
> struct kvm_vm *vm;
> struct kvm_run *run;
> - struct kvm_x86_state *state;
> struct ucall uc;
> int stage;
>
> @@ -145,10 +169,6 @@ int main(int argc, char *argv[])
> vcpu_set_hv_cpuid(vm, VCPU_ID);
> vcpu_enable_evmcs(vm, VCPU_ID);
>
> - run = vcpu_state(vm, VCPU_ID);
> -
> - vcpu_regs_get(vm, VCPU_ID, ®s1);
> -
> vcpu_alloc_vmx(vm, &vmx_pages_gva);
> vcpu_args_set(vm, VCPU_ID, 1, vmx_pages_gva);
>
> @@ -160,6 +180,7 @@ int main(int argc, char *argv[])
> pr_info("Running L1 which uses EVMCS to run L2\n");
>
> for (stage = 1;; stage++) {
> + run = vcpu_state(vm, VCPU_ID);
> _vcpu_run(vm, VCPU_ID);
> TEST_ASSERT(run->exit_reason == KVM_EXIT_IO,
> "Stage %d: unexpected exit reason: %u (%s),\n",
> @@ -184,32 +205,23 @@ int main(int argc, char *argv[])
> uc.args[1] == stage, "Stage %d: Unexpected register values vmexit, got %lx",
> stage, (ulong)uc.args[1]);
>
> - state = vcpu_save_state(vm, VCPU_ID);
> - memset(®s1, 0, sizeof(regs1));
> - vcpu_regs_get(vm, VCPU_ID, ®s1);
> -
> - kvm_vm_release(vm);
> -
> - /* Restore state in a new VM. */
> - kvm_vm_restart(vm, O_RDWR);
> - vm_vcpu_add(vm, VCPU_ID);
> - vcpu_set_hv_cpuid(vm, VCPU_ID);
> - vcpu_enable_evmcs(vm, VCPU_ID);
> - vcpu_load_state(vm, VCPU_ID, state);
> - run = vcpu_state(vm, VCPU_ID);
> - free(state);
> -
> - memset(®s2, 0, sizeof(regs2));
> - vcpu_regs_get(vm, VCPU_ID, ®s2);
> - TEST_ASSERT(!memcmp(®s1, ®s2, sizeof(regs2)),
> - "Unexpected register values after vcpu_load_state; rdi: %lx rsi: %lx",
> - (ulong) regs2.rdi, (ulong) regs2.rsi);
> + save_restore_vm(vm);
>
> /* Force immediate L2->L1 exit before resuming */
> if (stage == 8) {
> pr_info("Injecting NMI into L1 before L2 had a chance to run after restore\n");
> inject_nmi(vm);
> }
> +
> + /*
> + * Do KVM_GET_NESTED_STATE/KVM_SET_NESTED_STATE for a freshly
> + * restored VM (before the first KVM_RUN) to check that
> + * KVM_STATE_NESTED_EVMCS is not lost.
> + */
> + if (stage == 9) {
> + pr_info("Trying extra KVM_GET_NESTED_STATE/KVM_SET_NESTED_STATE cycle\n");
> + save_restore_vm(vm);
> + }
> }
>
> done:
This is a very good test. I do think that in the future we should move save_restore_vm
to common code so that I could test SVM nested migration (and plain VMX nested migration)
in a similar way.
Reviewed-by: Maxim Levitsky <mlevitsk@redhat.com>
Best regards,
Maxim Levitsky
next prev parent reply other threads:[~2021-05-24 12:36 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-17 13:50 [PATCH v2 0/7] KVM: nVMX: Fixes for nested state migration when eVMCS is in use Vitaly Kuznetsov
2021-05-17 13:50 ` [PATCH v2 1/7] KVM: nVMX: Introduce nested_evmcs_is_used() Vitaly Kuznetsov
2021-05-24 12:11 ` Maxim Levitsky
2021-05-24 12:35 ` Vitaly Kuznetsov
2021-05-26 14:34 ` Maxim Levitsky
2021-05-27 7:54 ` Vitaly Kuznetsov
2021-05-27 14:10 ` Maxim Levitsky
2021-05-24 13:54 ` Paolo Bonzini
2021-05-24 14:09 ` Vitaly Kuznetsov
2021-05-24 14:18 ` Paolo Bonzini
2021-05-24 14:37 ` Vitaly Kuznetsov
2021-05-17 13:50 ` [PATCH v2 2/7] KVM: nVMX: Release enlightened VMCS on VMCLEAR Vitaly Kuznetsov
2021-05-24 12:13 ` Maxim Levitsky
2021-05-17 13:50 ` [PATCH v2 3/7] KVM: nVMX: Ignore 'hv_clean_fields' data when eVMCS data is copied in vmx_get_nested_state() Vitaly Kuznetsov
2021-05-24 12:26 ` Maxim Levitsky
2021-05-24 13:01 ` Vitaly Kuznetsov
2021-05-24 13:58 ` Paolo Bonzini
2021-05-26 14:44 ` Maxim Levitsky
2021-05-24 13:56 ` Paolo Bonzini
2021-05-24 14:12 ` Vitaly Kuznetsov
2021-05-17 13:50 ` [PATCH v2 4/7] KVM: nVMX: Force enlightened VMCS sync from nested_vmx_failValid() Vitaly Kuznetsov
2021-05-24 12:27 ` Maxim Levitsky
2021-05-17 13:50 ` [PATCH v2 5/7] KVM: nVMX: Reset eVMCS clean fields data from prepare_vmcs02() Vitaly Kuznetsov
2021-05-24 12:34 ` Maxim Levitsky
2021-05-24 13:07 ` Vitaly Kuznetsov
2021-05-17 13:50 ` [PATCH v2 6/7] KVM: nVMX: Request to sync eVMCS from VMCS12 after migration Vitaly Kuznetsov
2021-05-24 12:35 ` Maxim Levitsky
2021-05-17 13:50 ` [PATCH v2 7/7] KVM: selftests: evmcs_test: Test that KVM_STATE_NESTED_EVMCS is never lost Vitaly Kuznetsov
2021-05-24 12:36 ` Maxim Levitsky [this message]
2021-05-24 12:08 ` [PATCH v2 0/7] KVM: nVMX: Fixes for nested state migration when eVMCS is in use Maxim Levitsky
2021-05-24 12:44 ` Vitaly Kuznetsov
2021-05-26 14:41 ` Maxim Levitsky
2021-05-27 8:01 ` Vitaly Kuznetsov
2021-05-27 14:11 ` Maxim Levitsky
2021-05-27 14:17 ` Paolo Bonzini
2021-05-24 14:01 ` Paolo Bonzini
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4b0f9fbea71bd779164e8a703f94fb68ae0d43df.camel@redhat.com \
--to=mlevitsk@redhat.com \
--cc=jmattson@google.com \
--cc=kvm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=pbonzini@redhat.com \
--cc=seanjc@google.com \
--cc=vkuznets@redhat.com \
--cc=wanpengli@tencent.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).