KVM: arm64: vgic-v4: Make the doorbell request robust w.r.t preemption
Subsystems (4)
Marc Zyngier
maintainerPATCH 1/1 KVM: arm64: vgic-v4: Make the doorbell request robust w.r.t preemption
Xiang reports that VMs occasionally fail to boot on GICv4.1 systems when running a preemptible kernel, as it is possible that a vCPU is blocked without requesting a doorbell interrupt.
The issue is that any preemption that occurs between vgic_v4_put() and schedule() on the block path will mark the vPE as nonresident and *not* request a doorbell irq. This occurs because when the vcpu thread is resumed on its way to block, vcpu_load() will make the vPE resident again. Once the vcpu actually blocks, we don't request a doorbell anymore, and the vcpu won't be woken up on interrupt delivery.
Fix it by tracking that we're entering WFI, and key the doorbell request on that flag. This allows us not to make the vPE resident when going through a preempt/schedule cycle, meaning we don't lose any state.
--- arch/arm64/include/asm/kvm_host.h | 2 ++ arch/arm64/kvm/arm.c | 6 ++++-- arch/arm64/kvm/vgic/vgic-v3.c | 2 +- arch/arm64/kvm/vgic/vgic-v4.c | 7 +++++-- include/kvm/arm_vgic.h | 2 +- 5 files changed, 13 insertions(+), 6 deletions(-)
arch/arm64/include/asm/kvm_host.h +2 -0
@@ -817,6 +817,8 @@ struct kvm_vcpu_arch {#define DBG_SS_ACTIVE_PENDING __vcpu_single_flag(sflags, BIT(5))/* PMUSERENR for the guest EL0 is on physical CPU */ #define PMUSERENR_ON_CPU __vcpu_single_flag(sflags, BIT(6)) +/* WFI instruction trapped */ +#define IN_WFI __vcpu_single_flag(sflags, BIT(7))/* vcpu entered with HCR_EL2.E2H set */ #define VCPU_HCR_E2H __vcpu_single_flag(oflags, BIT(0))
arch/arm64/kvm/arm.c +4 -2
@@ -725,13 +725,15 @@ void kvm_vcpu_wfi(struct kvm_vcpu *vcpu)*/ preempt_disable ();kvm_vgic_vmcr_sync (vcpu); -vgic_v4_put (vcpu, true); +vcpu_set_flag (vcpu,IN_WFI ); +vgic_v4_put (vcpu);preempt_enable ();kvm_vcpu_halt (vcpu);vcpu_clear_flag (vcpu,IN_WFIT );preempt_disable (); +vcpu_clear_flag (vcpu,IN_WFI );vgic_v4_load (vcpu);preempt_enable (); }
@@ -799,7 +801,7 @@ static int check_vcpu_requests(struct kvm_vcpu *vcpu)if (kvm_check_request (KVM_REQ_RELOAD_GICv4, vcpu)) {/* The distributor enable bits were changed */ preempt_disable (); -vgic_v4_put (vcpu, false); +vgic_v4_put (vcpu);vgic_v4_load (vcpu);preempt_enable (); }
arch/arm64/kvm/vgic/vgic-v3.c +1 -1
@@ -780,7 +780,7 @@ void vgic_v3_put(struct kvm_vcpu *vcpu)* done a vgic_v4_put) and when running a nested guest (the * vPE was never resident in order to generate a doorbell). */ -WARN_ON (vgic_v4_put (vcpu, false)); +WARN_ON (vgic_v4_put (vcpu));vgic_v3_vmcr_sync (vcpu);
arch/arm64/kvm/vgic/vgic-v4.c +5 -2
@@ -336,14 +336,14 @@ void vgic_v4_teardown(struct kvm *kvm) its_vm->vpes =NULL ; } -int vgic_v4_put (struct kvm_vcpu *vcpu,bool need_db) +int vgic_v4_put (struct kvm_vcpu *vcpu) {struct its_vpe *vpe = &vcpu->arch.vgic_cpu.vgic_v3.its_vpe;if (!vgic_supports_direct_msis (vcpu->kvm) || !vpe->resident)return 0 ; -return its_make_vpe_non_resident (vpe, need_db); +return its_make_vpe_non_resident (vpe, !!vcpu_get_flag (vcpu,IN_WFI )); }int vgic_v4_load (struct kvm_vcpu *vcpu)
@@ -354,6 +354,9 @@ int vgic_v4_load(struct kvm_vcpu *vcpu)if (!vgic_supports_direct_msis (vcpu->kvm) || vpe->resident)return 0 ; +if (vcpu_get_flag (vcpu,IN_WFI )) +return 0 ; +/* * Before making the VPE resident, make sure the redistributor * corresponding to our current CPU expects us here. See the
include/kvm/arm_vgic.h +1 -1
@@ -446,7 +446,7 @@ int kvm_vgic_v4_unset_forwarding(struct kvm *kvm, int irq,int vgic_v4_load (struct kvm_vcpu *vcpu);void vgic_v4_commit (struct kvm_vcpu *vcpu); -int vgic_v4_put (struct kvm_vcpu *vcpu,bool need_db); +int vgic_v4_put (struct kvm_vcpu *vcpu);bool vgic_state_is_nested (struct kvm_vcpu *vcpu);
Signature · 1 line
2.34.1
Quoted 16 lines · Marc Zyngier
Xiang reports that VMs occasionally fail to boot on GICv4.1 systems when running a preemptible kernel, as it is possible that a vCPU is blocked without requesting a doorbell interrupt.
The issue is that any preemption that occurs between
vgic_v4_put()andschedule()on the block path will mark the vPE as nonresident and *not* request a doorbell irq. This occurs because when the vcpu thread is resumed on its way to block,vcpu_load()will make the vPE resident again. Once the vcpu actually blocks, we don't request a doorbell anymore, and the vcpu won't be woken up on interrupt delivery.Fix it by tracking that we're entering WFI, and key the doorbell request on that flag. This allows us not to make the vPE resident when going through a preempt/schedule cycle, meaning we don't lose any state.
Quoted 8 lines
Fixes 8e01d9a396e6 ("KVM: arm64: vgic-v4: Move the GICv4 residency flow to be driven by vcpu_load/put")Reported-by Xiang Chen <[email protected]>Suggested-by Zenghui Yu <[email protected]>Tested-by Xiang Chen <[email protected]>Co-developed-by Oliver Upton <[email protected]>Signed-off-by Oliver Upton <[email protected]>Signed-off-by Marc Zyngier <[email protected]>
Oliver Upton
AppliedQuoted 4 lines · Marc Zyngier
Xiang reports that VMs occasionally fail to boot on GICv4.1 systems when running a preemptible kernel, as it is possible that a vCPU is blocked without requesting a doorbell interrupt.
Quoted 8 lines
The issue is that any preemption that occurs between
vgic_v4_put()andschedule()on the block path will mark the vPE as nonresident and *not* request a doorbell irq. This occurs because when the vcpu thread is resumed on its way to block,vcpu_load()will make the vPE resident again. Once the vcpu actually blocks, we don't request a doorbell anymore, and the vcpu won't be woken up on interrupt delivery.[...]
Applied to kvmarm/fixes, thanks!
[1/1] KVM: arm64: vgic-v4: Make the doorbell request robust w.r.t preemption
https://git.kernel.org/kvmarm/kvmarm/c/b321c31c9b7b
--
Best,
Oliver