From: wanghaibin <wanghaibin.wang@huawei.com> Move the code dedicated to blocking/unblocking on WFI to the vgic code itself, and abstract it via the irqchip_flow structure. No functional change. Signed-off-by: Marc Zyngier <maz@kernel.org> Signed-off-by: wanghaibin <wanghaibin.wang@huawei.com> --- arch/arm64/include/asm/kvm_irq.h | 8 ++++++++ arch/arm64/kvm/arm.c | 7 ++++--- arch/arm64/kvm/vgic/vgic-init.c | 2 ++ arch/arm64/kvm/vgic/vgic.c | 25 ++++++++++++++++++++++--- arch/arm64/kvm/vgic/vgic.h | 3 +++ include/kvm/arm_vgic.h | 1 - 6 files changed, 39 insertions(+), 7 deletions(-) diff --git a/arch/arm64/include/asm/kvm_irq.h b/arch/arm64/include/asm/kvm_irq.h index 8fa29ede1835..efb12693db13 100644 --- a/arch/arm64/include/asm/kvm_irq.h +++ b/arch/arm64/include/asm/kvm_irq.h @@ -21,6 +21,8 @@ struct kvm_irqchip_flow { void (*irqchip_destroy)(struct kvm *); void (*irqchip_vcpu_destroy)(struct kvm_vcpu *vcpu); int (*irqchip_vcpu_init)(struct kvm_vcpu *); + void (*irqchip_vcpu_blocking)(struct kvm_vcpu *); + void (*irqchip_vcpu_unblocking)(struct kvm_vcpu *); }; /* @@ -59,4 +61,10 @@ struct kvm_irqchip_flow { #define kvm_irqchip_vcpu_init(v) \ __vcpu_irqchip_action_ret((v), vcpu_init, (v)) +#define kvm_irqchip_vcpu_blocking(v) \ + __vcpu_irqchip_action((v), vcpu_blocking, (v)) + +#define kvm_irqchip_vcpu_unblocking(v) \ + __vcpu_irqchip_action((v), vcpu_unblocking, (v)) + #endif diff --git a/arch/arm64/kvm/arm.c b/arch/arm64/kvm/arm.c index 3fc15c48ec0c..11a1bbc4a3b7 100644 --- a/arch/arm64/kvm/arm.c +++ b/arch/arm64/kvm/arm.c @@ -1040,18 +1040,19 @@ void kvm_vcpu_wfi(struct kvm_vcpu *vcpu) * doorbells to be signalled, should an interrupt become pending. */ preempt_disable(); - kvm_vgic_vmcr_sync(vcpu); vcpu_set_flag(vcpu, IN_WFI); - vgic_v4_put(vcpu); preempt_enable(); + kvm_irqchip_vcpu_blocking(vcpu); + kvm_vcpu_halt(vcpu); vcpu_clear_flag(vcpu, IN_WFIT); preempt_disable(); vcpu_clear_flag(vcpu, IN_WFI); - vgic_v4_load(vcpu); preempt_enable(); + + kvm_irqchip_vcpu_unblocking(vcpu); } static int kvm_vcpu_suspend(struct kvm_vcpu *vcpu) diff --git a/arch/arm64/kvm/vgic/vgic-init.c b/arch/arm64/kvm/vgic/vgic-init.c index 45a5dc95a910..7367bb5bff1e 100644 --- a/arch/arm64/kvm/vgic/vgic-init.c +++ b/arch/arm64/kvm/vgic/vgic-init.c @@ -26,6 +26,8 @@ static struct kvm_irqchip_flow vgic_irqchip_flow = { .irqchip_destroy = kvm_vgic_destroy, .irqchip_vcpu_destroy = kvm_vgic_vcpu_destroy, .irqchip_vcpu_init = kvm_vgic_vcpu_init, + .irqchip_vcpu_blocking = kvm_vgic_vcpu_blocking, + .irqchip_vcpu_unblocking = kvm_vgic_vcpu_unblocking, }; /* diff --git a/arch/arm64/kvm/vgic/vgic.c b/arch/arm64/kvm/vgic/vgic.c index 13af2566f56c..63f97cc2ca32 100644 --- a/arch/arm64/kvm/vgic/vgic.c +++ b/arch/arm64/kvm/vgic/vgic.c @@ -1082,15 +1082,34 @@ void kvm_vgic_put(struct kvm_vcpu *vcpu) vgic_v3_put(vcpu); } -void kvm_vgic_vmcr_sync(struct kvm_vcpu *vcpu) +void kvm_vgic_vcpu_blocking(struct kvm_vcpu *vcpu) { - if (unlikely(!irqchip_in_kernel(vcpu->kvm))) - return; + /* + * If we're about to block (most likely because we've just hit a + * WFI), we need to sync back the state of the GIC CPU interface + * so that we have the latest PMR and group enables. This ensures + * that kvm_arch_vcpu_runnable has up-to-date data to decide + * whether we have pending interrupts. + * + * For the same reason, we want to tell GICv4 that we need + * doorbells to be signalled, should an interrupt become pending. + */ + preempt_disable(); if (kvm_vgic_global_state.type == VGIC_V2) vgic_v2_vmcr_sync(vcpu); else vgic_v3_vmcr_sync(vcpu); + + vgic_v4_put(vcpu); + preempt_enable(); +} + +void kvm_vgic_vcpu_unblocking(struct kvm_vcpu *vcpu) +{ + preempt_disable(); + vgic_v4_load(vcpu); + preempt_enable(); } int kvm_vgic_vcpu_pending_irq(struct kvm_vcpu *vcpu) diff --git a/arch/arm64/kvm/vgic/vgic.h b/arch/arm64/kvm/vgic/vgic.h index b7405cf95624..3cf986eeec93 100644 --- a/arch/arm64/kvm/vgic/vgic.h +++ b/arch/arm64/kvm/vgic/vgic.h @@ -260,6 +260,9 @@ void vgic_v3_load(struct kvm_vcpu *vcpu); void vgic_v3_put(struct kvm_vcpu *vcpu); void vgic_v3_vmcr_sync(struct kvm_vcpu *vcpu); +void kvm_vgic_vcpu_blocking(struct kvm_vcpu *vcpu); +void kvm_vgic_vcpu_unblocking(struct kvm_vcpu *vcpu); + bool vgic_has_its(struct kvm *kvm); int kvm_vgic_register_its_device(void); void vgic_enable_lpis(struct kvm_vcpu *vcpu); diff --git a/include/kvm/arm_vgic.h b/include/kvm/arm_vgic.h index b6132c062725..54e222fb0aa8 100644 --- a/include/kvm/arm_vgic.h +++ b/include/kvm/arm_vgic.h @@ -459,7 +459,6 @@ int kvm_vgic_vcpu_pending_irq(struct kvm_vcpu *vcpu); void kvm_vgic_load(struct kvm_vcpu *vcpu); void kvm_vgic_put(struct kvm_vcpu *vcpu); -void kvm_vgic_vmcr_sync(struct kvm_vcpu *vcpu); #define vgic_initialized(k) ((k)->arch.vgic.initialized) #define vgic_ready(k) ((k)->arch.vgic.ready) -- 2.33.0