From: Oliver Upton <oliver.upton@linux.dev>
To: kvmarm@lists.linux.dev
Cc: kvm@vger.kernel.org, Marc Zyngier <maz@kernel.org>,
James Morse <james.morse@arm.com>,
Suzuki K Poulose <suzuki.poulose@arm.com>,
Zenghui Yu <yuzenghui@huawei.com>, Will Deacon <will@kernel.org>,
Julien Thierry <julien.thierry.kdev@gmail.com>,
Salil Mehta <salil.mehta@huawei.com>,
Oliver Upton <oliver.upton@linux.dev>
Subject: [PATCH v2 16/20] aarch64: psci: Implement CPU_ON
Date: Tue, 20 Jun 2023 11:33:49 -0500 [thread overview]
Message-ID: <20230620163353.2688567-17-oliver.upton@linux.dev> (raw)
In-Reply-To: <20230620163353.2688567-1-oliver.upton@linux.dev>
Add support for the PSCI CPU_ON call, wherein a caller can power on a
targeted CPU and reset it with the provided context (i.e. entrypoint and
context id). Rely on the KVM_ARM_VCPU_INIT ioctl, which has the effect
of an architectural warm reset, to do the heavy lifting.
Signed-off-by: Oliver Upton <oliver.upton@linux.dev>
---
arm/aarch64/psci.c | 68 ++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 68 insertions(+)
diff --git a/arm/aarch64/psci.c b/arm/aarch64/psci.c
index 72429b3..254e16e 100644
--- a/arm/aarch64/psci.c
+++ b/arm/aarch64/psci.c
@@ -18,6 +18,8 @@ static void psci_features(struct kvm_cpu *vcpu, struct arm_smccc_res *res)
case PSCI_0_2_FN_CPU_SUSPEND:
case PSCI_0_2_FN64_CPU_SUSPEND:
case PSCI_0_2_FN_CPU_OFF:
+ case PSCI_0_2_FN_CPU_ON:
+ case PSCI_0_2_FN64_CPU_ON:
case ARM_SMCCC_VERSION_FUNC_ID:
res->a0 = PSCI_RET_SUCCESS;
break;
@@ -47,6 +49,68 @@ static void cpu_off(struct kvm_cpu *vcpu, struct arm_smccc_res *res)
die_perror("KVM_SET_MP_STATE failed");
}
+static void reset_cpu_with_context(struct kvm_cpu *vcpu, u64 entry_addr, u64 ctx_id)
+{
+ struct kvm_one_reg reg;
+
+ if (ioctl(vcpu->vcpu_fd, KVM_ARM_VCPU_INIT, &vcpu->init))
+ die_perror("KVM_ARM_VCPU_INIT failed");
+
+ reg = (struct kvm_one_reg) {
+ .id = ARM64_CORE_REG(regs.pc),
+ .addr = (u64)&entry_addr,
+ };
+ if (ioctl(vcpu->vcpu_fd, KVM_SET_ONE_REG, ®))
+ die_perror("KVM_SET_ONE_REG failed");
+
+ reg = (struct kvm_one_reg) {
+ .id = ARM64_CORE_REG(regs.regs[0]),
+ .addr = (u64)&ctx_id,
+ };
+ if (ioctl(vcpu->vcpu_fd, KVM_SET_ONE_REG, ®))
+ die_perror("KVM_SET_ONE_REG failed");
+}
+
+static bool psci_valid_affinity(u64 affinity)
+{
+ return !(affinity & ~ARM_MPIDR_HWID_BITMASK);
+}
+
+static void cpu_on(struct kvm_cpu *vcpu, struct arm_smccc_res *res)
+{
+ u64 target_mpidr = smccc_get_arg(vcpu, 1);
+ u64 entry_addr = smccc_get_arg(vcpu, 2);
+ u64 ctx_id = smccc_get_arg(vcpu, 3);
+ struct kvm_mp_state mp_state;
+ struct kvm_cpu *target;
+
+ if (!psci_valid_affinity(target_mpidr)) {
+ res->a0 = PSCI_RET_INVALID_PARAMS;
+ return;
+ }
+
+ kvm_cpu__pause_vm(vcpu);
+
+ target = kvm__arch_mpidr_to_vcpu(vcpu->kvm, target_mpidr);
+ if (!target) {
+ res->a0 = PSCI_RET_INVALID_PARAMS;
+ goto out_continue;
+ }
+
+ if (ioctl(target->vcpu_fd, KVM_GET_MP_STATE, &mp_state))
+ die_perror("KVM_GET_MP_STATE failed");
+
+ if (mp_state.mp_state != KVM_MP_STATE_STOPPED) {
+ res->a0 = PSCI_RET_ALREADY_ON;
+ goto out_continue;
+ }
+
+ reset_cpu_with_context(target, entry_addr, ctx_id);
+ res->a0 = PSCI_RET_SUCCESS;
+out_continue:
+ kvm_cpu__continue_vm(vcpu);
+}
+
void handle_psci(struct kvm_cpu *vcpu, struct arm_smccc_res *res)
{
switch (vcpu->kvm_run->hypercall.nr) {
@@ -63,6 +127,10 @@ void handle_psci(struct kvm_cpu *vcpu, struct arm_smccc_res *res)
case PSCI_0_2_FN_CPU_OFF:
cpu_off(vcpu, res);
break;
+ case PSCI_0_2_FN_CPU_ON:
+ case PSCI_0_2_FN64_CPU_ON:
+ cpu_on(vcpu, res);
+ break;
default:
res->a0 = PSCI_RET_NOT_SUPPORTED;
}
--
2.41.0.162.gfafddb0af9-goog
next prev parent reply other threads:[~2023-06-20 16:34 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-06-20 16:33 [PATCH v2 00/20] arm64: Handle PSCI calls in userspace Oliver Upton
2023-06-20 16:33 ` [PATCH v2 01/20] update_headers: Use a list for arch-generic headers Oliver Upton
2023-06-20 16:33 ` [PATCH v2 02/20] update_headers: Add missing entries to list of headers to copy Oliver Upton
2023-06-20 16:33 ` [PATCH v2 03/20] Copy 64-bit alignment attrtibutes from Linux 6.4-rc1 Oliver Upton
2023-06-20 16:33 ` [PATCH v2 04/20] Update headers with " Oliver Upton
2023-06-20 16:33 ` [PATCH v2 05/20] Import arm-smccc.h from " Oliver Upton
2023-06-20 16:33 ` [PATCH v2 06/20] aarch64: Copy cputype.h " Oliver Upton
2023-06-20 16:33 ` [PATCH v2 07/20] arm: Stash kvm_vcpu_init for later use Oliver Upton
2023-06-20 16:33 ` [PATCH v2 08/20] arm: Use KVM_SET_MP_STATE ioctl to power off non-boot vCPUs Oliver Upton
2023-06-20 16:33 ` [PATCH v2 09/20] aarch64: Expose ARM64_CORE_REG() for general use Oliver Upton
2023-06-20 16:33 ` [PATCH v2 10/20] arm: Generalize execution state specific VM initialization Oliver Upton
2023-06-20 16:33 ` [PATCH v2 11/20] Add helpers to pause the VM from vCPU thread Oliver Upton
2023-06-20 16:33 ` [PATCH v2 12/20] aarch64: Add support for finding vCPU for given MPIDR Oliver Upton
2023-06-20 16:33 ` [PATCH v2 13/20] aarch64: Add skeleton implementation for PSCI Oliver Upton
2023-06-20 16:33 ` [PATCH v2 14/20] aarch64: psci: Implement CPU_SUSPEND Oliver Upton
2023-06-20 16:33 ` [PATCH v2 15/20] aarch64: psci: Implement CPU_OFF Oliver Upton
2023-06-20 16:33 ` Oliver Upton [this message]
2023-06-20 16:33 ` [PATCH v2 17/20] aarch64: psci: Implement AFFINITY_INFO Oliver Upton
2023-06-20 16:33 ` [PATCH v2 18/20] aarch64: psci: Implement MIGRATE_INFO_TYPE Oliver Upton
2023-06-20 16:33 ` [PATCH v2 19/20] aarch64: psci: Implement SYSTEM_{OFF,RESET} Oliver Upton
2023-06-20 16:35 ` [PATCH v2 20/20] aarch64: smccc: Start sending PSCI to userspace 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=20230620163353.2688567-17-oliver.upton@linux.dev \
--to=oliver.upton@linux.dev \
--cc=james.morse@arm.com \
--cc=julien.thierry.kdev@gmail.com \
--cc=kvm@vger.kernel.org \
--cc=kvmarm@lists.linux.dev \
--cc=maz@kernel.org \
--cc=salil.mehta@huawei.com \
--cc=suzuki.poulose@arm.com \
--cc=will@kernel.org \
--cc=yuzenghui@huawei.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.