From: Peter Maydell <peter.maydell@linaro.org>
To: Alexander Graf <agraf@csgraf.de>
Cc: "Eduardo Habkost" <ehabkost@redhat.com>,
"Philippe Mathieu-Daudé" <philmd@redhat.com>,
"Richard Henderson" <richard.henderson@linaro.org>,
"QEMU Developers" <qemu-devel@nongnu.org>,
"Cameron Esfahani" <dirty@apple.com>,
"Roman Bolshakov" <r.bolshakov@yadro.com>,
qemu-arm <qemu-arm@nongnu.org>, "Frank Yang" <lfy@google.com>,
"Paolo Bonzini" <pbonzini@redhat.com>,
"Peter Collingbourne" <pcc@google.com>
Subject: Re: [PATCH v8 16/19] hvf: arm: Implement PSCI handling
Date: Tue, 15 Jun 2021 13:54:25 +0100 [thread overview]
Message-ID: <CAFEAcA_VJa_vJtJx6PtQS=WTy2y9ZJg8pcgu4Pkzp=CbuH85qw@mail.gmail.com> (raw)
In-Reply-To: <20210519202253.76782-17-agraf@csgraf.de>
On Wed, 19 May 2021 at 21:23, Alexander Graf <agraf@csgraf.de> wrote:
>
> We need to handle PSCI calls. Most of the TCG code works for us,
> but we can simplify it to only handle aa64 mode and we need to
> handle SUSPEND differently.
>
> This patch takes the TCG code as template and duplicates it in HVF.
>
> To tell the guest that we support PSCI 0.2 now, update the check in
> arm_cpu_initfn() as well.
>
> Signed-off-by: Alexander Graf <agraf@csgraf.de>
>
> ---
>
> v6 -> v7:
>
> - This patch integrates "arm: Set PSCI to 0.2 for HVF"
>
> v7 -> v8:
>
> - Do not advance for HVC, PC is already updated by hvf
> - Fix checkpatch error
> +static int hvf_psci_cpu_off(ARMCPU *arm_cpu)
> +{
> + int32_t ret = 0;
> + ret = arm_set_cpu_off(arm_cpu->mp_affinity);
> + assert(ret == QEMU_ARM_POWERCTL_RET_SUCCESS);
> +
> + return 0;
If you're always returning 0 you might as well just make
it return void.
> +}
> +
> +static int hvf_handle_psci_call(CPUState *cpu)
I think the callsites would be clearer if you made the function
return true for "PSCI call handled", false for "not recognised,
give the guest an UNDEF". Code like
if (hvf_handle_psci_call(cpu)) {
stuff;
}
looks like the 'stuff' is for the "psci call handled" case,
which at the moment it isn't.
Either way, a comment for this function describing what its
return value semantics are would be useful.
> + ARMCPU *arm_cpu = ARM_CPU(cpu);
> + CPUARMState *env = &arm_cpu->env;
> + uint64_t param[4] = {
> + env->xregs[0],
> + env->xregs[1],
> + env->xregs[2],
> + env->xregs[3]
> + };
> + uint64_t context_id, mpidr;
> + bool target_aarch64 = true;
> + CPUState *target_cpu_state;
> + ARMCPU *target_cpu;
> + target_ulong entry;
> + int target_el = 1;
> + int32_t ret = 0;
> +
> + trace_hvf_psci_call(param[0], param[1], param[2], param[3],
> + arm_cpu->mp_affinity);
> +
> + switch (param[0]) {
> + case QEMU_PSCI_0_2_FN_PSCI_VERSION:
> + ret = QEMU_PSCI_0_2_RET_VERSION_0_2;
> + break;
> + case QEMU_PSCI_0_2_FN_MIGRATE_INFO_TYPE:
> + ret = QEMU_PSCI_0_2_RET_TOS_MIGRATION_NOT_REQUIRED; /* No trusted OS */
> + break;
> + case QEMU_PSCI_0_2_FN_AFFINITY_INFO:
> + case QEMU_PSCI_0_2_FN64_AFFINITY_INFO:
> + mpidr = param[1];
> +
> + switch (param[2]) {
> + case 0:
> + target_cpu_state = arm_get_cpu_by_id(mpidr);
> + if (!target_cpu_state) {
> + ret = QEMU_PSCI_RET_INVALID_PARAMS;
> + break;
> + }
> + target_cpu = ARM_CPU(target_cpu_state);
> +
> + ret = target_cpu->power_state;
> + break;
> + default:
> + /* Everything above affinity level 0 is always on. */
> + ret = 0;
> + }
> + break;
> + case QEMU_PSCI_0_2_FN_SYSTEM_RESET:
> + qemu_system_reset_request(SHUTDOWN_CAUSE_GUEST_RESET);
> + /* QEMU reset and shutdown are async requests, but PSCI
> + * mandates that we never return from the reset/shutdown
> + * call, so power the CPU off now so it doesn't execute
> + * anything further.
> + */
> + return hvf_psci_cpu_off(arm_cpu);
> + case QEMU_PSCI_0_2_FN_SYSTEM_OFF:
> + qemu_system_shutdown_request(SHUTDOWN_CAUSE_GUEST_SHUTDOWN);
> + return hvf_psci_cpu_off(arm_cpu);
> + case QEMU_PSCI_0_1_FN_CPU_ON:
> + case QEMU_PSCI_0_2_FN_CPU_ON:
> + case QEMU_PSCI_0_2_FN64_CPU_ON:
> + mpidr = param[1];
> + entry = param[2];
> + context_id = param[3];
> + ret = arm_set_cpu_on(mpidr, entry, context_id,
> + target_el, target_aarch64);
> + break;
> + case QEMU_PSCI_0_1_FN_CPU_OFF:
> + case QEMU_PSCI_0_2_FN_CPU_OFF:
> + return hvf_psci_cpu_off(arm_cpu);
> + case QEMU_PSCI_0_1_FN_CPU_SUSPEND:
> + case QEMU_PSCI_0_2_FN_CPU_SUSPEND:
> + case QEMU_PSCI_0_2_FN64_CPU_SUSPEND:
> + /* Affinity levels are not supported in QEMU */
> + if (param[1] & 0xfffe0000) {
> + ret = QEMU_PSCI_RET_INVALID_PARAMS;
> + break;
> + }
> + /* Powerdown is not supported, we always go into WFI */
> + env->xregs[0] = 0;
> + hvf_wfi(cpu);
> + break;
> + case QEMU_PSCI_0_1_FN_MIGRATE:
> + case QEMU_PSCI_0_2_FN_MIGRATE:
> + ret = QEMU_PSCI_RET_NOT_SUPPORTED;
> + break;
> + default:
> + return 1;
> + }
> +
> + env->xregs[0] = ret;
> + return 0;
> +}
> +
> static uint64_t hvf_sysreg_read(CPUState *cpu, uint32_t reg)
> {
> ARMCPU *arm_cpu = ARM_CPU(cpu);
> @@ -716,6 +823,8 @@ int hvf_vcpu_exec(CPUState *cpu)
> }
>
> if (cpu->halted) {
> + /* On unhalt, we usually have CPU state changes. Prepare for them. */
> + cpu_synchronize_state(cpu);
> return EXCP_HLT;
> }
This seems odd. If I understand the control flow correctly, this
is neither:
(a) just before we're about to emulate a PSCI call so we need
the current values of the registers from hvf
(b) when we've just changed the CPU registers because we made
a PSCI call and we want to push them back to hvf
(c) when we're about to resume the CPU because it's gone from
halted to not-halted, which might also be a good time to push
register state back to hvf
So what's it for ?
My expectation would be that we would ensure the state is in sync
(ie that hvf has any local changes) before we call hv_cpu_run(),
and that we would go the other way before we access any local
register CPU struct state.
thanks
-- PMM
next prev parent reply other threads:[~2021-06-15 12:56 UTC|newest]
Thread overview: 66+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-19 20:22 [PATCH v8 00/19] hvf: Implement Apple Silicon Support Alexander Graf
2021-05-19 20:22 ` [PATCH v8 01/19] hvf: Move assert_hvf_ok() into common directory Alexander Graf
2021-05-27 10:00 ` Sergio Lopez
2021-05-19 20:22 ` [PATCH v8 02/19] hvf: Move vcpu thread functions " Alexander Graf
2021-05-27 10:01 ` Sergio Lopez
2021-05-19 20:22 ` [PATCH v8 03/19] hvf: Move cpu " Alexander Graf
2021-05-27 10:02 ` Sergio Lopez
2021-05-19 20:22 ` [PATCH v8 04/19] hvf: Move hvf internal definitions into common header Alexander Graf
2021-05-27 10:04 ` Sergio Lopez
2021-05-19 20:22 ` [PATCH v8 05/19] hvf: Make hvf_set_phys_mem() static Alexander Graf
2021-05-27 10:06 ` Sergio Lopez
2021-05-19 20:22 ` [PATCH v8 06/19] hvf: Remove use of hv_uvaddr_t and hv_gpaddr_t Alexander Graf
2021-05-27 10:07 ` Sergio Lopez
2021-05-19 20:22 ` [PATCH v8 07/19] hvf: Split out common code on vcpu init and destroy Alexander Graf
2021-05-27 10:09 ` Sergio Lopez
2021-05-19 20:22 ` [PATCH v8 08/19] hvf: Use cpu_synchronize_state() Alexander Graf
2021-05-27 10:15 ` Sergio Lopez
2021-05-19 20:22 ` [PATCH v8 09/19] hvf: Make synchronize functions static Alexander Graf
2021-05-27 10:15 ` Sergio Lopez
2021-05-19 20:22 ` [PATCH v8 10/19] hvf: Remove hvf-accel-ops.h Alexander Graf
2021-05-27 10:16 ` Sergio Lopez
2021-05-19 20:22 ` [PATCH v8 11/19] hvf: Introduce hvf vcpu struct Alexander Graf
2021-05-27 10:18 ` Sergio Lopez
2021-05-19 20:22 ` [PATCH v8 12/19] hvf: Simplify post reset/init/loadvm hooks Alexander Graf
2021-05-27 10:20 ` Sergio Lopez
2021-05-19 20:22 ` [PATCH v8 13/19] hvf: Add Apple Silicon support Alexander Graf
2021-05-27 10:55 ` Sergio Lopez
2021-06-15 10:21 ` Peter Maydell
2021-06-27 20:40 ` Alexander Graf
2021-05-19 20:22 ` [PATCH v8 14/19] arm/hvf: Add a WFI handler Alexander Graf
2021-05-27 10:53 ` Sergio Lopez
2021-06-15 10:38 ` Peter Maydell
2021-05-19 20:22 ` [PATCH v8 15/19] hvf: arm: Implement -cpu host Alexander Graf
2021-05-27 11:18 ` Sergio Lopez
2021-06-15 10:56 ` Peter Maydell
2021-09-12 20:23 ` Alexander Graf
2021-09-13 8:28 ` Peter Maydell
2021-09-13 10:46 ` Alexander Graf
2021-09-13 10:52 ` Peter Maydell
2021-09-13 11:46 ` Alexander Graf
2021-09-13 11:48 ` Peter Maydell
2021-09-13 11:55 ` Alexander Graf
2021-05-19 20:22 ` [PATCH v8 16/19] hvf: arm: Implement PSCI handling Alexander Graf
2021-05-27 11:20 ` Sergio Lopez
2021-06-15 12:54 ` Peter Maydell [this message]
2021-09-12 20:36 ` Alexander Graf
2021-09-12 21:20 ` Richard Henderson
2021-09-12 21:37 ` Alexander Graf
2021-09-12 21:40 ` Richard Henderson
2021-09-13 10:06 ` Alexander Graf
2021-09-13 10:30 ` Philippe Mathieu-Daudé
2021-05-19 20:22 ` [PATCH v8 17/19] arm: Add Hypervisor.framework build target Alexander Graf
2021-05-27 11:20 ` Sergio Lopez
2021-06-15 10:59 ` Peter Maydell
2021-05-19 20:22 ` [PATCH v8 18/19] arm: Enable Windows 10 trusted SMCCC boot call Alexander Graf
2021-05-27 11:21 ` Sergio Lopez
2021-06-15 11:02 ` Peter Maydell
2021-06-27 21:12 ` Alexander Graf
2021-05-19 20:22 ` [PATCH v8 19/19] hvf: arm: Handle Windows 10 SMC call Alexander Graf
2021-05-27 11:22 ` Sergio Lopez
2021-06-15 9:31 ` Peter Maydell
2021-06-27 21:07 ` Alexander Graf
2021-05-19 20:45 ` [PATCH v8 00/19] hvf: Implement Apple Silicon Support no-reply
2021-06-03 13:43 ` Peter Maydell
2021-06-03 13:53 ` Alexander Graf
2021-06-15 12:54 ` Peter Maydell
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='CAFEAcA_VJa_vJtJx6PtQS=WTy2y9ZJg8pcgu4Pkzp=CbuH85qw@mail.gmail.com' \
--to=peter.maydell@linaro.org \
--cc=agraf@csgraf.de \
--cc=dirty@apple.com \
--cc=ehabkost@redhat.com \
--cc=lfy@google.com \
--cc=pbonzini@redhat.com \
--cc=pcc@google.com \
--cc=philmd@redhat.com \
--cc=qemu-arm@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=r.bolshakov@yadro.com \
--cc=richard.henderson@linaro.org \
/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 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).