]> git.baikalelectronics.ru Git - kernel.git/commit
KVM: arm64: Handle PSCI resets before userspace touches vCPU state
authorOliver Upton <oupton@google.com>
Wed, 18 Aug 2021 20:21:31 +0000 (20:21 +0000)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 22 Sep 2021 10:26:45 +0000 (12:26 +0200)
commitf767e4596cf7b63c66bd66a8348e069b041a4820
treef64f3468ddcade99d43c213258c52431ade39541
parent1c7cf95f588d56df5f65a9916b57c5727aff32e0
KVM: arm64: Handle PSCI resets before userspace touches vCPU state

[ Upstream commit 6826c6849b46aaa91300201213701eb861af4ba0 ]

The CPU_ON PSCI call takes a payload that KVM uses to configure a
destination vCPU to run. This payload is non-architectural state and not
exposed through any existing UAPI. Effectively, we have a race between
CPU_ON and userspace saving/restoring a guest: if the target vCPU isn't
ran again before the VMM saves its state, the requested PC and context
ID are lost. When restored, the target vCPU will be runnable and start
executing at its old PC.

We can avoid this race by making sure the reset payload is serviced
before userspace can access a vCPU's state.

Fixes: fcde519638b9 ("arm/arm64: KVM: Allow a VCPU to fully reset itself")
Signed-off-by: Oliver Upton <oupton@google.com>
Signed-off-by: Marc Zyngier <maz@kernel.org>
Link: https://lore.kernel.org/r/20210818202133.1106786-3-oupton@google.com
Signed-off-by: Sasha Levin <sashal@kernel.org>
virt/kvm/arm/arm.c