KVM: arm64: Allow PSCI SYSTEM_OFF/RESET to return
PATCH 1/1 KVM: arm64: Allow PSCI SYSTEM_OFF/RESET to return
The KVM/arm64 PSCI relay assumes that SYSTEM_OFF and SYSTEM_RESET should not return, as dictated by the PSCI spec. However, there is firmware out there which breaks this assumption, leading to a hyp panic. Make KVM more robust to broken firmware by allowing these to return.
--- arch/arm64/kvm/hyp/nvhe/psci-relay.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-)
arch/arm64/kvm/hyp/nvhe/psci-relay.c +5 -8
@@ -77,12 +77,6 @@ static unsigned long psci_forward(struct kvm_cpu_context *host_ctxt) cpu_reg(host_ctxt, 2), cpu_reg(host_ctxt, 3)); } -static __noreturn unsigned long psci_forward_noreturn (struct kvm_cpu_context *host_ctxt) -{ -psci_forward (host_ctxt); -hyp_panic ();/* unreachable */ -} -static unsigned int find_cpu_id (u64 mpidr) {unsigned int i;
@@ -251,10 +245,13 @@ static unsigned long psci_0_2_handler(u64 func_id, struct kvm_cpu_context *host_case PSCI_0_2_FN_MIGRATE_INFO_TYPE :case PSCI_0_2_FN64_MIGRATE_INFO_UP_CPU :return psci_forward (host_ctxt); +/* +* SYSTEM_OFF/RESET should not return according to the spec. +* Allow it so as to stay robust to broken firmware. +*/ case PSCI_0_2_FN_SYSTEM_OFF :case PSCI_0_2_FN_SYSTEM_RESET : -psci_forward_noreturn (host_ctxt); -unreachable (); +return psci_forward (host_ctxt);case PSCI_0_2_FN64_CPU_SUSPEND :return psci_cpu_suspend (func_id, host_ctxt);case PSCI_0_2_FN64_CPU_ON :
Signature · 6 lines
2.29.2.729.g45daf8777d-goog _______________________________________________ kvmarm mailing list [email protected] https://lists.cs.columbia.edu/mailman/listinfo/kvmarm
Quoted 4 lines · David Brazdil
The KVM/arm64 PSCI relay assumes that
SYSTEM_OFFandSYSTEM_RESETshould not return, as dictated by the PSCI spec. However, there is firmware out there which breaks this assumption, leading to a hyp panic. Make KVM more robust to broken firmware by allowing these to return.
Are you sure you should just return?
We've had issues in the past with Linux reboot(2) that returns to userspace, allowing on 32-bit ARM for example watchdogs to unexpectedly continue being serviced.
Signature · 6 lines
RMK's Patch system: https://www.armlinux.org.uk/developer/patches/ FTTP is here! 40Mbps down 10Mbps up. Decent connectivity at last! _______________________________________________ kvmarm mailing list [email protected] https://lists.cs.columbia.edu/mailman/listinfo/kvmarm
Marc Zyngier
maintainerQuoted 11 lines · Russell King - ARM Linux admin
Quoted 4 lines · David Brazdil
The KVM/arm64 PSCI relay assumes that
SYSTEM_OFFandSYSTEM_RESETshould not return, as dictated by the PSCI spec. However, there is firmware out there which breaks this assumption, leading to a hyp panic. Make KVM more robust to broken firmware by allowing these to return.Are you sure you should just return?
We've had issues in the past with Linux reboot(2) that returns to userspace, allowing on 32-bit ARM for example watchdogs to unexpectedly continue being serviced.
I don't think this changes anything compared to the case where the PSCI relay isn't enabled. The EL1 part of the kernel would see the SYSTEM_RESET call return, and handle it accordingly (stay in a while(1) loop).
This is consistent with the PSCI relay design goal of being invisible to the EL1 kernel.
Thanks,
M.
Signature · 5 lines
Jazz is not dead. It just smells funny... _______________________________________________ kvmarm mailing list [email protected] https://lists.cs.columbia.edu/mailman/listinfo/kvmarm
Marc Zyngier
maintainerHi David,
Quoted 37 lines · David Brazdil
The KVM/arm64 PSCI relay assumes that
SYSTEM_OFFandSYSTEM_RESETshould not return, as dictated by the PSCI spec. However, there is firmware out there which breaks this assumption, leading to a hyp panic. Make KVM more robust to broken firmware by allowing these to return.Signed-off-by David Brazdil <[email protected]>--- arch/arm64/kvm/hyp/nvhe/psci-relay.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-)arch/arm64/kvm/hyp/nvhe/psci-relay.c +0
-6@@ -77,12 +77,6 @@ static unsigned long psci_forward(struct kvm_cpu_context *host_ctxt) cpu_reg(host_ctxt, 2), cpu_reg(host_ctxt, 3)); } -static __noreturn unsigned long psci_forward_noreturn (struct kvm_cpu_context *host_ctxt) -{ -psci_forward (host_ctxt); -hyp_panic ();/* unreachable */ -} -static unsigned int find_cpu_id (u64 mpidr){
arch/arm64/kvm/hyp/nvhe/psci-relay.c +0
-0unsigned int i;@@ -251,10 +245,13 @@ static unsigned long psci_0_2_handler(u64
func_id, structkvm_cpu_context*host_arch/arm64/kvm/hyp/nvhe/psci-relay.c +2
-0case PSCI_0_2_FN_MIGRATE_INFO_TYPE :case PSCI_0_2_FN64_MIGRATE_INFO_UP_CPU :return psci_forward (host_ctxt); +/* +* SYSTEM_OFF/RESET should not return according to the spec.
arch/arm64/kvm/hyp/nvhe/psci-relay.c static unsigned long psci_0_2_handler(u64 func_id, struct kvm_cpu_context *host_ · line 257
Quoted 10 lines
arch/arm64/kvm/hyp/nvhe/psci-relay.c +3
-2+* Allow it so as to stay robust to broken firmware. +*/ case PSCI_0_2_FN_SYSTEM_OFF :case PSCI_0_2_FN_SYSTEM_RESET : -psci_forward_noreturn (host_ctxt); -unreachable (); +return psci_forward (host_ctxt);case PSCI_0_2_FN64_CPU_SUSPEND :return psci_cpu_suspend (func_id, host_ctxt);case PSCI_0_2_FN64_CPU_ON :
Thanks for having tracked this.
I wonder whether we should also taint the kernel in this case, because this is completely unexpected, and a major spec violation.
Ideally, we'd be able to detect this case and prevent pKVM from getting initialised at all, but I guess there is no way to detect the sucker without ... calling SYSTEM_RESET?
M.
Signature · 5 lines
Jazz is not dead. It just smells funny... _______________________________________________ kvmarm mailing list [email protected] https://lists.cs.columbia.edu/mailman/listinfo/kvmarm
Quoted 53 lines · Marc Zyngier
Hi David,
Quoted 37 lines · David Brazdil
The KVM/arm64 PSCI relay assumes that
SYSTEM_OFFandSYSTEM_RESETshould not return, as dictated by the PSCI spec. However, there is firmware out there which breaks this assumption, leading to a hyp panic. Make KVM more robust to broken firmware by allowing these to return.Signed-off-by David Brazdil <[email protected]>--- arch/arm64/kvm/hyp/nvhe/psci-relay.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-)arch/arm64/kvm/hyp/nvhe/psci-relay.c +0
-6@@ -77,12 +77,6 @@ static unsigned long psci_forward(struct kvm_cpu_context *host_ctxt) cpu_reg(host_ctxt, 2), cpu_reg(host_ctxt, 3)); } -static __noreturn unsigned long psci_forward_noreturn (struct kvm_cpu_context *host_ctxt) -{ -psci_forward (host_ctxt); -hyp_panic ();/* unreachable */ -} -static unsigned int find_cpu_id (u64 mpidr){
arch/arm64/kvm/hyp/nvhe/psci-relay.c +0
-0unsigned int i;@@ -251,10 +245,13 @@ static unsigned long psci_0_2_handler(u64
func_id, structkvm_cpu_context*host_arch/arm64/kvm/hyp/nvhe/psci-relay.c +2
-0case PSCI_0_2_FN_MIGRATE_INFO_TYPE :case PSCI_0_2_FN64_MIGRATE_INFO_UP_CPU :return psci_forward (host_ctxt); +/* +* SYSTEM_OFF/RESET should not return according to the spec. arch/arm64/kvm/hyp/nvhe/psci-relay.c static unsigned long psci_0_2_handler(u64 func_id, struct kvm_cpu_context *host_ · line 257
Quoted 10 lines
arch/arm64/kvm/hyp/nvhe/psci-relay.c +3
-2+* Allow it so as to stay robust to broken firmware. +*/ case PSCI_0_2_FN_SYSTEM_OFF :case PSCI_0_2_FN_SYSTEM_RESET : -psci_forward_noreturn (host_ctxt); -unreachable (); +return psci_forward (host_ctxt);case PSCI_0_2_FN64_CPU_SUSPEND :return psci_cpu_suspend (func_id, host_ctxt);case PSCI_0_2_FN64_CPU_ON :Thanks for having tracked this.
Quoted 6 lines
I wonder whether we should also taint the kernel in this case, because this is completely unexpected, and a major spec violation.
Ideally, we'd be able to detect this case and prevent pKVM from getting initialised at all, but I guess there is no way to detect the sucker without ... calling
SYSTEM_RESET?
Yeah, there are no bits to check, unfortunately. :(
David
_______________________________________________
kvmarm mailing list
[email protected]
https://lists.cs.columbia.edu/mailman/listinfo/kvmarm
Quoted 4 lines · David Brazdil
The KVM/arm64 PSCI relay assumes that
SYSTEM_OFFandSYSTEM_RESETshould not return, as dictated by the PSCI spec. However, there is firmware out there which breaks this assumption, leading to a hyp panic. Make KVM more robust to broken firmware by allowing these to return.
Applied to next, thanks!
[1/1] KVM: arm64: Allow PSCI SYSTEM_OFF/RESET to return
commit: 2c91ef39216149df6703c3fa6a47dd9a1e6091c1
Cheers,
M.
Signature · 7 lines
Without deviation from the norm, progress is not possible. _______________________________________________ kvmarm mailing list [email protected] https://lists.cs.columbia.edu/mailman/listinfo/kvmarm