* [PATCH 3/3] tests: kvm: Add tests for KVM_SET_NESTED_STATE
@ 2019-05-02 18:31 Aaron Lewis
2019-05-03 16:44 ` Sean Christopherson
2019-05-08 12:05 ` Paolo Bonzini
0 siblings, 2 replies; 7+ messages in thread
From: Aaron Lewis @ 2019-05-02 18:31 UTC (permalink / raw)
To: pbonzini, rkrcmar, jmattson, marcorr, kvm; +Cc: Aaron Lewis, Peter Shier
Add tests for KVM_SET_NESTED_STATE and for various code paths in its implementation in vmx_set_nested_state().
Signed-off-by: Aaron Lewis <aaronlewis@google.com>
Reviewed-by: Marc Orr <marcorr@google.com>
Reviewed-by: Peter Shier <pshier@google.com>
---
tools/testing/selftests/kvm/.gitignore | 1 +
tools/testing/selftests/kvm/Makefile | 1 +
.../testing/selftests/kvm/include/kvm_util.h | 4 +
tools/testing/selftests/kvm/lib/kvm_util.c | 32 ++
.../kvm/x86_64/vmx_set_nested_state_test.c | 275 ++++++++++++++++++
5 files changed, 313 insertions(+)
create mode 100644 tools/testing/selftests/kvm/x86_64/vmx_set_nested_state_test.c
diff --git a/tools/testing/selftests/kvm/.gitignore b/tools/testing/selftests/kvm/.gitignore
index 2689d1ea6d7a..bbaa97dbd19e 100644
--- a/tools/testing/selftests/kvm/.gitignore
+++ b/tools/testing/selftests/kvm/.gitignore
@@ -6,4 +6,5 @@
/x86_64/vmx_close_while_nested_test
/x86_64/vmx_tsc_adjust_test
/x86_64/state_test
+/x86_64/vmx_set_nested_state_test
/dirty_log_test
diff --git a/tools/testing/selftests/kvm/Makefile b/tools/testing/selftests/kvm/Makefile
index f8588cca2bef..10eff4317226 100644
--- a/tools/testing/selftests/kvm/Makefile
+++ b/tools/testing/selftests/kvm/Makefile
@@ -20,6 +20,7 @@ TEST_GEN_PROGS_x86_64 += x86_64/evmcs_test
TEST_GEN_PROGS_x86_64 += x86_64/hyperv_cpuid
TEST_GEN_PROGS_x86_64 += x86_64/vmx_close_while_nested_test
TEST_GEN_PROGS_x86_64 += x86_64/smm_test
+TEST_GEN_PROGS_x86_64 += x86_64/vmx_set_nested_state_test
TEST_GEN_PROGS_x86_64 += dirty_log_test
TEST_GEN_PROGS_x86_64 += clear_dirty_log_test
diff --git a/tools/testing/selftests/kvm/include/kvm_util.h b/tools/testing/selftests/kvm/include/kvm_util.h
index 07b71ad9734a..8c6b9619797d 100644
--- a/tools/testing/selftests/kvm/include/kvm_util.h
+++ b/tools/testing/selftests/kvm/include/kvm_util.h
@@ -118,6 +118,10 @@ void vcpu_events_get(struct kvm_vm *vm, uint32_t vcpuid,
struct kvm_vcpu_events *events);
void vcpu_events_set(struct kvm_vm *vm, uint32_t vcpuid,
struct kvm_vcpu_events *events);
+void vcpu_nested_state_get(struct kvm_vm *vm, uint32_t vcpuid,
+ struct kvm_nested_state *state);
+int vcpu_nested_state_set(struct kvm_vm *vm, uint32_t vcpuid,
+ struct kvm_nested_state *state, bool ignore_error);
const char *exit_reason_str(unsigned int exit_reason);
diff --git a/tools/testing/selftests/kvm/lib/kvm_util.c b/tools/testing/selftests/kvm/lib/kvm_util.c
index 4ca96b228e46..e9113857f44e 100644
--- a/tools/testing/selftests/kvm/lib/kvm_util.c
+++ b/tools/testing/selftests/kvm/lib/kvm_util.c
@@ -1250,6 +1250,38 @@ void vcpu_events_set(struct kvm_vm *vm, uint32_t vcpuid,
ret, errno);
}
+void vcpu_nested_state_get(struct kvm_vm *vm, uint32_t vcpuid,
+ struct kvm_nested_state *state)
+{
+ struct vcpu *vcpu = vcpu_find(vm, vcpuid);
+ int ret;
+
+ TEST_ASSERT(vcpu != NULL, "vcpu not found, vcpuid: %u", vcpuid);
+
+ ret = ioctl(vcpu->fd, KVM_GET_NESTED_STATE, state);
+ TEST_ASSERT(ret == 0,
+ "KVM_SET_NESTED_STATE failed, ret: %i errno: %i",
+ ret, errno);
+}
+
+int vcpu_nested_state_set(struct kvm_vm *vm, uint32_t vcpuid,
+ struct kvm_nested_state *state, bool ignore_error)
+{
+ struct vcpu *vcpu = vcpu_find(vm, vcpuid);
+ int ret;
+
+ TEST_ASSERT(vcpu != NULL, "vcpu not found, vcpuid: %u", vcpuid);
+
+ ret = ioctl(vcpu->fd, KVM_SET_NESTED_STATE, state);
+ if (!ignore_error) {
+ TEST_ASSERT(ret == 0,
+ "KVM_SET_NESTED_STATE failed, ret: %i errno: %i",
+ ret, errno);
+ }
+
+ return ret;
+}
+
/*
* VM VCPU System Regs Get
*
diff --git a/tools/testing/selftests/kvm/x86_64/vmx_set_nested_state_test.c b/tools/testing/selftests/kvm/x86_64/vmx_set_nested_state_test.c
new file mode 100644
index 000000000000..5eea24087d19
--- /dev/null
+++ b/tools/testing/selftests/kvm/x86_64/vmx_set_nested_state_test.c
@@ -0,0 +1,275 @@
+/*
+ * vmx_set_nested_state_test
+ *
+ * Copyright (C) 2019, Google LLC.
+ *
+ * This work is licensed under the terms of the GNU GPL, version 2.
+ *
+ * This test verifies the integrity of calling the ioctl KVM_SET_NESTED_STATE.
+ */
+
+#include "test_util.h"
+#include "kvm_util.h"
+#include "processor.h"
+#include "vmx.h"
+
+#include <errno.h>
+#include <linux/kvm.h>
+#include <string.h>
+#include <sys/ioctl.h>
+#include <unistd.h>
+
+/*
+ * Mirror of VMCS12_REVISION in arch/x86/kvm/vmx/vmcs12.h. If that value
+ * changes this should be updated.
+ */
+#define VMCS12_REVISION 0x11e57ed0
+#define VCPU_ID 5
+
+void test_nested_state(struct kvm_vm *vm, struct kvm_nested_state *state)
+{
+ volatile struct kvm_run *run;
+
+ vcpu_nested_state_set(vm, VCPU_ID, state, false);
+ run = vcpu_state(vm, VCPU_ID);
+ vcpu_run(vm, VCPU_ID);
+ 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));
+}
+
+void test_nested_state_expect_errno(struct kvm_vm *vm,
+ struct kvm_nested_state *state,
+ int expected_errno)
+{
+ volatile struct kvm_run *run;
+ int rv;
+
+ rv = vcpu_nested_state_set(vm, VCPU_ID, state, true);
+ TEST_ASSERT(rv == -1 && errno == expected_errno,
+ "Expected %s (%d) from vcpu_nested_state_set but got rv: %i errno: %s (%d)",
+ strerror(expected_errno), expected_errno, rv, strerror(errno),
+ errno);
+ run = vcpu_state(vm, VCPU_ID);
+ vcpu_run(vm, VCPU_ID);
+ 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));
+}
+
+void test_nested_state_expect_einval(struct kvm_vm *vm,
+ struct kvm_nested_state *state)
+{
+ test_nested_state_expect_errno(vm, state, EINVAL);
+}
+
+void test_nested_state_expect_efault(struct kvm_vm *vm,
+ struct kvm_nested_state *state)
+{
+ test_nested_state_expect_errno(vm, state, EFAULT);
+}
+
+void set_revision_id_for_vmcs12(struct kvm_nested_state *state,
+ u32 vmcs12_revision)
+{
+ /* Set revision_id in vmcs12 to vmcs12_revision. */
+ *(u32 *)(state->data) = vmcs12_revision;
+}
+
+void set_default_state(struct kvm_nested_state *state)
+{
+ memset(state, 0, sizeof(*state));
+ state->flags = KVM_STATE_NESTED_RUN_PENDING |
+ KVM_STATE_NESTED_GUEST_MODE;
+ state->format = 0;
+ state->size = sizeof(*state);
+}
+
+void set_default_vmx_state(struct kvm_nested_state *state, int size)
+{
+ memset(state, 0, size);
+ state->flags = KVM_STATE_NESTED_GUEST_MODE |
+ KVM_STATE_NESTED_RUN_PENDING |
+ KVM_STATE_NESTED_EVMCS;
+ state->format = 0;
+ state->size = size;
+ state->vmx.vmxon_pa = 0x1000;
+ state->vmx.vmcs_pa = 0x2000;
+ state->vmx.smm.flags = 0;
+ set_revision_id_for_vmcs12(state, VMCS12_REVISION);
+}
+
+void test_vmx_nested_state(struct kvm_vm *vm)
+{
+ /* Add a page for VMCS12. */
+ const int state_sz = sizeof(struct kvm_nested_state) + getpagesize();
+ struct kvm_nested_state *state =
+ (struct kvm_nested_state *)malloc(state_sz);
+
+ /* The format must be set to 0. 0 for VMX, 1 for SVM. */
+ set_default_vmx_state(state, state_sz);
+ state->format = 1;
+ test_nested_state_expect_einval(vm, state);
+
+ /*
+ * We cannot virtualize anything if the guest does not have VMX
+ * enabled.
+ */
+ set_default_vmx_state(state, state_sz);
+ test_nested_state_expect_einval(vm, state);
+
+ /*
+ * We cannot virtualize anything if the guest does not have VMX
+ * enabled. We expect KVM_SET_NESTED_STATE to return 0 if vmxon_pa
+ * is set to -1ull.
+ */
+ set_default_vmx_state(state, state_sz);
+ state->vmx.vmxon_pa = -1ull;
+ test_nested_state(vm, state);
+
+ /* Enable VMX in the guest CPUID. */
+ vcpu_set_cpuid(vm, VCPU_ID, kvm_get_supported_cpuid());
+
+ /* It is invalid to have vmxon_pa == -1ull and SMM flags non-zero. */
+ set_default_vmx_state(state, state_sz);
+ state->vmx.vmxon_pa = -1ull;
+ state->vmx.smm.flags = 1;
+ test_nested_state_expect_einval(vm, state);
+
+ /* It is invalid to have vmxon_pa == -1ull and vmcs_pa != -1ull. */
+ set_default_vmx_state(state, state_sz);
+ state->vmx.vmxon_pa = -1ull;
+ state->vmx.vmcs_pa = 0;
+ test_nested_state_expect_einval(vm, state);
+
+ /*
+ * Setting vmxon_pa == -1ull and vmcs_pa == -1ull exits early without
+ * setting the nested state.
+ */
+ set_default_vmx_state(state, state_sz);
+ state->vmx.vmxon_pa = -1ull;
+ state->vmx.vmcs_pa = -1ull;
+ test_nested_state(vm, state);
+
+ /* It is invalid to have vmxon_pa set to a non-page aligned address. */
+ set_default_vmx_state(state, state_sz);
+ state->vmx.vmxon_pa = 1;
+ test_nested_state_expect_einval(vm, state);
+
+ /*
+ * It is invalid to have KVM_STATE_NESTED_SMM_GUEST_MODE and
+ * KVM_STATE_NESTED_GUEST_MODE set together.
+ */
+ set_default_vmx_state(state, state_sz);
+ state->flags = KVM_STATE_NESTED_GUEST_MODE |
+ KVM_STATE_NESTED_RUN_PENDING;
+ state->vmx.smm.flags = KVM_STATE_NESTED_SMM_GUEST_MODE;
+ test_nested_state_expect_einval(vm, state);
+
+ /*
+ * It is invalid to have any of the SMM flags set besides:
+ * KVM_STATE_NESTED_SMM_GUEST_MODE
+ * KVM_STATE_NESTED_SMM_VMXON
+ */
+ set_default_vmx_state(state, state_sz);
+ state->vmx.smm.flags = ~(KVM_STATE_NESTED_SMM_GUEST_MODE |
+ KVM_STATE_NESTED_SMM_VMXON);
+ test_nested_state_expect_einval(vm, state);
+
+ /* Outside SMM, SMM flags must be zero. */
+ set_default_vmx_state(state, state_sz);
+ state->flags = 0;
+ state->vmx.smm.flags = KVM_STATE_NESTED_SMM_GUEST_MODE;
+ test_nested_state_expect_einval(vm, state);
+
+ /* Size must be large enough to fit kvm_nested_state and vmcs12. */
+ set_default_vmx_state(state, state_sz);
+ state->size = sizeof(*state);
+ test_nested_state(vm, state);
+
+ /* vmxon_pa cannot be the same address as vmcs_pa. */
+ set_default_vmx_state(state, state_sz);
+ state->vmx.vmxon_pa = 0;
+ state->vmx.vmcs_pa = 0;
+ test_nested_state_expect_einval(vm, state);
+
+ /* The revision id for vmcs12 must be VMCS12_REVISION. */
+ set_default_vmx_state(state, state_sz);
+ set_revision_id_for_vmcs12(state, 0);
+ test_nested_state_expect_einval(vm, state);
+
+ /*
+ * Test that if we leave nesting the state reflects that when we get
+ * it again.
+ */
+ set_default_vmx_state(state, state_sz);
+ state->vmx.vmxon_pa = -1ull;
+ state->vmx.vmcs_pa = -1ull;
+ state->flags = 0;
+ test_nested_state(vm, state);
+ vcpu_nested_state_get(vm, VCPU_ID, state);
+ TEST_ASSERT(state->size >= sizeof(*state) && state->size <= state_sz,
+ "Size must be between %d and %d. The size returned was %d.",
+ sizeof(*state), state_sz, state->size);
+ TEST_ASSERT(state->vmx.vmxon_pa == -1ull, "vmxon_pa must be -1ull.");
+ TEST_ASSERT(state->vmx.vmcs_pa == -1ull, "vmcs_pa must be -1ull.");
+
+ free(state);
+}
+
+int main(int argc, char *argv[])
+{
+ struct kvm_vm *vm;
+ struct kvm_nested_state state;
+ struct kvm_cpuid_entry2 *entry = kvm_get_supported_cpuid_entry(1);
+
+ /*
+ * AMD currently does not implement set_nested_state, so for now we
+ * just early out.
+ */
+ if (!(entry->ecx & CPUID_VMX)) {
+ fprintf(stderr, "nested VMX not enabled, skipping test\n");
+ exit(KSFT_SKIP);
+ }
+
+ vm = vm_create_default(VCPU_ID, 0, 0);
+
+ /* Passing a NULL kvm_nested_state causes a EFAULT. */
+ test_nested_state_expect_efault(vm, NULL);
+
+ /* 'size' cannot be smaller than sizeof(kvm_nested_state). */
+ set_default_state(&state);
+ state.size = 0;
+ test_nested_state_expect_einval(vm, &state);
+
+ /*
+ * Setting the flags 0xf fails the flags check. The only flags that
+ * can be used are:
+ * KVM_STATE_NESTED_GUEST_MODE
+ * KVM_STATE_NESTED_RUN_PENDING
+ * KVM_STATE_NESTED_EVMCS
+ */
+ set_default_state(&state);
+ state.flags = 0xf;
+ test_nested_state_expect_einval(vm, &state);
+
+ /*
+ * If KVM_STATE_NESTED_RUN_PENDING is set then
+ * KVM_STATE_NESTED_GUEST_MODE has to be set as well.
+ */
+ set_default_state(&state);
+ state.flags = KVM_STATE_NESTED_RUN_PENDING;
+ test_nested_state_expect_einval(vm, &state);
+
+ /*
+ * TODO: When SVM support is added for KVM_SET_NESTED_STATE
+ * add tests here to support it like VMX.
+ */
+ if (entry->ecx & CPUID_VMX)
+ test_vmx_nested_state(vm);
+
+ kvm_vm_free(vm);
+ return 0;
+}
--
2.21.0.593.g511ec345e18-goog
^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH 3/3] tests: kvm: Add tests for KVM_SET_NESTED_STATE
2019-05-02 18:31 [PATCH 3/3] tests: kvm: Add tests for KVM_SET_NESTED_STATE Aaron Lewis
@ 2019-05-03 16:44 ` Sean Christopherson
2019-05-08 12:07 ` Paolo Bonzini
2019-05-08 12:05 ` Paolo Bonzini
1 sibling, 1 reply; 7+ messages in thread
From: Sean Christopherson @ 2019-05-03 16:44 UTC (permalink / raw)
To: Aaron Lewis; +Cc: pbonzini, rkrcmar, jmattson, marcorr, kvm, Peter Shier
On Thu, May 02, 2019 at 11:31:41AM -0700, Aaron Lewis wrote:
> Add tests for KVM_SET_NESTED_STATE and for various code paths in its implementation in vmx_set_nested_state().
>
> Signed-off-by: Aaron Lewis <aaronlewis@google.com>
> Reviewed-by: Marc Orr <marcorr@google.com>
> Reviewed-by: Peter Shier <pshier@google.com>
> ---
...
> +int main(int argc, char *argv[])
> +{
> + struct kvm_vm *vm;
> + struct kvm_nested_state state;
> + struct kvm_cpuid_entry2 *entry = kvm_get_supported_cpuid_entry(1);
> +
> + /*
> + * AMD currently does not implement set_nested_state, so for now we
> + * just early out.
> + */
> + if (!(entry->ecx & CPUID_VMX)) {
> + fprintf(stderr, "nested VMX not enabled, skipping test\n");
> + exit(KSFT_SKIP);
> + }
Hmm, probably better to check KVM_CAP_NESTED_STATE. If/when support for
AMD is added it'd be good to automatically pick up whatever testing we can.
As a bonus it'll test the cap code.
> +
> + vm = vm_create_default(VCPU_ID, 0, 0);
> +
> + /* Passing a NULL kvm_nested_state causes a EFAULT. */
> + test_nested_state_expect_efault(vm, NULL);
> +
> + /* 'size' cannot be smaller than sizeof(kvm_nested_state). */
> + set_default_state(&state);
> + state.size = 0;
> + test_nested_state_expect_einval(vm, &state);
> +
> + /*
> + * Setting the flags 0xf fails the flags check. The only flags that
> + * can be used are:
> + * KVM_STATE_NESTED_GUEST_MODE
> + * KVM_STATE_NESTED_RUN_PENDING
> + * KVM_STATE_NESTED_EVMCS
> + */
> + set_default_state(&state);
> + state.flags = 0xf;
> + test_nested_state_expect_einval(vm, &state);
> +
> + /*
> + * If KVM_STATE_NESTED_RUN_PENDING is set then
> + * KVM_STATE_NESTED_GUEST_MODE has to be set as well.
> + */
> + set_default_state(&state);
> + state.flags = KVM_STATE_NESTED_RUN_PENDING;
> + test_nested_state_expect_einval(vm, &state);
> +
> + /*
> + * TODO: When SVM support is added for KVM_SET_NESTED_STATE
> + * add tests here to support it like VMX.
> + */
> + if (entry->ecx & CPUID_VMX)
> + test_vmx_nested_state(vm);
> +
> + kvm_vm_free(vm);
> + return 0;
> +}
> --
> 2.21.0.593.g511ec345e18-goog
>
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH 3/3] tests: kvm: Add tests for KVM_SET_NESTED_STATE
2019-05-02 18:31 [PATCH 3/3] tests: kvm: Add tests for KVM_SET_NESTED_STATE Aaron Lewis
2019-05-03 16:44 ` Sean Christopherson
@ 2019-05-08 12:05 ` Paolo Bonzini
2019-05-20 13:07 ` Thomas Huth
1 sibling, 1 reply; 7+ messages in thread
From: Paolo Bonzini @ 2019-05-08 12:05 UTC (permalink / raw)
To: Aaron Lewis, rkrcmar, jmattson, marcorr, kvm; +Cc: Peter Shier
On 02/05/19 13:31, Aaron Lewis wrote:
> Add tests for KVM_SET_NESTED_STATE and for various code paths in its implementation in vmx_set_nested_state().
>
> Signed-off-by: Aaron Lewis <aaronlewis@google.com>
> Reviewed-by: Marc Orr <marcorr@google.com>
> Reviewed-by: Peter Shier <pshier@google.com>
> ---
> tools/testing/selftests/kvm/.gitignore | 1 +
> tools/testing/selftests/kvm/Makefile | 1 +
> .../testing/selftests/kvm/include/kvm_util.h | 4 +
> tools/testing/selftests/kvm/lib/kvm_util.c | 32 ++
> .../kvm/x86_64/vmx_set_nested_state_test.c | 275 ++++++++++++++++++
> 5 files changed, 313 insertions(+)
> create mode 100644 tools/testing/selftests/kvm/x86_64/vmx_set_nested_state_test.c
>
> diff --git a/tools/testing/selftests/kvm/.gitignore b/tools/testing/selftests/kvm/.gitignore
> index 2689d1ea6d7a..bbaa97dbd19e 100644
> --- a/tools/testing/selftests/kvm/.gitignore
> +++ b/tools/testing/selftests/kvm/.gitignore
> @@ -6,4 +6,5 @@
> /x86_64/vmx_close_while_nested_test
> /x86_64/vmx_tsc_adjust_test
> /x86_64/state_test
> +/x86_64/vmx_set_nested_state_test
> /dirty_log_test
> diff --git a/tools/testing/selftests/kvm/Makefile b/tools/testing/selftests/kvm/Makefile
> index f8588cca2bef..10eff4317226 100644
> --- a/tools/testing/selftests/kvm/Makefile
> +++ b/tools/testing/selftests/kvm/Makefile
> @@ -20,6 +20,7 @@ TEST_GEN_PROGS_x86_64 += x86_64/evmcs_test
> TEST_GEN_PROGS_x86_64 += x86_64/hyperv_cpuid
> TEST_GEN_PROGS_x86_64 += x86_64/vmx_close_while_nested_test
> TEST_GEN_PROGS_x86_64 += x86_64/smm_test
> +TEST_GEN_PROGS_x86_64 += x86_64/vmx_set_nested_state_test
> TEST_GEN_PROGS_x86_64 += dirty_log_test
> TEST_GEN_PROGS_x86_64 += clear_dirty_log_test
>
> diff --git a/tools/testing/selftests/kvm/include/kvm_util.h b/tools/testing/selftests/kvm/include/kvm_util.h
> index 07b71ad9734a..8c6b9619797d 100644
> --- a/tools/testing/selftests/kvm/include/kvm_util.h
> +++ b/tools/testing/selftests/kvm/include/kvm_util.h
> @@ -118,6 +118,10 @@ void vcpu_events_get(struct kvm_vm *vm, uint32_t vcpuid,
> struct kvm_vcpu_events *events);
> void vcpu_events_set(struct kvm_vm *vm, uint32_t vcpuid,
> struct kvm_vcpu_events *events);
> +void vcpu_nested_state_get(struct kvm_vm *vm, uint32_t vcpuid,
> + struct kvm_nested_state *state);
> +int vcpu_nested_state_set(struct kvm_vm *vm, uint32_t vcpuid,
> + struct kvm_nested_state *state, bool ignore_error);
>
> const char *exit_reason_str(unsigned int exit_reason);
>
> diff --git a/tools/testing/selftests/kvm/lib/kvm_util.c b/tools/testing/selftests/kvm/lib/kvm_util.c
> index 4ca96b228e46..e9113857f44e 100644
> --- a/tools/testing/selftests/kvm/lib/kvm_util.c
> +++ b/tools/testing/selftests/kvm/lib/kvm_util.c
> @@ -1250,6 +1250,38 @@ void vcpu_events_set(struct kvm_vm *vm, uint32_t vcpuid,
> ret, errno);
> }
>
> +void vcpu_nested_state_get(struct kvm_vm *vm, uint32_t vcpuid,
> + struct kvm_nested_state *state)
> +{
> + struct vcpu *vcpu = vcpu_find(vm, vcpuid);
> + int ret;
> +
> + TEST_ASSERT(vcpu != NULL, "vcpu not found, vcpuid: %u", vcpuid);
> +
> + ret = ioctl(vcpu->fd, KVM_GET_NESTED_STATE, state);
> + TEST_ASSERT(ret == 0,
> + "KVM_SET_NESTED_STATE failed, ret: %i errno: %i",
> + ret, errno);
> +}
> +
> +int vcpu_nested_state_set(struct kvm_vm *vm, uint32_t vcpuid,
> + struct kvm_nested_state *state, bool ignore_error)
> +{
> + struct vcpu *vcpu = vcpu_find(vm, vcpuid);
> + int ret;
> +
> + TEST_ASSERT(vcpu != NULL, "vcpu not found, vcpuid: %u", vcpuid);
> +
> + ret = ioctl(vcpu->fd, KVM_SET_NESTED_STATE, state);
> + if (!ignore_error) {
> + TEST_ASSERT(ret == 0,
> + "KVM_SET_NESTED_STATE failed, ret: %i errno: %i",
> + ret, errno);
> + }
> +
> + return ret;
> +}
> +
> /*
> * VM VCPU System Regs Get
> *
> diff --git a/tools/testing/selftests/kvm/x86_64/vmx_set_nested_state_test.c b/tools/testing/selftests/kvm/x86_64/vmx_set_nested_state_test.c
> new file mode 100644
> index 000000000000..5eea24087d19
> --- /dev/null
> +++ b/tools/testing/selftests/kvm/x86_64/vmx_set_nested_state_test.c
> @@ -0,0 +1,275 @@
> +/*
> + * vmx_set_nested_state_test
> + *
> + * Copyright (C) 2019, Google LLC.
> + *
> + * This work is licensed under the terms of the GNU GPL, version 2.
> + *
> + * This test verifies the integrity of calling the ioctl KVM_SET_NESTED_STATE.
> + */
> +
> +#include "test_util.h"
> +#include "kvm_util.h"
> +#include "processor.h"
> +#include "vmx.h"
> +
> +#include <errno.h>
> +#include <linux/kvm.h>
> +#include <string.h>
> +#include <sys/ioctl.h>
> +#include <unistd.h>
> +
> +/*
> + * Mirror of VMCS12_REVISION in arch/x86/kvm/vmx/vmcs12.h. If that value
> + * changes this should be updated.
> + */
> +#define VMCS12_REVISION 0x11e57ed0
> +#define VCPU_ID 5
> +
> +void test_nested_state(struct kvm_vm *vm, struct kvm_nested_state *state)
> +{
> + volatile struct kvm_run *run;
> +
> + vcpu_nested_state_set(vm, VCPU_ID, state, false);
> + run = vcpu_state(vm, VCPU_ID);
> + vcpu_run(vm, VCPU_ID);
> + 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));
> +}
> +
> +void test_nested_state_expect_errno(struct kvm_vm *vm,
> + struct kvm_nested_state *state,
> + int expected_errno)
> +{
> + volatile struct kvm_run *run;
> + int rv;
> +
> + rv = vcpu_nested_state_set(vm, VCPU_ID, state, true);
> + TEST_ASSERT(rv == -1 && errno == expected_errno,
> + "Expected %s (%d) from vcpu_nested_state_set but got rv: %i errno: %s (%d)",
> + strerror(expected_errno), expected_errno, rv, strerror(errno),
> + errno);
> + run = vcpu_state(vm, VCPU_ID);
> + vcpu_run(vm, VCPU_ID);
> + 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));
> +}
> +
> +void test_nested_state_expect_einval(struct kvm_vm *vm,
> + struct kvm_nested_state *state)
> +{
> + test_nested_state_expect_errno(vm, state, EINVAL);
> +}
> +
> +void test_nested_state_expect_efault(struct kvm_vm *vm,
> + struct kvm_nested_state *state)
> +{
> + test_nested_state_expect_errno(vm, state, EFAULT);
> +}
> +
> +void set_revision_id_for_vmcs12(struct kvm_nested_state *state,
> + u32 vmcs12_revision)
> +{
> + /* Set revision_id in vmcs12 to vmcs12_revision. */
> + *(u32 *)(state->data) = vmcs12_revision;
> +}
> +
> +void set_default_state(struct kvm_nested_state *state)
> +{
> + memset(state, 0, sizeof(*state));
> + state->flags = KVM_STATE_NESTED_RUN_PENDING |
> + KVM_STATE_NESTED_GUEST_MODE;
> + state->format = 0;
> + state->size = sizeof(*state);
> +}
> +
> +void set_default_vmx_state(struct kvm_nested_state *state, int size)
> +{
> + memset(state, 0, size);
> + state->flags = KVM_STATE_NESTED_GUEST_MODE |
> + KVM_STATE_NESTED_RUN_PENDING |
> + KVM_STATE_NESTED_EVMCS;
> + state->format = 0;
> + state->size = size;
> + state->vmx.vmxon_pa = 0x1000;
> + state->vmx.vmcs_pa = 0x2000;
> + state->vmx.smm.flags = 0;
> + set_revision_id_for_vmcs12(state, VMCS12_REVISION);
> +}
> +
> +void test_vmx_nested_state(struct kvm_vm *vm)
> +{
> + /* Add a page for VMCS12. */
> + const int state_sz = sizeof(struct kvm_nested_state) + getpagesize();
> + struct kvm_nested_state *state =
> + (struct kvm_nested_state *)malloc(state_sz);
> +
> + /* The format must be set to 0. 0 for VMX, 1 for SVM. */
> + set_default_vmx_state(state, state_sz);
> + state->format = 1;
> + test_nested_state_expect_einval(vm, state);
> +
> + /*
> + * We cannot virtualize anything if the guest does not have VMX
> + * enabled.
> + */
> + set_default_vmx_state(state, state_sz);
> + test_nested_state_expect_einval(vm, state);
> +
> + /*
> + * We cannot virtualize anything if the guest does not have VMX
> + * enabled. We expect KVM_SET_NESTED_STATE to return 0 if vmxon_pa
> + * is set to -1ull.
> + */
> + set_default_vmx_state(state, state_sz);
> + state->vmx.vmxon_pa = -1ull;
> + test_nested_state(vm, state);
> +
> + /* Enable VMX in the guest CPUID. */
> + vcpu_set_cpuid(vm, VCPU_ID, kvm_get_supported_cpuid());
> +
> + /* It is invalid to have vmxon_pa == -1ull and SMM flags non-zero. */
> + set_default_vmx_state(state, state_sz);
> + state->vmx.vmxon_pa = -1ull;
> + state->vmx.smm.flags = 1;
> + test_nested_state_expect_einval(vm, state);
> +
> + /* It is invalid to have vmxon_pa == -1ull and vmcs_pa != -1ull. */
> + set_default_vmx_state(state, state_sz);
> + state->vmx.vmxon_pa = -1ull;
> + state->vmx.vmcs_pa = 0;
> + test_nested_state_expect_einval(vm, state);
> +
> + /*
> + * Setting vmxon_pa == -1ull and vmcs_pa == -1ull exits early without
> + * setting the nested state.
> + */
> + set_default_vmx_state(state, state_sz);
> + state->vmx.vmxon_pa = -1ull;
> + state->vmx.vmcs_pa = -1ull;
> + test_nested_state(vm, state);
> +
> + /* It is invalid to have vmxon_pa set to a non-page aligned address. */
> + set_default_vmx_state(state, state_sz);
> + state->vmx.vmxon_pa = 1;
> + test_nested_state_expect_einval(vm, state);
> +
> + /*
> + * It is invalid to have KVM_STATE_NESTED_SMM_GUEST_MODE and
> + * KVM_STATE_NESTED_GUEST_MODE set together.
> + */
> + set_default_vmx_state(state, state_sz);
> + state->flags = KVM_STATE_NESTED_GUEST_MODE |
> + KVM_STATE_NESTED_RUN_PENDING;
> + state->vmx.smm.flags = KVM_STATE_NESTED_SMM_GUEST_MODE;
> + test_nested_state_expect_einval(vm, state);
> +
> + /*
> + * It is invalid to have any of the SMM flags set besides:
> + * KVM_STATE_NESTED_SMM_GUEST_MODE
> + * KVM_STATE_NESTED_SMM_VMXON
> + */
> + set_default_vmx_state(state, state_sz);
> + state->vmx.smm.flags = ~(KVM_STATE_NESTED_SMM_GUEST_MODE |
> + KVM_STATE_NESTED_SMM_VMXON);
> + test_nested_state_expect_einval(vm, state);
> +
> + /* Outside SMM, SMM flags must be zero. */
> + set_default_vmx_state(state, state_sz);
> + state->flags = 0;
> + state->vmx.smm.flags = KVM_STATE_NESTED_SMM_GUEST_MODE;
> + test_nested_state_expect_einval(vm, state);
> +
> + /* Size must be large enough to fit kvm_nested_state and vmcs12. */
> + set_default_vmx_state(state, state_sz);
> + state->size = sizeof(*state);
> + test_nested_state(vm, state);
> +
> + /* vmxon_pa cannot be the same address as vmcs_pa. */
> + set_default_vmx_state(state, state_sz);
> + state->vmx.vmxon_pa = 0;
> + state->vmx.vmcs_pa = 0;
> + test_nested_state_expect_einval(vm, state);
> +
> + /* The revision id for vmcs12 must be VMCS12_REVISION. */
> + set_default_vmx_state(state, state_sz);
> + set_revision_id_for_vmcs12(state, 0);
> + test_nested_state_expect_einval(vm, state);
> +
> + /*
> + * Test that if we leave nesting the state reflects that when we get
> + * it again.
> + */
> + set_default_vmx_state(state, state_sz);
> + state->vmx.vmxon_pa = -1ull;
> + state->vmx.vmcs_pa = -1ull;
> + state->flags = 0;
> + test_nested_state(vm, state);
> + vcpu_nested_state_get(vm, VCPU_ID, state);
> + TEST_ASSERT(state->size >= sizeof(*state) && state->size <= state_sz,
> + "Size must be between %d and %d. The size returned was %d.",
> + sizeof(*state), state_sz, state->size);
> + TEST_ASSERT(state->vmx.vmxon_pa == -1ull, "vmxon_pa must be -1ull.");
> + TEST_ASSERT(state->vmx.vmcs_pa == -1ull, "vmcs_pa must be -1ull.");
> +
> + free(state);
> +}
> +
> +int main(int argc, char *argv[])
> +{
> + struct kvm_vm *vm;
> + struct kvm_nested_state state;
> + struct kvm_cpuid_entry2 *entry = kvm_get_supported_cpuid_entry(1);
> +
> + /*
> + * AMD currently does not implement set_nested_state, so for now we
> + * just early out.
> + */
> + if (!(entry->ecx & CPUID_VMX)) {
> + fprintf(stderr, "nested VMX not enabled, skipping test\n");
> + exit(KSFT_SKIP);
> + }
> +
> + vm = vm_create_default(VCPU_ID, 0, 0);
> +
> + /* Passing a NULL kvm_nested_state causes a EFAULT. */
> + test_nested_state_expect_efault(vm, NULL);
> +
> + /* 'size' cannot be smaller than sizeof(kvm_nested_state). */
> + set_default_state(&state);
> + state.size = 0;
> + test_nested_state_expect_einval(vm, &state);
> +
> + /*
> + * Setting the flags 0xf fails the flags check. The only flags that
> + * can be used are:
> + * KVM_STATE_NESTED_GUEST_MODE
> + * KVM_STATE_NESTED_RUN_PENDING
> + * KVM_STATE_NESTED_EVMCS
> + */
> + set_default_state(&state);
> + state.flags = 0xf;
> + test_nested_state_expect_einval(vm, &state);
> +
> + /*
> + * If KVM_STATE_NESTED_RUN_PENDING is set then
> + * KVM_STATE_NESTED_GUEST_MODE has to be set as well.
> + */
> + set_default_state(&state);
> + state.flags = KVM_STATE_NESTED_RUN_PENDING;
> + test_nested_state_expect_einval(vm, &state);
> +
> + /*
> + * TODO: When SVM support is added for KVM_SET_NESTED_STATE
> + * add tests here to support it like VMX.
> + */
> + if (entry->ecx & CPUID_VMX)
> + test_vmx_nested_state(vm);
> +
> + kvm_vm_free(vm);
> + return 0;
> +}
>
Queued all three, thanks.
Paolo
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH 3/3] tests: kvm: Add tests for KVM_SET_NESTED_STATE
2019-05-03 16:44 ` Sean Christopherson
@ 2019-05-08 12:07 ` Paolo Bonzini
0 siblings, 0 replies; 7+ messages in thread
From: Paolo Bonzini @ 2019-05-08 12:07 UTC (permalink / raw)
To: Sean Christopherson, Aaron Lewis
Cc: rkrcmar, jmattson, marcorr, kvm, Peter Shier
On 03/05/19 11:44, Sean Christopherson wrote:
> Hmm, probably better to check KVM_CAP_NESTED_STATE. If/when support for
> AMD is added it'd be good to automatically pick up whatever testing we can.
> As a bonus it'll test the cap code.
>
Fixed like this:
diff --git a/tools/testing/selftests/kvm/x86_64/vmx_set_nested_state_test.c b/tools/testing/selftests/kvm/x86_64/vmx_set_nested_state_test.c
index 5eea24087d19..61a2163cf9f1 100644
--- a/tools/testing/selftests/kvm/x86_64/vmx_set_nested_state_test.c
+++ b/tools/testing/selftests/kvm/x86_64/vmx_set_nested_state_test.c
@@ -225,6 +225,11 @@ int main(int argc, char *argv[])
struct kvm_nested_state state;
struct kvm_cpuid_entry2 *entry = kvm_get_supported_cpuid_entry(1);
+ if (!kvm_check_cap(KVM_CAP_NESTED_STATE)) {
+ printf("KVM_CAP_NESTED_STATE not available, skipping test\n");
+ exit(KSFT_SKIP);
+ }
+
/*
* AMD currently does not implement set_nested_state, so for now we
* just early out.
Paolo
^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH 3/3] tests: kvm: Add tests for KVM_SET_NESTED_STATE
2019-05-08 12:05 ` Paolo Bonzini
@ 2019-05-20 13:07 ` Thomas Huth
2019-05-20 13:28 ` Paolo Bonzini
0 siblings, 1 reply; 7+ messages in thread
From: Thomas Huth @ 2019-05-20 13:07 UTC (permalink / raw)
To: Paolo Bonzini, Aaron Lewis, rkrcmar, jmattson, marcorr, kvm
Cc: Peter Shier, Andrew Jones
On 08/05/2019 14.05, Paolo Bonzini wrote:
> On 02/05/19 13:31, Aaron Lewis wrote:
>> Add tests for KVM_SET_NESTED_STATE and for various code paths in its implementation in vmx_set_nested_state().
>>
>> Signed-off-by: Aaron Lewis <aaronlewis@google.com>
>> Reviewed-by: Marc Orr <marcorr@google.com>
>> Reviewed-by: Peter Shier <pshier@google.com>
>> ---
>> tools/testing/selftests/kvm/.gitignore | 1 +
>> tools/testing/selftests/kvm/Makefile | 1 +
>> .../testing/selftests/kvm/include/kvm_util.h | 4 +
>> tools/testing/selftests/kvm/lib/kvm_util.c | 32 ++
>> .../kvm/x86_64/vmx_set_nested_state_test.c | 275 ++++++++++++++++++
>> 5 files changed, 313 insertions(+)
>> create mode 100644 tools/testing/selftests/kvm/x86_64/vmx_set_nested_state_test.c
>>
>> diff --git a/tools/testing/selftests/kvm/.gitignore b/tools/testing/selftests/kvm/.gitignore
>> index 2689d1ea6d7a..bbaa97dbd19e 100644
>> --- a/tools/testing/selftests/kvm/.gitignore
>> +++ b/tools/testing/selftests/kvm/.gitignore
>> @@ -6,4 +6,5 @@
>> /x86_64/vmx_close_while_nested_test
>> /x86_64/vmx_tsc_adjust_test
>> /x86_64/state_test
>> +/x86_64/vmx_set_nested_state_test
>> /dirty_log_test
>> diff --git a/tools/testing/selftests/kvm/Makefile b/tools/testing/selftests/kvm/Makefile
>> index f8588cca2bef..10eff4317226 100644
>> --- a/tools/testing/selftests/kvm/Makefile
>> +++ b/tools/testing/selftests/kvm/Makefile
>> @@ -20,6 +20,7 @@ TEST_GEN_PROGS_x86_64 += x86_64/evmcs_test
>> TEST_GEN_PROGS_x86_64 += x86_64/hyperv_cpuid
>> TEST_GEN_PROGS_x86_64 += x86_64/vmx_close_while_nested_test
>> TEST_GEN_PROGS_x86_64 += x86_64/smm_test
>> +TEST_GEN_PROGS_x86_64 += x86_64/vmx_set_nested_state_test
>> TEST_GEN_PROGS_x86_64 += dirty_log_test
>> TEST_GEN_PROGS_x86_64 += clear_dirty_log_test
>>
>> diff --git a/tools/testing/selftests/kvm/include/kvm_util.h b/tools/testing/selftests/kvm/include/kvm_util.h
>> index 07b71ad9734a..8c6b9619797d 100644
>> --- a/tools/testing/selftests/kvm/include/kvm_util.h
>> +++ b/tools/testing/selftests/kvm/include/kvm_util.h
>> @@ -118,6 +118,10 @@ void vcpu_events_get(struct kvm_vm *vm, uint32_t vcpuid,
>> struct kvm_vcpu_events *events);
>> void vcpu_events_set(struct kvm_vm *vm, uint32_t vcpuid,
>> struct kvm_vcpu_events *events);
>> +void vcpu_nested_state_get(struct kvm_vm *vm, uint32_t vcpuid,
>> + struct kvm_nested_state *state);
>> +int vcpu_nested_state_set(struct kvm_vm *vm, uint32_t vcpuid,
>> + struct kvm_nested_state *state, bool ignore_error);
>>
[...]
>
> Queued all three, thanks.
struct kvm_nested_state is only declared on x86 ... so this currently
fails for me when compiling the kvm selftests for s390x:
include/kvm_util.h:124:14: warning: ‘struct kvm_nested_state’ declared
inside parameter list will not be visible outside of this definition or
declaration
struct kvm_nested_state *state);
^~~~~~~~~~~~~~~~
include/kvm_util.h:126:13: warning: ‘struct kvm_nested_state’ declared
inside parameter list will not be visible outside of this definition or
declaration
struct kvm_nested_state *state, bool ignore_error);
^~~~~~~~~~~~~~~~
... so I guess these functions should be wrapped with "#ifdef __x86_64__" ?
Thomas
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH 3/3] tests: kvm: Add tests for KVM_SET_NESTED_STATE
2019-05-20 13:07 ` Thomas Huth
@ 2019-05-20 13:28 ` Paolo Bonzini
2019-05-23 9:13 ` Andrew Jones
0 siblings, 1 reply; 7+ messages in thread
From: Paolo Bonzini @ 2019-05-20 13:28 UTC (permalink / raw)
To: Thomas Huth, Aaron Lewis, rkrcmar, jmattson, marcorr, kvm
Cc: Peter Shier, Andrew Jones
On 20/05/19 15:07, Thomas Huth wrote:
> On 08/05/2019 14.05, Paolo Bonzini wrote:
>> On 02/05/19 13:31, Aaron Lewis wrote:
>>> Add tests for KVM_SET_NESTED_STATE and for various code paths in its implementation in vmx_set_nested_state().
>>>
>>> Signed-off-by: Aaron Lewis <aaronlewis@google.com>
>>> Reviewed-by: Marc Orr <marcorr@google.com>
>>> Reviewed-by: Peter Shier <pshier@google.com>
>>> ---
>>> tools/testing/selftests/kvm/.gitignore | 1 +
>>> tools/testing/selftests/kvm/Makefile | 1 +
>>> .../testing/selftests/kvm/include/kvm_util.h | 4 +
>>> tools/testing/selftests/kvm/lib/kvm_util.c | 32 ++
>>> .../kvm/x86_64/vmx_set_nested_state_test.c | 275 ++++++++++++++++++
>>> 5 files changed, 313 insertions(+)
>>> create mode 100644 tools/testing/selftests/kvm/x86_64/vmx_set_nested_state_test.c
>>>
>>> diff --git a/tools/testing/selftests/kvm/.gitignore b/tools/testing/selftests/kvm/.gitignore
>>> index 2689d1ea6d7a..bbaa97dbd19e 100644
>>> --- a/tools/testing/selftests/kvm/.gitignore
>>> +++ b/tools/testing/selftests/kvm/.gitignore
>>> @@ -6,4 +6,5 @@
>>> /x86_64/vmx_close_while_nested_test
>>> /x86_64/vmx_tsc_adjust_test
>>> /x86_64/state_test
>>> +/x86_64/vmx_set_nested_state_test
>>> /dirty_log_test
>>> diff --git a/tools/testing/selftests/kvm/Makefile b/tools/testing/selftests/kvm/Makefile
>>> index f8588cca2bef..10eff4317226 100644
>>> --- a/tools/testing/selftests/kvm/Makefile
>>> +++ b/tools/testing/selftests/kvm/Makefile
>>> @@ -20,6 +20,7 @@ TEST_GEN_PROGS_x86_64 += x86_64/evmcs_test
>>> TEST_GEN_PROGS_x86_64 += x86_64/hyperv_cpuid
>>> TEST_GEN_PROGS_x86_64 += x86_64/vmx_close_while_nested_test
>>> TEST_GEN_PROGS_x86_64 += x86_64/smm_test
>>> +TEST_GEN_PROGS_x86_64 += x86_64/vmx_set_nested_state_test
>>> TEST_GEN_PROGS_x86_64 += dirty_log_test
>>> TEST_GEN_PROGS_x86_64 += clear_dirty_log_test
>>>
>>> diff --git a/tools/testing/selftests/kvm/include/kvm_util.h b/tools/testing/selftests/kvm/include/kvm_util.h
>>> index 07b71ad9734a..8c6b9619797d 100644
>>> --- a/tools/testing/selftests/kvm/include/kvm_util.h
>>> +++ b/tools/testing/selftests/kvm/include/kvm_util.h
>>> @@ -118,6 +118,10 @@ void vcpu_events_get(struct kvm_vm *vm, uint32_t vcpuid,
>>> struct kvm_vcpu_events *events);
>>> void vcpu_events_set(struct kvm_vm *vm, uint32_t vcpuid,
>>> struct kvm_vcpu_events *events);
>>> +void vcpu_nested_state_get(struct kvm_vm *vm, uint32_t vcpuid,
>>> + struct kvm_nested_state *state);
>>> +int vcpu_nested_state_set(struct kvm_vm *vm, uint32_t vcpuid,
>>> + struct kvm_nested_state *state, bool ignore_error);
>>>
> [...]
>>
>> Queued all three, thanks.
>
> struct kvm_nested_state is only declared on x86 ... so this currently
> fails for me when compiling the kvm selftests for s390x:
>
> include/kvm_util.h:124:14: warning: ‘struct kvm_nested_state’ declared
> inside parameter list will not be visible outside of this definition or
> declaration
> struct kvm_nested_state *state);
> ^~~~~~~~~~~~~~~~
> include/kvm_util.h:126:13: warning: ‘struct kvm_nested_state’ declared
> inside parameter list will not be visible outside of this definition or
> declaration
> struct kvm_nested_state *state, bool ignore_error);
> ^~~~~~~~~~~~~~~~
>
> ... so I guess these functions should be wrapped with "#ifdef __x86_64__" ?
Yes, please.
Paolo
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH 3/3] tests: kvm: Add tests for KVM_SET_NESTED_STATE
2019-05-20 13:28 ` Paolo Bonzini
@ 2019-05-23 9:13 ` Andrew Jones
0 siblings, 0 replies; 7+ messages in thread
From: Andrew Jones @ 2019-05-23 9:13 UTC (permalink / raw)
To: Paolo Bonzini
Cc: Thomas Huth, Aaron Lewis, rkrcmar, jmattson, marcorr, kvm, Peter Shier
On Mon, May 20, 2019 at 03:28:22PM +0200, Paolo Bonzini wrote:
> On 20/05/19 15:07, Thomas Huth wrote:
> > On 08/05/2019 14.05, Paolo Bonzini wrote:
> >> On 02/05/19 13:31, Aaron Lewis wrote:
> >>> Add tests for KVM_SET_NESTED_STATE and for various code paths in its implementation in vmx_set_nested_state().
> >>>
> >>> Signed-off-by: Aaron Lewis <aaronlewis@google.com>
> >>> Reviewed-by: Marc Orr <marcorr@google.com>
> >>> Reviewed-by: Peter Shier <pshier@google.com>
> >>> ---
> >>> tools/testing/selftests/kvm/.gitignore | 1 +
> >>> tools/testing/selftests/kvm/Makefile | 1 +
> >>> .../testing/selftests/kvm/include/kvm_util.h | 4 +
> >>> tools/testing/selftests/kvm/lib/kvm_util.c | 32 ++
> >>> .../kvm/x86_64/vmx_set_nested_state_test.c | 275 ++++++++++++++++++
> >>> 5 files changed, 313 insertions(+)
> >>> create mode 100644 tools/testing/selftests/kvm/x86_64/vmx_set_nested_state_test.c
> >>>
> >>> diff --git a/tools/testing/selftests/kvm/.gitignore b/tools/testing/selftests/kvm/.gitignore
> >>> index 2689d1ea6d7a..bbaa97dbd19e 100644
> >>> --- a/tools/testing/selftests/kvm/.gitignore
> >>> +++ b/tools/testing/selftests/kvm/.gitignore
> >>> @@ -6,4 +6,5 @@
> >>> /x86_64/vmx_close_while_nested_test
> >>> /x86_64/vmx_tsc_adjust_test
> >>> /x86_64/state_test
> >>> +/x86_64/vmx_set_nested_state_test
> >>> /dirty_log_test
> >>> diff --git a/tools/testing/selftests/kvm/Makefile b/tools/testing/selftests/kvm/Makefile
> >>> index f8588cca2bef..10eff4317226 100644
> >>> --- a/tools/testing/selftests/kvm/Makefile
> >>> +++ b/tools/testing/selftests/kvm/Makefile
> >>> @@ -20,6 +20,7 @@ TEST_GEN_PROGS_x86_64 += x86_64/evmcs_test
> >>> TEST_GEN_PROGS_x86_64 += x86_64/hyperv_cpuid
> >>> TEST_GEN_PROGS_x86_64 += x86_64/vmx_close_while_nested_test
> >>> TEST_GEN_PROGS_x86_64 += x86_64/smm_test
> >>> +TEST_GEN_PROGS_x86_64 += x86_64/vmx_set_nested_state_test
> >>> TEST_GEN_PROGS_x86_64 += dirty_log_test
> >>> TEST_GEN_PROGS_x86_64 += clear_dirty_log_test
> >>>
> >>> diff --git a/tools/testing/selftests/kvm/include/kvm_util.h b/tools/testing/selftests/kvm/include/kvm_util.h
> >>> index 07b71ad9734a..8c6b9619797d 100644
> >>> --- a/tools/testing/selftests/kvm/include/kvm_util.h
> >>> +++ b/tools/testing/selftests/kvm/include/kvm_util.h
> >>> @@ -118,6 +118,10 @@ void vcpu_events_get(struct kvm_vm *vm, uint32_t vcpuid,
> >>> struct kvm_vcpu_events *events);
> >>> void vcpu_events_set(struct kvm_vm *vm, uint32_t vcpuid,
> >>> struct kvm_vcpu_events *events);
> >>> +void vcpu_nested_state_get(struct kvm_vm *vm, uint32_t vcpuid,
> >>> + struct kvm_nested_state *state);
> >>> +int vcpu_nested_state_set(struct kvm_vm *vm, uint32_t vcpuid,
> >>> + struct kvm_nested_state *state, bool ignore_error);
> >>>
> > [...]
> >>
> >> Queued all three, thanks.
> >
> > struct kvm_nested_state is only declared on x86 ... so this currently
> > fails for me when compiling the kvm selftests for s390x:
> >
> > include/kvm_util.h:124:14: warning: ‘struct kvm_nested_state’ declared
> > inside parameter list will not be visible outside of this definition or
> > declaration
> > struct kvm_nested_state *state);
> > ^~~~~~~~~~~~~~~~
> > include/kvm_util.h:126:13: warning: ‘struct kvm_nested_state’ declared
> > inside parameter list will not be visible outside of this definition or
> > declaration
> > struct kvm_nested_state *state, bool ignore_error);
> > ^~~~~~~~~~~~~~~~
> >
> > ... so I guess these functions should be wrapped with "#ifdef __x86_64__" ?
>
> Yes, please.
>
Yes, this breaks the aarch64 compile. Awaiting Thomas' patch.
Thanks,
drew
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2019-05-23 9:13 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-05-02 18:31 [PATCH 3/3] tests: kvm: Add tests for KVM_SET_NESTED_STATE Aaron Lewis
2019-05-03 16:44 ` Sean Christopherson
2019-05-08 12:07 ` Paolo Bonzini
2019-05-08 12:05 ` Paolo Bonzini
2019-05-20 13:07 ` Thomas Huth
2019-05-20 13:28 ` Paolo Bonzini
2019-05-23 9:13 ` Andrew Jones
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).