From: Liam Merwick <liam.merwick@oracle.com>
To: Maxim Levitsky <mlevitsk@redhat.com>, kvm@vger.kernel.org
Cc: Paolo Bonzini <pbonzini@redhat.com>,
Thomas Gleixner <tglx@linutronix.de>,
linux-kernel@vger.kernel.org,
Chenyi Qiang <chenyi.qiang@intel.com>,
Yang Zhong <yang.zhong@intel.com>,
x86@kernel.org, Shuah Khan <shuah@kernel.org>,
Dave Hansen <dave.hansen@linux.intel.com>,
"H. Peter Anvin" <hpa@zytor.com>,
Colton Lewis <coltonlewis@google.com>,
Borislav Petkov <bp@alien8.de>, Peter Xu <peterx@redhat.com>,
Sean Christopherson <seanjc@google.com>,
Jim Mattson <jmattson@google.com>,
linux-kselftest@vger.kernel.org, Ingo Molnar <mingo@redhat.com>,
Wei Wang <wei.w.wang@intel.com>,
David Matlack <dmatlack@google.com>,
Liam Merwick <liam.merwick@oracle.com>
Subject: Re: [PATCH v2 8/9] KVM: selftests: add svm part to triple_fault_test
Date: Mon, 21 Nov 2022 16:34:22 +0000 [thread overview]
Message-ID: <a1fc425b-4c59-090b-f475-caf7d6074042@oracle.com> (raw)
In-Reply-To: <20221103141351.50662-9-mlevitsk@redhat.com>
On 03/11/2022 14:13, Maxim Levitsky wrote:
> Add a SVM implementation to triple_fault_test to test that
> emulated/injected shutdown works.
>
> Since instead of the VMX, the SVM allows the hypervisor to avoid
maybe "instead of the VMX, the SVM" -> ", unlike VMX, SVM" ?
> intercepting shutdown in guest, don't intercept shutdown to test that
> KVM suports this correctly.
typo: suports
>
> Signed-off-by: Maxim Levitsky <mlevitsk@redhat.com>
Reviewed-by: Liam Merwick <liam.merwick@oracle.com>
> ---
> .../kvm/x86_64/triple_fault_event_test.c | 73 ++++++++++++++-----
> 1 file changed, 56 insertions(+), 17 deletions(-)
>
> diff --git a/tools/testing/selftests/kvm/x86_64/triple_fault_event_test.c b/tools/testing/selftests/kvm/x86_64/triple_fault_event_test.c
> index 70b44f0b52fef2..ead5d878a71c45 100644
> --- a/tools/testing/selftests/kvm/x86_64/triple_fault_event_test.c
> +++ b/tools/testing/selftests/kvm/x86_64/triple_fault_event_test.c
> @@ -3,6 +3,7 @@
> #include "kvm_util.h"
> #include "processor.h"
> #include "vmx.h"
> +#include "svm_util.h"
>
> #include <string.h>
> #include <sys/ioctl.h>
> @@ -20,10 +21,11 @@ static void l2_guest_code(void)
> : : [port] "d" (ARBITRARY_IO_PORT) : "rax");
> }
>
> -void l1_guest_code(struct vmx_pages *vmx)
> -{
> #define L2_GUEST_STACK_SIZE 64
> - unsigned long l2_guest_stack[L2_GUEST_STACK_SIZE];
> +unsigned long l2_guest_stack[L2_GUEST_STACK_SIZE];
> +
> +void l1_guest_code_vmx(struct vmx_pages *vmx)
> +{
>
> GUEST_ASSERT(vmx->vmcs_gpa);
> GUEST_ASSERT(prepare_for_vmx_operation(vmx));
> @@ -38,24 +40,53 @@ void l1_guest_code(struct vmx_pages *vmx)
> GUEST_DONE();
> }
>
> +void l1_guest_code_svm(struct svm_test_data *svm)
> +{
> + struct vmcb *vmcb = svm->vmcb;
> +
> + generic_svm_setup(svm, l2_guest_code,
> + &l2_guest_stack[L2_GUEST_STACK_SIZE]);
> +
> + /* don't intercept shutdown to test the case of SVM allowing to do so */
> + vmcb->control.intercept &= ~(BIT(INTERCEPT_SHUTDOWN));
> +
> + run_guest(vmcb, svm->vmcb_gpa);
> +
> + /* should not reach here, L1 should crash */
> + GUEST_ASSERT(0);
> +}
> +
> int main(void)
> {
> struct kvm_vcpu *vcpu;
> struct kvm_run *run;
> struct kvm_vcpu_events events;
> - vm_vaddr_t vmx_pages_gva;
> struct ucall uc;
>
> - TEST_REQUIRE(kvm_cpu_has(X86_FEATURE_VMX));
> + bool has_vmx = kvm_cpu_has(X86_FEATURE_VMX);
> + bool has_svm = kvm_cpu_has(X86_FEATURE_SVM);
> +
> + TEST_REQUIRE(has_vmx || has_svm);
>
> TEST_REQUIRE(kvm_has_cap(KVM_CAP_X86_TRIPLE_FAULT_EVENT));
>
> - vm = vm_create_with_one_vcpu(&vcpu, l1_guest_code);
> - vm_enable_cap(vm, KVM_CAP_X86_TRIPLE_FAULT_EVENT, 1);
>
> + if (has_vmx) {
> + vm_vaddr_t vmx_pages_gva;
> +
> + vm = vm_create_with_one_vcpu(&vcpu, l1_guest_code_vmx);
> + vcpu_alloc_vmx(vm, &vmx_pages_gva);
> + vcpu_args_set(vcpu, 1, vmx_pages_gva);
> + } else {
> + vm_vaddr_t svm_gva;
> +
> + vm = vm_create_with_one_vcpu(&vcpu, l1_guest_code_svm);
> + vcpu_alloc_svm(vm, &svm_gva);
> + vcpu_args_set(vcpu, 1, svm_gva);
> + }
> +
> + vm_enable_cap(vm, KVM_CAP_X86_TRIPLE_FAULT_EVENT, 1);
> run = vcpu->run;
> - vcpu_alloc_vmx(vm, &vmx_pages_gva);
> - vcpu_args_set(vcpu, 1, vmx_pages_gva);
> vcpu_run(vcpu);
>
> TEST_ASSERT(run->exit_reason == KVM_EXIT_IO,
> @@ -78,13 +109,21 @@ int main(void)
> "No triple fault pending");
> vcpu_run(vcpu);
>
> - switch (get_ucall(vcpu, &uc)) {
> - case UCALL_DONE:
> - break;
> - case UCALL_ABORT:
> - REPORT_GUEST_ASSERT(uc);
> - default:
> - TEST_FAIL("Unexpected ucall: %lu", uc.cmd);
> - }
>
> + if (has_svm) {
> + TEST_ASSERT(run->exit_reason == KVM_EXIT_SHUTDOWN,
> + "Got exit_reason other than KVM_EXIT_SHUTDOWN: %u (%s)\n",
> + run->exit_reason,
> + exit_reason_str(run->exit_reason));
> + } else {
> + switch (get_ucall(vcpu, &uc)) {
> + case UCALL_DONE:
> + break;
> + case UCALL_ABORT:
> + REPORT_GUEST_ASSERT(uc);
> + default:
> + TEST_FAIL("Unexpected ucall: %lu", uc.cmd);
> + }
> + }
> + return 0;
> }
next prev parent reply other threads:[~2022-11-21 16:35 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-11-03 14:13 [PATCH v2 0/9] nSVM: Security and correctness fixes Maxim Levitsky
2022-11-03 14:13 ` [PATCH v2 1/9] KVM: x86: nSVM: leave nested mode on vCPU free Maxim Levitsky
2022-11-21 16:30 ` Liam Merwick
2022-11-03 14:13 ` [PATCH v2 2/9] KVM: x86: nSVM: harden svm_free_nested against freeing vmcb02 while still in use Maxim Levitsky
2022-11-21 16:30 ` Liam Merwick
2022-11-03 14:13 ` [PATCH v2 3/9] KVM: x86: add kvm_leave_nested Maxim Levitsky
2022-11-21 16:31 ` Liam Merwick
2022-11-03 14:13 ` [PATCH v2 4/9] KVM: x86: forcibly leave nested mode on vCPU reset Maxim Levitsky
2022-11-21 16:31 ` Liam Merwick
2022-11-03 14:13 ` [PATCH v2 5/9] KVM: selftests: move idt_entry to header Maxim Levitsky
2022-11-21 16:32 ` Liam Merwick
2022-11-03 14:13 ` [PATCH v2 6/9] kvm: selftests: add svm nested shutdown test Maxim Levitsky
2022-11-03 14:28 ` Maxim Levitsky
2022-11-21 16:33 ` Liam Merwick
2022-11-03 14:13 ` [PATCH v2 7/9] KVM: x86: allow L1 to not intercept triple fault Maxim Levitsky
2022-11-21 16:33 ` Liam Merwick
2022-11-03 14:13 ` [PATCH v2 8/9] KVM: selftests: add svm part to triple_fault_test Maxim Levitsky
2022-11-21 16:34 ` Liam Merwick [this message]
2022-11-03 14:13 ` [PATCH v2 9/9] KVM: x86: remove exit_int_info warning in svm_handle_exit Maxim Levitsky
2022-11-06 15:53 ` Liam Merwick
2022-11-09 9:15 ` Maxim Levitsky
2022-11-21 16:34 ` Liam Merwick
2022-11-15 14:55 ` [PATCH v2 0/9] nSVM: Security and correctness fixes Maxim Levitsky
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=a1fc425b-4c59-090b-f475-caf7d6074042@oracle.com \
--to=liam.merwick@oracle.com \
--cc=bp@alien8.de \
--cc=chenyi.qiang@intel.com \
--cc=coltonlewis@google.com \
--cc=dave.hansen@linux.intel.com \
--cc=dmatlack@google.com \
--cc=hpa@zytor.com \
--cc=jmattson@google.com \
--cc=kvm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-kselftest@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=mlevitsk@redhat.com \
--cc=pbonzini@redhat.com \
--cc=peterx@redhat.com \
--cc=seanjc@google.com \
--cc=shuah@kernel.org \
--cc=tglx@linutronix.de \
--cc=wei.w.wang@intel.com \
--cc=x86@kernel.org \
--cc=yang.zhong@intel.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).