From: Oliver Upton <oupton@google.com> To: kvmarm@lists.cs.columbia.edu Cc: Paolo Bonzini <pbonzini@redhat.com>, Marc Zyngier <maz@kernel.org>, James Morse <james.morse@arm.com>, Alexandru Elisei <alexandru.elisei@arm.com>, Suzuki K Poulose <suzuki.poulose@arm.com>, Anup Patel <anup@brainfault.org>, Atish Patra <atishp@atishpatra.org>, Sean Christopherson <seanjc@google.com>, Vitaly Kuznetsov <vkuznets@redhat.com>, Wanpeng Li <wanpengli@tencent.com>, Jim Mattson <jmattson@google.com>, Joerg Roedel <joro@8bytes.org>, kvm@vger.kernel.org, kvm-riscv@lists.infradead.org, Peter Shier <pshier@google.com>, Reiji Watanabe <reijiw@google.com>, Ricardo Koller <ricarkol@google.com>, Raghavendra Rao Ananta <rananta@google.com>, Jing Zhang <jingzhangos@google.com>, Oliver Upton <oupton@google.com> Subject: [PATCH v3 19/19] selftests: KVM: Test SYSTEM_SUSPEND PSCI call Date: Wed, 23 Feb 2022 04:18:44 +0000 [thread overview] Message-ID: <20220223041844.3984439-20-oupton@google.com> (raw) In-Reply-To: <20220223041844.3984439-1-oupton@google.com> 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 | 74 +++++++++++++++++++ 1 file changed, 74 insertions(+) diff --git a/tools/testing/selftests/kvm/aarch64/psci_test.c b/tools/testing/selftests/kvm/aarch64/psci_test.c index 535130d5e97f..ef7fd58af675 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 vcpu_power_off(struct kvm_vm *vm, uint32_t vcpuid) { struct kvm_mp_state mp_state = { @@ -137,8 +147,72 @@ 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 guest_test_system_suspend(void) +{ + uint64_t r = psci_system_suspend(CPU_ON_ENTRY_ADDR, CPU_ON_CONTEXT_ID); + + GUEST_SYNC(r); +} + +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); + + 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); + } + host_test_cpu_on(); + host_test_system_suspend(); + host_test_system_suspend_fails(); return 0; } -- 2.35.1.473.g83b2b277ed-goog
WARNING: multiple messages have this Message-ID (diff)
From: Oliver Upton <oupton@google.com> To: kvmarm@lists.cs.columbia.edu Cc: Wanpeng Li <wanpengli@tencent.com>, kvm@vger.kernel.org, Joerg Roedel <joro@8bytes.org>, Atish Patra <atishp@atishpatra.org>, Peter Shier <pshier@google.com>, kvm-riscv@lists.infradead.org, Marc Zyngier <maz@kernel.org>, Paolo Bonzini <pbonzini@redhat.com>, Vitaly Kuznetsov <vkuznets@redhat.com>, Jim Mattson <jmattson@google.com> Subject: [PATCH v3 19/19] selftests: KVM: Test SYSTEM_SUSPEND PSCI call Date: Wed, 23 Feb 2022 04:18:44 +0000 [thread overview] Message-ID: <20220223041844.3984439-20-oupton@google.com> (raw) In-Reply-To: <20220223041844.3984439-1-oupton@google.com> 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 | 74 +++++++++++++++++++ 1 file changed, 74 insertions(+) diff --git a/tools/testing/selftests/kvm/aarch64/psci_test.c b/tools/testing/selftests/kvm/aarch64/psci_test.c index 535130d5e97f..ef7fd58af675 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 vcpu_power_off(struct kvm_vm *vm, uint32_t vcpuid) { struct kvm_mp_state mp_state = { @@ -137,8 +147,72 @@ 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 guest_test_system_suspend(void) +{ + uint64_t r = psci_system_suspend(CPU_ON_ENTRY_ADDR, CPU_ON_CONTEXT_ID); + + GUEST_SYNC(r); +} + +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); + + 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); + } + host_test_cpu_on(); + host_test_system_suspend(); + host_test_system_suspend_fails(); return 0; } -- 2.35.1.473.g83b2b277ed-goog _______________________________________________ kvmarm mailing list kvmarm@lists.cs.columbia.edu https://lists.cs.columbia.edu/mailman/listinfo/kvmarm
next prev parent reply other threads:[~2022-02-23 4:20 UTC|newest] Thread overview: 94+ messages / expand[flat|nested] mbox.gz Atom feed top 2022-02-23 4:18 [PATCH v3 00/19] KVM: arm64: Implement PSCI SYSTEM_SUSPEND Oliver Upton 2022-02-23 4:18 ` Oliver Upton 2022-02-23 4:18 ` [PATCH v3 01/19] KVM: arm64: Drop unused param from kvm_psci_version() Oliver Upton 2022-02-23 4:18 ` Oliver Upton 2022-02-24 6:14 ` Reiji Watanabe 2022-02-24 6:14 ` Reiji Watanabe 2022-02-23 4:18 ` [PATCH v3 02/19] KVM: arm64: Create a helper to check if IPA is valid Oliver Upton 2022-02-23 4:18 ` Oliver Upton 2022-02-24 6:32 ` Reiji Watanabe 2022-02-24 6:32 ` Reiji Watanabe 2022-02-24 12:06 ` Marc Zyngier 2022-02-24 12:06 ` Marc Zyngier 2022-02-23 4:18 ` [PATCH v3 03/19] KVM: arm64: Reject invalid addresses for CPU_ON PSCI call Oliver Upton 2022-02-23 4:18 ` Oliver Upton 2022-02-24 6:55 ` Reiji Watanabe 2022-02-24 6:55 ` Reiji Watanabe 2022-02-24 12:30 ` Marc Zyngier 2022-02-24 12:30 ` Marc Zyngier 2022-02-24 19:21 ` Oliver Upton 2022-02-24 19:21 ` Oliver Upton 2022-02-25 15:35 ` Marc Zyngier 2022-02-25 15:35 ` Marc Zyngier 2022-02-23 4:18 ` [PATCH v3 04/19] KVM: arm64: Clean up SMC64 PSCI filtering for AArch32 guests Oliver Upton 2022-02-23 4:18 ` Oliver Upton 2022-02-23 4:18 ` [PATCH v3 05/19] KVM: arm64: Dedupe vCPU power off helpers Oliver Upton 2022-02-23 4:18 ` Oliver Upton 2022-02-24 7:07 ` Reiji Watanabe 2022-02-24 7:07 ` Reiji Watanabe 2022-02-23 4:18 ` [PATCH v3 06/19] KVM: arm64: Track vCPU power state using MP state values Oliver Upton 2022-02-23 4:18 ` Oliver Upton 2022-02-24 13:25 ` Marc Zyngier 2022-02-24 13:25 ` Marc Zyngier 2022-02-24 22:08 ` Oliver Upton 2022-02-24 22:08 ` Oliver Upton 2022-02-25 15:37 ` Marc Zyngier 2022-02-25 15:37 ` Marc Zyngier 2022-02-23 4:18 ` [PATCH v3 07/19] KVM: arm64: Rename the KVM_REQ_SLEEP handler Oliver Upton 2022-02-23 4:18 ` Oliver Upton 2022-02-23 4:18 ` [PATCH v3 08/19] KVM: arm64: Add reset helper that accepts caller-provided reset state Oliver Upton 2022-02-23 4:18 ` Oliver Upton 2022-02-23 4:18 ` [PATCH v3 09/19] KVM: arm64: Implement PSCI SYSTEM_SUSPEND Oliver Upton 2022-02-23 4:18 ` Oliver Upton 2022-02-24 14:02 ` Marc Zyngier 2022-02-24 14:02 ` Marc Zyngier 2022-02-24 19:35 ` Oliver Upton 2022-02-24 19:35 ` Oliver Upton 2022-02-25 18:58 ` Marc Zyngier 2022-02-25 18:58 ` Marc Zyngier 2022-03-03 1:01 ` Oliver Upton 2022-03-03 1:01 ` Oliver Upton 2022-03-03 11:37 ` Marc Zyngier 2022-03-03 11:37 ` Marc Zyngier 2022-02-23 4:18 ` [PATCH v3 10/19] KVM: Create helper for setting a system event exit Oliver Upton 2022-02-23 4:18 ` Oliver Upton 2022-02-23 6:37 ` Anup Patel 2022-02-23 6:37 ` Anup Patel 2022-02-24 14:07 ` Marc Zyngier 2022-02-24 14:07 ` Marc Zyngier 2022-02-23 4:18 ` [PATCH v3 11/19] KVM: arm64: Return a value from check_vcpu_requests() Oliver Upton 2022-02-23 4:18 ` Oliver Upton 2022-02-23 4:18 ` [PATCH v3 12/19] KVM: arm64: Add support for userspace to suspend a vCPU Oliver Upton 2022-02-23 4:18 ` Oliver Upton 2022-02-24 15:12 ` Marc Zyngier 2022-02-24 15:12 ` Marc Zyngier 2022-02-24 19:47 ` Oliver Upton 2022-02-24 19:47 ` Oliver Upton 2022-02-23 4:18 ` [PATCH v3 13/19] KVM: arm64: Add support KVM_SYSTEM_EVENT_SUSPEND to PSCI SYSTEM_SUSPEND Oliver Upton 2022-02-23 4:18 ` Oliver Upton 2022-02-24 15:40 ` Marc Zyngier 2022-02-24 15:40 ` Marc Zyngier 2022-02-24 20:05 ` Oliver Upton 2022-02-24 20:05 ` Oliver Upton 2022-02-26 11:29 ` Marc Zyngier 2022-02-26 11:29 ` Marc Zyngier 2022-02-26 18:28 ` Oliver Upton 2022-02-26 18:28 ` Oliver Upton 2022-03-02 9:52 ` Marc Zyngier 2022-03-02 9:52 ` Marc Zyngier 2022-03-02 9:57 ` Oliver Upton 2022-03-02 9:57 ` Oliver Upton 2022-02-23 4:18 ` [PATCH v3 14/19] KVM: arm64: Raise default PSCI version to v1.1 Oliver Upton 2022-02-23 4:18 ` Oliver Upton 2022-02-23 4:26 ` Oliver Upton 2022-02-23 4:26 ` Oliver Upton 2022-02-23 4:18 ` [PATCH v3 15/19] selftests: KVM: Rename psci_cpu_on_test to psci_test Oliver Upton 2022-02-23 4:18 ` Oliver Upton 2022-02-23 4:18 ` [PATCH v3 16/19] selftests: KVM: Create helper for making SMCCC calls Oliver Upton 2022-02-23 4:18 ` Oliver Upton 2022-02-23 4:18 ` [PATCH v3 17/19] selftests: KVM: Use KVM_SET_MP_STATE to power off vCPU in psci_test Oliver Upton 2022-02-23 4:18 ` Oliver Upton 2022-02-23 4:18 ` [PATCH v3 18/19] selftests: KVM: Refactor psci_test to make it amenable to new tests Oliver Upton 2022-02-23 4:18 ` Oliver Upton 2022-02-23 4:18 ` Oliver Upton [this message] 2022-02-23 4:18 ` [PATCH v3 19/19] selftests: KVM: Test SYSTEM_SUSPEND PSCI call 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=20220223041844.3984439-20-oupton@google.com \ --to=oupton@google.com \ --cc=alexandru.elisei@arm.com \ --cc=anup@brainfault.org \ --cc=atishp@atishpatra.org \ --cc=james.morse@arm.com \ --cc=jingzhangos@google.com \ --cc=jmattson@google.com \ --cc=joro@8bytes.org \ --cc=kvm-riscv@lists.infradead.org \ --cc=kvm@vger.kernel.org \ --cc=kvmarm@lists.cs.columbia.edu \ --cc=maz@kernel.org \ --cc=pbonzini@redhat.com \ --cc=pshier@google.com \ --cc=rananta@google.com \ --cc=reijiw@google.com \ --cc=ricarkol@google.com \ --cc=seanjc@google.com \ --cc=suzuki.poulose@arm.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: 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.