KVM: arm64: GICv4.1: Expose HW-based SGIs in debugfs

The vgic-state debugfs file could do with showing the pending state
of the HW-backed SGIs. Plug it into the low-level code.

Signed-off-by: Marc Zyngier <maz@kernel.org>
Reviewed-by: Zenghui Yu <yuzenghui@huawei.com>
Reviewed-by: Eric Auger <eric.auger@redhat.com>
Link: https://lore.kernel.org/r/20200304203330.4967-24-maz@kernel.org

diff --git a/virt/kvm/arm/vgic/vgic-debug.c b/virt/kvm/arm/vgic/vgic-debug.c
index cc12fe9..b13a9e3 100644 (file)
--- a/virt/kvm/arm/vgic/vgic-debug.c
+++ b/virt/kvm/arm/vgic/vgic-debug.c
@@ -178,6 +178,8 @@ static void print_irq_state(struct seq_file *s, struct vgic_irq *irq,
                            struct kvm_vcpu *vcpu)
 {
        char *type;
+       bool pending;
+
        if (irq->intid < VGIC_NR_SGIS)
                type = "SGI";
        else if (irq->intid < VGIC_NR_PRIVATE_IRQS)
@@ -190,6 +192,16 @@ static void print_irq_state(struct seq_file *s, struct vgic_irq *irq,
        if (irq->intid ==0 || irq->intid == VGIC_NR_PRIVATE_IRQS)
                print_header(s, irq, vcpu);
 
+       pending = irq->pending_latch;
+       if (irq->hw && vgic_irq_is_sgi(irq->intid)) {
+               int err;
+
+               err = irq_get_irqchip_state(irq->host_irq,
+                                           IRQCHIP_STATE_PENDING,
+                                           &pending);
+               WARN_ON_ONCE(err);
+       }
+
        seq_printf(s, "       %s %4d "
                      "    %2d "
                      "%d%d%d%d%d%d%d "
@@ -201,7 +213,7 @@ static void print_irq_state(struct seq_file *s, struct vgic_irq *irq,
                      "\n",
                        type, irq->intid,
                        (irq->target_vcpu) ? irq->target_vcpu->vcpu_id : -1,
-                       irq->pending_latch,
+                       pending,
                        irq->line_level,
                        irq->active,
                        irq->enabled,