From: Andrew Jones <drjones@redhat.com> To: Oliver Upton <oupton@google.com> Cc: kvm@vger.kernel.org, Marc Zyngier <maz@kernel.org>, Peter Shier <pshier@google.com>, kvmarm@lists.cs.columbia.edu Subject: Re: [PATCH v2 11/11] selftests: KVM: Test SYSTEM_SUSPEND PSCI call Date: Tue, 5 Oct 2021 15:49:30 +0200 [thread overview] Message-ID: <20211005134930.dxej2lgcjklzouw7@gator.home> (raw) In-Reply-To: <20210923191610.3814698-12-oupton@google.com> On Thu, Sep 23, 2021 at 07:16:10PM +0000, Oliver Upton wrote: > Assert that the vCPU exits to userspace with KVM_SYSTEM_EVENT_SUSPEND if > it correctly executes the SYSTEM_SUSPEND PSCI call. Additionally, assert > that the guest PSCI call fails if preconditions are not met (more than 1 > running vCPU). > > Signed-off-by: Oliver Upton <oupton@google.com> > --- > .../testing/selftests/kvm/aarch64/psci_test.c | 75 +++++++++++++++++++ > 1 file changed, 75 insertions(+) > > diff --git a/tools/testing/selftests/kvm/aarch64/psci_test.c b/tools/testing/selftests/kvm/aarch64/psci_test.c > index 90312be335da..5b881ca4d102 100644 > --- a/tools/testing/selftests/kvm/aarch64/psci_test.c > +++ b/tools/testing/selftests/kvm/aarch64/psci_test.c > @@ -45,6 +45,16 @@ static uint64_t psci_affinity_info(uint64_t target_affinity, > return res.a0; > } > > +static uint64_t psci_system_suspend(uint64_t entry_addr, uint64_t context_id) > +{ > + struct arm_smccc_res res; > + > + smccc_hvc(PSCI_1_0_FN64_SYSTEM_SUSPEND, entry_addr, context_id, > + 0, 0, 0, 0, 0, &res); > + > + return res.a0; > +} > + > static void guest_test_cpu_on(uint64_t target_cpu) > { > GUEST_ASSERT(!psci_cpu_on(target_cpu, CPU_ON_ENTRY_ADDR, CPU_ON_CONTEXT_ID)); > @@ -69,6 +79,13 @@ static void vcpu_power_off(struct kvm_vm *vm, uint32_t vcpuid) > vcpu_set_mp_state(vm, vcpuid, &mp_state); > } > > +static void guest_test_system_suspend(void) > +{ > + uint64_t r = psci_system_suspend(CPU_ON_ENTRY_ADDR, CPU_ON_CONTEXT_ID); > + > + GUEST_SYNC(r); > +} > + > static struct kvm_vm *setup_vm(void *guest_code) > { > struct kvm_vcpu_init init; > @@ -136,8 +153,66 @@ static void host_test_cpu_on(void) > kvm_vm_free(vm); > } > > +static void enable_system_suspend(struct kvm_vm *vm) > +{ > + struct kvm_enable_cap cap = { > + .cap = KVM_CAP_ARM_SYSTEM_SUSPEND, > + }; > + > + vm_enable_cap(vm, &cap); > +} > + > +static void host_test_system_suspend(void) > +{ > + struct kvm_run *run; > + struct kvm_vm *vm; > + > + vm = setup_vm(guest_test_system_suspend); > + enable_system_suspend(vm); > + > + vcpu_power_off(vm, VCPU_ID_TARGET); > + run = vcpu_state(vm, VCPU_ID_SOURCE); > + > + enter_guest(vm, VCPU_ID_SOURCE); > + > + TEST_ASSERT(run->exit_reason == KVM_EXIT_SYSTEM_EVENT, > + "Unhandled exit reason: %u (%s)", > + run->exit_reason, exit_reason_str(run->exit_reason)); > + TEST_ASSERT(run->system_event.type == KVM_SYSTEM_EVENT_SUSPEND, > + "Unhandled system event: %u (expected: %u)", > + run->system_event.type, KVM_SYSTEM_EVENT_SUSPEND); > + > + assert_vcpu_reset(vm, VCPU_ID_SOURCE); > + kvm_vm_free(vm); > +} > + > +static void host_test_system_suspend_fails(void) > +{ > + struct kvm_vm *vm; > + struct ucall uc; > + > + vm = setup_vm(guest_test_system_suspend); > + enable_system_suspend(vm); > + > + enter_guest(vm, VCPU_ID_SOURCE); > + TEST_ASSERT(get_ucall(vm, VCPU_ID_SOURCE, &uc) == UCALL_SYNC, > + "Unhandled ucall: %lu", uc.cmd); > + TEST_ASSERT(uc.args[1] == PSCI_RET_DENIED, > + "Unrecognized PSCI return code: %lu (expected: %u)", > + uc.args[1], PSCI_RET_DENIED); > + > + kvm_vm_free(vm); > +} > + > int main(void) > { > + if (!kvm_check_cap(KVM_CAP_ARM_SYSTEM_SUSPEND)) { > + print_skip("KVM_CAP_ARM_SYSTEM_SUSPEND not supported"); > + exit(KSFT_SKIP); > + } How about only guarding the new tests with this, so we can still do the cpu_on test when this feature isn't present? > + > host_test_cpu_on(); > + host_test_system_suspend(); > + host_test_system_suspend_fails(); > return 0; > } > -- > 2.33.0.685.g46640cef36-goog > Thanks, drew _______________________________________________ kvmarm mailing list kvmarm@lists.cs.columbia.edu https://lists.cs.columbia.edu/mailman/listinfo/kvmarm
WARNING: multiple messages have this Message-ID (diff)
From: Andrew Jones <drjones@redhat.com> To: Oliver Upton <oupton@google.com> Cc: kvmarm@lists.cs.columbia.edu, Marc Zyngier <maz@kernel.org>, James Morse <james.morse@arm.com>, Alexandru Elisei <alexandru.elisei@arm.com>, Suzuki K Poulose <suzuki.poulose@arm.com>, Peter Shier <pshier@google.com>, Ricardo Koller <ricarkol@google.com>, Reiji Watanabe <reijiw@google.com>, Raghavendra Rao Anata <rananta@google.com>, kvm@vger.kernel.org Subject: Re: [PATCH v2 11/11] selftests: KVM: Test SYSTEM_SUSPEND PSCI call Date: Tue, 5 Oct 2021 15:49:30 +0200 [thread overview] Message-ID: <20211005134930.dxej2lgcjklzouw7@gator.home> (raw) In-Reply-To: <20210923191610.3814698-12-oupton@google.com> On Thu, Sep 23, 2021 at 07:16:10PM +0000, Oliver Upton wrote: > Assert that the vCPU exits to userspace with KVM_SYSTEM_EVENT_SUSPEND if > it correctly executes the SYSTEM_SUSPEND PSCI call. Additionally, assert > that the guest PSCI call fails if preconditions are not met (more than 1 > running vCPU). > > Signed-off-by: Oliver Upton <oupton@google.com> > --- > .../testing/selftests/kvm/aarch64/psci_test.c | 75 +++++++++++++++++++ > 1 file changed, 75 insertions(+) > > diff --git a/tools/testing/selftests/kvm/aarch64/psci_test.c b/tools/testing/selftests/kvm/aarch64/psci_test.c > index 90312be335da..5b881ca4d102 100644 > --- a/tools/testing/selftests/kvm/aarch64/psci_test.c > +++ b/tools/testing/selftests/kvm/aarch64/psci_test.c > @@ -45,6 +45,16 @@ static uint64_t psci_affinity_info(uint64_t target_affinity, > return res.a0; > } > > +static uint64_t psci_system_suspend(uint64_t entry_addr, uint64_t context_id) > +{ > + struct arm_smccc_res res; > + > + smccc_hvc(PSCI_1_0_FN64_SYSTEM_SUSPEND, entry_addr, context_id, > + 0, 0, 0, 0, 0, &res); > + > + return res.a0; > +} > + > static void guest_test_cpu_on(uint64_t target_cpu) > { > GUEST_ASSERT(!psci_cpu_on(target_cpu, CPU_ON_ENTRY_ADDR, CPU_ON_CONTEXT_ID)); > @@ -69,6 +79,13 @@ static void vcpu_power_off(struct kvm_vm *vm, uint32_t vcpuid) > vcpu_set_mp_state(vm, vcpuid, &mp_state); > } > > +static void guest_test_system_suspend(void) > +{ > + uint64_t r = psci_system_suspend(CPU_ON_ENTRY_ADDR, CPU_ON_CONTEXT_ID); > + > + GUEST_SYNC(r); > +} > + > static struct kvm_vm *setup_vm(void *guest_code) > { > struct kvm_vcpu_init init; > @@ -136,8 +153,66 @@ static void host_test_cpu_on(void) > kvm_vm_free(vm); > } > > +static void enable_system_suspend(struct kvm_vm *vm) > +{ > + struct kvm_enable_cap cap = { > + .cap = KVM_CAP_ARM_SYSTEM_SUSPEND, > + }; > + > + vm_enable_cap(vm, &cap); > +} > + > +static void host_test_system_suspend(void) > +{ > + struct kvm_run *run; > + struct kvm_vm *vm; > + > + vm = setup_vm(guest_test_system_suspend); > + enable_system_suspend(vm); > + > + vcpu_power_off(vm, VCPU_ID_TARGET); > + run = vcpu_state(vm, VCPU_ID_SOURCE); > + > + enter_guest(vm, VCPU_ID_SOURCE); > + > + TEST_ASSERT(run->exit_reason == KVM_EXIT_SYSTEM_EVENT, > + "Unhandled exit reason: %u (%s)", > + run->exit_reason, exit_reason_str(run->exit_reason)); > + TEST_ASSERT(run->system_event.type == KVM_SYSTEM_EVENT_SUSPEND, > + "Unhandled system event: %u (expected: %u)", > + run->system_event.type, KVM_SYSTEM_EVENT_SUSPEND); > + > + assert_vcpu_reset(vm, VCPU_ID_SOURCE); > + kvm_vm_free(vm); > +} > + > +static void host_test_system_suspend_fails(void) > +{ > + struct kvm_vm *vm; > + struct ucall uc; > + > + vm = setup_vm(guest_test_system_suspend); > + enable_system_suspend(vm); > + > + enter_guest(vm, VCPU_ID_SOURCE); > + TEST_ASSERT(get_ucall(vm, VCPU_ID_SOURCE, &uc) == UCALL_SYNC, > + "Unhandled ucall: %lu", uc.cmd); > + TEST_ASSERT(uc.args[1] == PSCI_RET_DENIED, > + "Unrecognized PSCI return code: %lu (expected: %u)", > + uc.args[1], PSCI_RET_DENIED); > + > + kvm_vm_free(vm); > +} > + > int main(void) > { > + if (!kvm_check_cap(KVM_CAP_ARM_SYSTEM_SUSPEND)) { > + print_skip("KVM_CAP_ARM_SYSTEM_SUSPEND not supported"); > + exit(KSFT_SKIP); > + } How about only guarding the new tests with this, so we can still do the cpu_on test when this feature isn't present? > + > host_test_cpu_on(); > + host_test_system_suspend(); > + host_test_system_suspend_fails(); > return 0; > } > -- > 2.33.0.685.g46640cef36-goog > Thanks, drew
next prev parent reply other threads:[~2021-10-05 13:49 UTC|newest] Thread overview: 88+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-09-23 19:15 [PATCH v2 00/11] KVM: arm64: Implement PSCI SYSTEM_SUSPEND support Oliver Upton 2021-09-23 19:15 ` Oliver Upton 2021-09-23 19:16 ` [PATCH v2 01/11] KVM: arm64: Drop unused vcpu param to kvm_psci_valid_affinity() Oliver Upton 2021-09-23 19:16 ` Oliver Upton 2021-10-01 3:50 ` Reiji Watanabe 2021-10-01 3:50 ` Reiji Watanabe 2021-10-05 13:22 ` Andrew Jones 2021-10-05 13:22 ` Andrew Jones 2021-09-23 19:16 ` [PATCH v2 02/11] KVM: arm64: Clean up SMC64 PSCI filtering for AArch32 guests Oliver Upton 2021-09-23 19:16 ` Oliver Upton 2021-10-01 3:56 ` Reiji Watanabe 2021-10-01 3:56 ` Reiji Watanabe 2021-10-05 13:23 ` Andrew Jones 2021-10-05 13:23 ` Andrew Jones 2021-09-23 19:16 ` [PATCH v2 03/11] KVM: arm64: Encapsulate reset request logic in a helper function Oliver Upton 2021-09-23 19:16 ` Oliver Upton 2021-10-01 6:04 ` Reiji Watanabe 2021-10-01 6:04 ` Reiji Watanabe 2021-10-01 16:10 ` Oliver Upton 2021-10-01 16:10 ` Oliver Upton 2021-10-05 13:33 ` Andrew Jones 2021-10-05 13:33 ` Andrew Jones 2021-10-05 15:05 ` Oliver Upton 2021-10-05 15:05 ` Oliver Upton 2021-10-05 19:01 ` Andrew Jones 2021-10-05 19:01 ` Andrew Jones 2021-10-13 4:48 ` Reiji Watanabe 2021-10-13 4:48 ` Reiji Watanabe 2021-10-05 13:35 ` Andrew Jones 2021-10-05 13:35 ` Andrew Jones 2021-09-23 19:16 ` [PATCH v2 04/11] KVM: arm64: Rename the KVM_REQ_SLEEP handler Oliver Upton 2021-09-23 19:16 ` Oliver Upton 2021-10-05 13:34 ` Andrew Jones 2021-10-05 13:34 ` Andrew Jones 2021-09-23 19:16 ` [PATCH v2 05/11] KVM: arm64: Defer WFI emulation as a requested event Oliver Upton 2021-09-23 19:16 ` Oliver Upton 2021-09-30 10:50 ` Marc Zyngier 2021-09-30 10:50 ` Marc Zyngier 2021-09-30 17:09 ` Sean Christopherson 2021-09-30 17:09 ` Sean Christopherson 2021-09-30 17:32 ` Oliver Upton 2021-09-30 17:32 ` Oliver Upton 2021-09-30 18:08 ` Sean Christopherson 2021-09-30 18:08 ` Sean Christopherson 2021-09-30 21:57 ` Oliver Upton 2021-09-30 21:57 ` Oliver Upton 2021-10-01 13:57 ` Marc Zyngier 2021-10-01 13:57 ` Marc Zyngier 2021-09-23 19:16 ` [PATCH v2 06/11] KVM: arm64: Add support for SYSTEM_SUSPEND PSCI call Oliver Upton 2021-09-23 19:16 ` Oliver Upton 2021-09-30 12:29 ` Marc Zyngier 2021-09-30 12:29 ` Marc Zyngier 2021-09-30 17:19 ` Sean Christopherson 2021-09-30 17:19 ` Sean Christopherson 2021-09-30 17:35 ` Oliver Upton 2021-09-30 17:35 ` Oliver Upton 2021-09-30 17:40 ` Oliver Upton 2021-09-30 17:40 ` Oliver Upton 2021-10-01 14:02 ` Marc Zyngier 2021-10-01 14:02 ` Marc Zyngier 2021-10-05 16:02 ` Oliver Upton 2021-10-05 16:02 ` Oliver Upton 2021-09-23 19:16 ` [PATCH v2 07/11] selftests: KVM: Rename psci_cpu_on_test to psci_test Oliver Upton 2021-09-23 19:16 ` Oliver Upton 2021-10-05 13:36 ` Andrew Jones 2021-10-05 13:36 ` Andrew Jones 2021-09-23 19:16 ` [PATCH v2 08/11] selftests: KVM: Create helper for making SMCCC calls Oliver Upton 2021-09-23 19:16 ` Oliver Upton 2021-10-05 13:39 ` Andrew Jones 2021-10-05 13:39 ` Andrew Jones 2021-09-23 19:16 ` [PATCH v2 09/11] selftests: KVM: Use KVM_SET_MP_STATE to power off vCPU in psci_test Oliver Upton 2021-09-23 19:16 ` Oliver Upton 2021-09-23 19:16 ` [PATCH v2 10/11] selftests: KVM: Refactor psci_test to make it amenable to new tests Oliver Upton 2021-09-23 19:16 ` Oliver Upton 2021-10-05 13:45 ` Andrew Jones 2021-10-05 13:45 ` Andrew Jones 2021-10-05 14:54 ` Oliver Upton 2021-10-05 14:54 ` Oliver Upton 2021-10-05 19:05 ` Andrew Jones 2021-10-05 19:05 ` Andrew Jones 2021-09-23 19:16 ` [PATCH v2 11/11] selftests: KVM: Test SYSTEM_SUSPEND PSCI call Oliver Upton 2021-09-23 19:16 ` Oliver Upton 2021-10-05 13:49 ` Andrew Jones [this message] 2021-10-05 13:49 ` Andrew Jones 2021-10-05 15:07 ` Oliver Upton 2021-10-05 15:07 ` Oliver Upton 2021-09-23 20:15 ` [PATCH v2 00/11] KVM: arm64: Implement PSCI SYSTEM_SUSPEND support Oliver Upton 2021-09-23 20:15 ` Oliver Upton
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=20211005134930.dxej2lgcjklzouw7@gator.home \ --to=drjones@redhat.com \ --cc=kvm@vger.kernel.org \ --cc=kvmarm@lists.cs.columbia.edu \ --cc=maz@kernel.org \ --cc=oupton@google.com \ --cc=pshier@google.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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.