All of lore.kernel.org
 help / color / mirror / Atom feed
From: Oliver Upton <oupton@google.com>
To: kvmarm@lists.cs.columbia.edu
Cc: Marc Zyngier <maz@kernel.org>, James Morse <james.morse@arm.com>,
	Alexandru Elisei <alexandru.elisei@arm.com>,
	Suzuki K Poulose <suzuki.poulose@arm.com>,
	Andrew Jones <drjones@redhat.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, Oliver Upton <oupton@google.com>
Subject: [PATCH v2 09/11] selftests: KVM: Use KVM_SET_MP_STATE to power off vCPU in psci_test
Date: Thu, 23 Sep 2021 19:16:08 +0000	[thread overview]
Message-ID: <20210923191610.3814698-10-oupton@google.com> (raw)
In-Reply-To: <20210923191610.3814698-1-oupton@google.com>

Setting a vCPU's MP state to KVM_MP_STATE_STOPPED has the effect of
powering off the vCPU. Rather than using the vCPU init feature flag, use
the KVM_SET_MP_STATE ioctl to power off the target vCPU.

Signed-off-by: Oliver Upton <oupton@google.com>
---
 tools/testing/selftests/kvm/aarch64/psci_test.c | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/tools/testing/selftests/kvm/aarch64/psci_test.c b/tools/testing/selftests/kvm/aarch64/psci_test.c
index cebea7356e5a..8d043e12b137 100644
--- a/tools/testing/selftests/kvm/aarch64/psci_test.c
+++ b/tools/testing/selftests/kvm/aarch64/psci_test.c
@@ -60,6 +60,15 @@ static void guest_main(uint64_t target_cpu)
 	GUEST_DONE();
 }
 
+static void vcpu_power_off(struct kvm_vm *vm, uint32_t vcpuid)
+{
+	struct kvm_mp_state mp_state = {
+		.mp_state = KVM_MP_STATE_STOPPED,
+	};
+
+	vcpu_set_mp_state(vm, vcpuid, &mp_state);
+}
+
 int main(void)
 {
 	uint64_t target_mpidr, obs_pc, obs_x0;
@@ -75,12 +84,12 @@ int main(void)
 	init.features[0] |= (1 << KVM_ARM_VCPU_PSCI_0_2);
 
 	aarch64_vcpu_add_default(vm, VCPU_ID_SOURCE, &init, guest_main);
+	aarch64_vcpu_add_default(vm, VCPU_ID_TARGET, &init, guest_main);
 
 	/*
 	 * make sure the target is already off when executing the test.
 	 */
-	init.features[0] |= (1 << KVM_ARM_VCPU_POWER_OFF);
-	aarch64_vcpu_add_default(vm, VCPU_ID_TARGET, &init, guest_main);
+	vcpu_power_off(vm, VCPU_ID_TARGET);
 
 	get_reg(vm, VCPU_ID_TARGET, ARM64_SYS_REG(MPIDR_EL1), &target_mpidr);
 	vcpu_args_set(vm, VCPU_ID_SOURCE, 1, target_mpidr & MPIDR_HWID_BITMASK);
-- 
2.33.0.685.g46640cef36-goog


WARNING: multiple messages have this Message-ID (diff)
From: Oliver Upton <oupton@google.com>
To: kvmarm@lists.cs.columbia.edu
Cc: kvm@vger.kernel.org, Marc Zyngier <maz@kernel.org>,
	Peter Shier <pshier@google.com>
Subject: [PATCH v2 09/11] selftests: KVM: Use KVM_SET_MP_STATE to power off vCPU in psci_test
Date: Thu, 23 Sep 2021 19:16:08 +0000	[thread overview]
Message-ID: <20210923191610.3814698-10-oupton@google.com> (raw)
In-Reply-To: <20210923191610.3814698-1-oupton@google.com>

Setting a vCPU's MP state to KVM_MP_STATE_STOPPED has the effect of
powering off the vCPU. Rather than using the vCPU init feature flag, use
the KVM_SET_MP_STATE ioctl to power off the target vCPU.

Signed-off-by: Oliver Upton <oupton@google.com>
---
 tools/testing/selftests/kvm/aarch64/psci_test.c | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/tools/testing/selftests/kvm/aarch64/psci_test.c b/tools/testing/selftests/kvm/aarch64/psci_test.c
index cebea7356e5a..8d043e12b137 100644
--- a/tools/testing/selftests/kvm/aarch64/psci_test.c
+++ b/tools/testing/selftests/kvm/aarch64/psci_test.c
@@ -60,6 +60,15 @@ static void guest_main(uint64_t target_cpu)
 	GUEST_DONE();
 }
 
+static void vcpu_power_off(struct kvm_vm *vm, uint32_t vcpuid)
+{
+	struct kvm_mp_state mp_state = {
+		.mp_state = KVM_MP_STATE_STOPPED,
+	};
+
+	vcpu_set_mp_state(vm, vcpuid, &mp_state);
+}
+
 int main(void)
 {
 	uint64_t target_mpidr, obs_pc, obs_x0;
@@ -75,12 +84,12 @@ int main(void)
 	init.features[0] |= (1 << KVM_ARM_VCPU_PSCI_0_2);
 
 	aarch64_vcpu_add_default(vm, VCPU_ID_SOURCE, &init, guest_main);
+	aarch64_vcpu_add_default(vm, VCPU_ID_TARGET, &init, guest_main);
 
 	/*
 	 * make sure the target is already off when executing the test.
 	 */
-	init.features[0] |= (1 << KVM_ARM_VCPU_POWER_OFF);
-	aarch64_vcpu_add_default(vm, VCPU_ID_TARGET, &init, guest_main);
+	vcpu_power_off(vm, VCPU_ID_TARGET);
 
 	get_reg(vm, VCPU_ID_TARGET, ARM64_SYS_REG(MPIDR_EL1), &target_mpidr);
 	vcpu_args_set(vm, VCPU_ID_SOURCE, 1, target_mpidr & MPIDR_HWID_BITMASK);
-- 
2.33.0.685.g46640cef36-goog

_______________________________________________
kvmarm mailing list
kvmarm@lists.cs.columbia.edu
https://lists.cs.columbia.edu/mailman/listinfo/kvmarm

  parent reply	other threads:[~2021-09-23 19:16 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 ` Oliver Upton [this message]
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 ` [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
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=20210923191610.3814698-10-oupton@google.com \
    --to=oupton@google.com \
    --cc=alexandru.elisei@arm.com \
    --cc=drjones@redhat.com \
    --cc=james.morse@arm.com \
    --cc=kvm@vger.kernel.org \
    --cc=kvmarm@lists.cs.columbia.edu \
    --cc=maz@kernel.org \
    --cc=pshier@google.com \
    --cc=rananta@google.com \
    --cc=reijiw@google.com \
    --cc=ricarkol@google.com \
    --cc=suzuki.poulose@arm.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 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.