KVM: arm64: nv: Handle SEAs due to VNCR redirection
PATCH 1/1 KVM: arm64: nv: Handle SEAs due to VNCR redirection
System register accesses redirected to the VNCR page can also generate external aborts just like any other form of memory access. Route to kvm_handle_guest_sea() for potential APEI handling, falling back to a vSError if the kernel didn't handle the abort.
Take the opportunity to throw out the useless kvm_ras.h which provided a helper with a single callsite...
--- arch/arm64/include/asm/kvm_mmu.h | 1 + arch/arm64/include/asm/kvm_ras.h | 25 ------------------------- arch/arm64/kvm/mmu.c | 29 +++++++++++++++++------------ arch/arm64/kvm/nested.c | 3 +++ 4 files changed, 21 insertions(+), 37 deletions(-) delete mode 100644 arch/arm64/include/asm/kvm_ras.h
arch/arm64/include/asm/kvm_mmu.h +1 -0
@@ -180,6 +180,7 @@ void kvm_free_stage2_pgd(struct kvm_s2_mmu *mmu);int kvm_phys_addr_ioremap (struct kvm *kvm,phys_addr_t guest_ipa,phys_addr_t pa,unsigned long size,bool writable); +int kvm_handle_guest_sea (struct kvm_vcpu *vcpu);int kvm_handle_guest_abort (struct kvm_vcpu *vcpu);phys_addr_t kvm_mmu_get_httbr (void );
arch/arm64/include/asm/kvm_ras.h deleted +0 -25
@@ -1,25 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -/* Copyright (C) 2018 - Arm Ltd */ - -#ifndef __ARM64_KVM_RAS_H__ -#define __ARM64_KVM_RAS_H__ - -#include <linux/acpi.h> -#include <linux/errno.h> -#include <linux/types.h> - -#include <asm/acpi.h> - -/* -* Was this synchronous external abort a RAS notification? -* Returns '0' for errors handled by some RAS subsystem, or -ENOENT. -*/ -static inline int kvm_handle_guest_sea (void ) -{ -/* apei_claim_sea(NULL) expects to mask interrupts itself */ -lockdep_assert_irqs_enabled (); - -return apei_claim_sea (NULL ); -} - -#endif /* __ARM64_KVM_RAS_H__ */
arch/arm64/kvm/mmu.c +17 -12
@@ -4,19 +4,20 @@* Author: Christoffer Dall <[email protected]> */ +#include <linux/acpi.h> #include <linux/mman.h> #include <linux/kvm_host.h> #include <linux/io.h> #include <linux/hugetlb.h> #include <linux/sched/signal.h> #include <trace/events/kvm.h> +#include <asm/acpi.h> #include <asm/pgalloc.h> #include <asm/cacheflush.h> #include <asm/kvm_arm.h> #include <asm/kvm_mmu.h> #include <asm/kvm_pgtable.h> #include <asm/kvm_pkvm.h> -#include <asm/kvm_ras.h> #include <asm/kvm_asm.h> #include <asm/kvm_emulate.h> #include <asm/virt.h>
@@ -1811,6 +1812,19 @@ static void handle_access_fault(struct kvm_vcpu *vcpu, phys_addr_t fault_ipa)read_unlock (&vcpu->kvm->mmu_lock); } +int kvm_handle_guest_sea (struct kvm_vcpu *vcpu) +{ +/* +* Give APEI the opportunity to claim the abort before handling it +* within KVM. apei_claim_sea() expects to be called with IRQs enabled. +*/ +lockdep_assert_irqs_enabled (); +if (apei_claim_sea (NULL ) ==0 ) +return 1 ; + +return kvm_inject_serror (vcpu); +} +/** * kvm_handle_guest_abort - handles all 2nd stage aborts * @vcpu: the VCPU pointer
@@ -1834,17 +1848,8 @@ int kvm_handle_guest_abort(struct kvm_vcpu *vcpu)gfn_t gfn;int ret, idx; -/* Synchronous External Abort? */ -if (kvm_vcpu_abt_issea (vcpu)) { -/* -* For RAS the host kernel may handle this abort. -* There is no need to pass the error into the guest. -*/ -if (kvm_handle_guest_sea ()) -return kvm_inject_serror (vcpu); - -return 1 ; - } +if (kvm_vcpu_abt_issea (vcpu)) +return kvm_handle_guest_sea (vcpu); esr =kvm_vcpu_get_esr (vcpu);
arch/arm64/kvm/nested.c +3 -0
@@ -1289,6 +1289,9 @@ int kvm_handle_vncr_abort(struct kvm_vcpu *vcpu)BUG_ON (!(esr & ESR_ELx_VNCR_SHIFT)); +if (kvm_vcpu_abt_issea (vcpu)) +return kvm_handle_guest_sea (vcpu); +if (esr_fsc_is_permission_fault (esr)) {inject_vncr_perm (vcpu); }else if (esr_fsc_is_translation_fault (esr)) {
base-commit: 18ec25dd0e97653cdb576bb1750c31acf2513ea7
Signature · 1 line
2.39.5
Quoted 8 lines · Oliver Upton
System register accesses redirected to the VNCR page can also generate external aborts just like any other form of memory access. Route to
kvm_handle_guest_sea()for potential APEI handling, falling back to a vSError if the kernel didn't handle the abort.Take the opportunity to throw out the useless
kvm_ras.hwhich provided a helper with a single callsite...
Yay!
Quoted 125 lines
Cc Jiaqi Yan <[email protected]>Signed-off-by Oliver Upton <[email protected]>--- arch/arm64/include/asm/kvm_mmu.h | 1 + arch/arm64/include/asm/kvm_ras.h | 25 ------------------------- arch/arm64/kvm/mmu.c | 29 +++++++++++++++++------------ arch/arm64/kvm/nested.c | 3 +++ 4 files changed, 21 insertions(+), 37 deletions(-) delete mode 100644 arch/arm64/include/asm/kvm_ras.harch/arm64/include/asm/kvm_mmu.h +1
-0@@ -180,6 +180,7 @@ void kvm_free_stage2_pgd(struct kvm_s2_mmu *mmu);int kvm_phys_addr_ioremap (struct kvm *kvm,phys_addr_t guest_ipa,phys_addr_t pa,unsigned long size,bool writable); +int kvm_handle_guest_sea (struct kvm_vcpu *vcpu);int kvm_handle_guest_abort (struct kvm_vcpu *vcpu);phys_addr_t kvm_mmu_get_httbr (void );arch/arm64/include/asm/kvm_ras.h deleted +0
-25@@ -1,25 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -/* Copyright (C) 2018 - Arm Ltd */ - -#ifndef __ARM64_KVM_RAS_H__ -#define __ARM64_KVM_RAS_H__ - -#include <linux/acpi.h> -#include <linux/errno.h> -#include <linux/types.h> - -#include <asm/acpi.h> - -/* -* Was this synchronous external abort a RAS notification? -* Returns '0' for errors handled by some RAS subsystem, or -ENOENT. -*/ -static inline int kvm_handle_guest_sea (void ) -{ -/* apei_claim_sea(NULL) expects to mask interrupts itself */ -lockdep_assert_irqs_enabled (); - -return apei_claim_sea (NULL ); -} - -#endif /* __ARM64_KVM_RAS_H__ */ arch/arm64/kvm/mmu.c +17
-12@@ -4,19 +4,20 @@* Author: Christoffer Dall <[email protected]> */ +#include <linux/acpi.h> #include <linux/mman.h> #include <linux/kvm_host.h> #include <linux/io.h> #include <linux/hugetlb.h> #include <linux/sched/signal.h> #include <trace/events/kvm.h> +#include <asm/acpi.h> #include <asm/pgalloc.h> #include <asm/cacheflush.h> #include <asm/kvm_arm.h> #include <asm/kvm_mmu.h> #include <asm/kvm_pgtable.h> #include <asm/kvm_pkvm.h> -#include <asm/kvm_ras.h> #include <asm/kvm_asm.h> #include <asm/kvm_emulate.h> #include <asm/virt.h> @@ -1811,6 +1812,19 @@ static void handle_access_fault(struct kvm_vcpu *vcpu, phys_addr_t fault_ipa)read_unlock (&vcpu->kvm->mmu_lock); } +int kvm_handle_guest_sea (struct kvm_vcpu *vcpu) +{ +/* +* Give APEI the opportunity to claim the abort before handling it +* within KVM. apei_claim_sea() expects to be called with IRQs enabled. +*/ +lockdep_assert_irqs_enabled (); +if (apei_claim_sea (NULL ) ==0 ) +return 1 ; + +return kvm_inject_serror (vcpu); +} +/** * kvm_handle_guest_abort - handles all 2nd stage aborts * @vcpu: the VCPU pointer @@ -1834,17 +1848,8 @@ int kvm_handle_guest_abort(struct kvm_vcpu *vcpu)gfn_t gfn;int ret, idx; -/* Synchronous External Abort? */ -if (kvm_vcpu_abt_issea (vcpu)) { -/* -* For RAS the host kernel may handle this abort. -* There is no need to pass the error into the guest. -*/ -if (kvm_handle_guest_sea ()) -return kvm_inject_serror (vcpu); - -return 1 ; - } +if (kvm_vcpu_abt_issea (vcpu)) +return kvm_handle_guest_sea (vcpu); esr =kvm_vcpu_get_esr (vcpu);arch/arm64/kvm/nested.c +0
-0
arch/arm64/kvm/nested.c int kvm_handle_vncr_abort(struct kvm_vcpu *vcpu) · line 1290
Quoted 2 lines
arch/arm64/kvm/nested.c +0
-0@@ -1289,6 +1289,9 @@ int kvm_handle_vncr_abort(struct kvm_vcpu *vcpu)BUG_ON (!(esr & ESR_ELx_VNCR_SHIFT));
Urgh. This is hilarious. We don't trigger this thing by pure luck (13 is a lucky number, apparently...). I'll post a separate fix for that.
arch/arm64/kvm/nested.c int kvm_handle_vncr_abort(struct kvm_vcpu *vcpu)
Quoted 8 lines
arch/arm64/kvm/nested.c +3
-0+if (kvm_vcpu_abt_issea (vcpu)) +return kvm_handle_guest_sea (vcpu); +if (esr_fsc_is_permission_fault (esr)) {inject_vncr_perm (vcpu); }else if (esr_fsc_is_translation_fault (esr)) {
M.
Signature · 1 line
Without deviation from the norm, progress is not possible.
Quoted 10 lines · Marc Zyngier
arch/arm64/kvm/nested.c int kvm_handle_vncr_abort(struct kvm_vcpu *vcpu) · line 1290
Quoted 7 lines
arch/arm64/kvm/nested.c +0
-0@@ -1289,6 +1289,9 @@ int kvm_handle_vncr_abort(struct kvm_vcpu *vcpu)BUG_ON (!(esr & ESR_ELx_VNCR_SHIFT));Urgh. This is hilarious. We don't trigger this thing by pure luck (13 is a lucky number, apparently...). I'll post a separate fix for that.
LOL! I totally missed this when I wrote the patch. I'll grab your fix, thx for posting.
Quoted 10 lines
arch/arm64/kvm/nested.c int kvm_handle_vncr_abort(struct kvm_vcpu *vcpu)
Quoted 8 lines
arch/arm64/kvm/nested.c +3
-0+if (kvm_vcpu_abt_issea (vcpu)) +return kvm_handle_guest_sea (vcpu); +if (esr_fsc_is_permission_fault (esr)) {inject_vncr_perm (vcpu); }else if (esr_fsc_is_translation_fault (esr)) {Reviewed-by Marc Zyngier <[email protected]>
Appreciated :)
Thanks,
Oliver
Oliver Upton
AppliedQuoted 9 lines · Oliver Upton
System register accesses redirected to the VNCR page can also generate external aborts just like any other form of memory access. Route to
kvm_handle_guest_sea()for potential APEI handling, falling back to a vSError if the kernel didn't handle the abort.Take the opportunity to throw out the useless
kvm_ras.hwhich provided a helper with a single callsite...[...]
Applied to fixes, thanks!
[1/1] KVM: arm64: nv: Handle SEAs due to VNCR redirection
https://git.kernel.org/kvmarm/kvmarm/c/69f8fe955d0b
--
Best,
Oliver