KVM: arm64: Prevent use of invalid PSCI v0.1 function IDs

Browse source

PSCI driver exposes a struct containing the PSCI v0.1 function IDs
configured in the DT. However, the struct does not convey the
information whether these were set from DT or contain the default value
zero. This could be a problem for PSCI proxy in KVM protected mode.

Extend config passed to KVM with a bit mask with individual bits set
depending on whether the corresponding function pointer in psci_ops is
set, eg. set bit for PSCI_CPU_SUSPEND if psci_ops.cpu_suspend != NULL.

Previously config was split into multiple global variables. Put
everything into a single struct for convenience.

Reported-by: Mark Rutland <mark.rutland@arm.com>
Signed-off-by: David Brazdil <dbrazdil@google.com>
Signed-off-by: Marc Zyngier <maz@kernel.org>
Link: https://lore.kernel.org/r/20201208142452.87237-2-dbrazdil@google.com

...

This commit is contained in:

David Brazdil 2020-12-08 14:24:47 +00:00 • committed by Marc Zyngier

parent 2a5f1b67ec

commit ff367fe473

3 changed files with 70 additions and 17 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

20

arch/arm64/include/asm/kvm_host.h

View file

14

arch/arm64/kvm/arm.c

View file

53

arch/arm64/kvm/hyp/nvhe/psci-relay.c

View file