KVM: arm64: Really propagate PSCI SYSTEM_RESET2 arguments to userspace
authorWill Deacon <will@kernel.org>
Wed, 9 Mar 2022 18:13:08 +0000 (18:13 +0000)
committerMarc Zyngier <maz@kernel.org>
Wed, 9 Mar 2022 18:17:30 +0000 (18:17 +0000)
commit9d3e7b7c82fd9d40240867ef4c45388cd05031f3
tree28012a25233484a70cebbae190ff9ae59f6f31c7
parentae82047e97a3014d843d4fb931922982ef625e54
KVM: arm64: Really propagate PSCI SYSTEM_RESET2 arguments to userspace

Commit d43583b890e7 ("KVM: arm64: Expose PSCI SYSTEM_RESET2 call to the
guest") hooked up the SYSTEM_RESET2 PSCI call for guests but failed to
preserve its arguments for userspace, instead overwriting them with
zeroes via smccc_set_retval(). As Linux only passes zeroes for these
arguments, this appeared to be working for Linux guests. Oh well.

Don't call smccc_set_retval() for a SYSTEM_RESET2 heading to userspace
and instead set X0 (and only X0) explicitly to PSCI_RET_INTERNAL_FAILURE
just in case the vCPU re-enters the guest.

Fixes: d43583b890e7 ("KVM: arm64: Expose PSCI SYSTEM_RESET2 call to the guest")
Reported-by: Andrew Walbran <qwandor@google.com>
Signed-off-by: Will Deacon <will@kernel.org>
Signed-off-by: Marc Zyngier <maz@kernel.org>
Link: https://lore.kernel.org/r/20220309181308.982-1-will@kernel.org
arch/arm64/kvm/psci.c