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>
Subject: Re: [PATCH v2 6/9] kvm: selftests: add svm nested shutdown test
Date: Mon, 21 Nov 2022 16:33:19 +0000 [thread overview]
Message-ID: <1152a5da-a573-6071-f171-d41e623fcef0@oracle.com> (raw)
In-Reply-To: <2dccbbaa2d9e9aa7895fc03488c503c544aa0399.camel@redhat.com>
On 03/11/2022 14:28, Maxim Levitsky wrote:
> On Thu, 2022-11-03 at 16:13 +0200, Maxim Levitsky wrote:
>> Add test that tests that on SVM if L1 doesn't intercept SHUTDOWN,
>> then L2 crashes L1 and doesn't crash L2
> I mean doesn't crash L0, sorry for typo.
>
> Best regards,
> Maxim Levitsky
>>
>> Signed-off-by: Maxim Levitsky <mlevitsk@redhat.com>
Reviewed-by: Liam Merwick <liam.merwick@oracle.com>
>> ---
>> tools/testing/selftests/kvm/.gitignore | 1 +
>> tools/testing/selftests/kvm/Makefile | 1 +
>> .../kvm/x86_64/svm_nested_shutdown_test.c | 67 +++++++++++++++++++
>> 3 files changed, 69 insertions(+)
>> create mode 100644 tools/testing/selftests/kvm/x86_64/svm_nested_shutdown_test.c
>>
>> diff --git a/tools/testing/selftests/kvm/.gitignore b/tools/testing/selftests/kvm/.gitignore
>> index 2f0d705db9dba5..05d980fb083d17 100644
>> --- a/tools/testing/selftests/kvm/.gitignore
>> +++ b/tools/testing/selftests/kvm/.gitignore
>> @@ -41,6 +41,7 @@
>> /x86_64/svm_vmcall_test
>> /x86_64/svm_int_ctl_test
>> /x86_64/svm_nested_soft_inject_test
>> +/x86_64/svm_nested_shutdown_test
>> /x86_64/sync_regs_test
>> /x86_64/tsc_msrs_test
>> /x86_64/tsc_scaling_sync
>> diff --git a/tools/testing/selftests/kvm/Makefile b/tools/testing/selftests/kvm/Makefile
>> index 0172eb6cb6eee2..4a2caef2c9396f 100644
>> --- a/tools/testing/selftests/kvm/Makefile
>> +++ b/tools/testing/selftests/kvm/Makefile
>> @@ -101,6 +101,7 @@ TEST_GEN_PROGS_x86_64 += x86_64/state_test
>> TEST_GEN_PROGS_x86_64 += x86_64/vmx_preemption_timer_test
>> TEST_GEN_PROGS_x86_64 += x86_64/svm_vmcall_test
>> TEST_GEN_PROGS_x86_64 += x86_64/svm_int_ctl_test
>> +TEST_GEN_PROGS_x86_64 += x86_64/svm_nested_shutdown_test
>> TEST_GEN_PROGS_x86_64 += x86_64/svm_nested_soft_inject_test
>> TEST_GEN_PROGS_x86_64 += x86_64/tsc_scaling_sync
>> TEST_GEN_PROGS_x86_64 += x86_64/sync_regs_test
>> diff --git a/tools/testing/selftests/kvm/x86_64/svm_nested_shutdown_test.c b/tools/testing/selftests/kvm/x86_64/svm_nested_shutdown_test.c
>> new file mode 100644
>> index 00000000000000..e73fcdef47bbe9
>> --- /dev/null
>> +++ b/tools/testing/selftests/kvm/x86_64/svm_nested_shutdown_test.c
>> @@ -0,0 +1,67 @@
>> +// SPDX-License-Identifier: GPL-2.0-only
>> +/*
>> + * svm_nested_shutdown_test
>> + *
>> + * Copyright (C) 2022, Red Hat, Inc.
>> + *
>> + * Nested SVM testing: test that unintercepted shutdown in L2 doesn't crash the host
>> + */
>> +
>> +#include "test_util.h"
>> +#include "kvm_util.h"
>> +#include "processor.h"
>> +#include "svm_util.h"
>> +
>> +static void l2_guest_code(struct svm_test_data *svm)
>> +{
>> + __asm__ __volatile__("ud2");
>> +}
>> +
>> +static void l1_guest_code(struct svm_test_data *svm, struct idt_entry *idt)
>> +{
>> + #define L2_GUEST_STACK_SIZE 64
>> + unsigned long l2_guest_stack[L2_GUEST_STACK_SIZE];
>> + struct vmcb *vmcb = svm->vmcb;
>> +
>> + generic_svm_setup(svm, l2_guest_code,
>> + &l2_guest_stack[L2_GUEST_STACK_SIZE]);
>> +
>> + vmcb->control.intercept &= ~(BIT(INTERCEPT_SHUTDOWN));
>> +
>> + idt[6].p = 0; // #UD is intercepted but its injection will cause #NP
>> + idt[11].p = 0; // #NP is not intercepted and will cause another
>> + // #NP that will be converted to #DF
>> + idt[8].p = 0; // #DF will cause #NP which will cause SHUTDOWN
>> +
>> + run_guest(vmcb, svm->vmcb_gpa);
>> +
>> + /* should not reach here */
>> + GUEST_ASSERT(0);
>> +}
>> +
>> +int main(int argc, char *argv[])
>> +{
>> + struct kvm_vcpu *vcpu;
>> + struct kvm_run *run;
>> + vm_vaddr_t svm_gva;
>> + struct kvm_vm *vm;
>> +
>> + TEST_REQUIRE(kvm_cpu_has(X86_FEATURE_SVM));
>> +
>> + vm = vm_create_with_one_vcpu(&vcpu, l1_guest_code);
>> + vm_init_descriptor_tables(vm);
>> + vcpu_init_descriptor_tables(vcpu);
>> +
>> + vcpu_alloc_svm(vm, &svm_gva);
>> +
>> + vcpu_args_set(vcpu, 2, svm_gva, vm->idt);
>> + run = vcpu->run;
>> +
>> + vcpu_run(vcpu);
>> + 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));
>> +
>> + kvm_vm_free(vm);
>> +}
>
>
next prev parent reply other threads:[~2022-11-21 16:34 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 [this message]
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
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=1152a5da-a573-6071-f171-d41e623fcef0@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
all inboxes | Powered by JetHome®