4 files changed, 23 insertions, 8 deletions

diff --git a/virt/kvm/arm/vgic-v2.c b/virt/kvm/arm/vgic-v2.c
index d6c9c142f813..01124ef3690a 100644
--- a/virt/kvm/arm/vgic-v2.c
+++ b/virt/kvm/arm/vgic-v2.c
@@ -231,6 +231,22 @@ int vgic_v2_probe(struct device_node *vgic_node,
                 ret = -ENXIO;
                 goto out_unmap;
         }
+
+        if (!PAGE_ALIGNED(vcpu_res.start)) {
+                kvm_err("GICV physical address 0x%llx not page aligned\n",
+                        (unsigned long long)vcpu_res.start);
+                ret = -ENXIO;
+                goto out_unmap;
+        }
+
+        if (!PAGE_ALIGNED(resource_size(&vcpu_res))) {
+                kvm_err("GICV size 0x%llx not a multiple of page size 0x%lx\n",
+                        (unsigned long long)resource_size(&vcpu_res),
+                        PAGE_SIZE);
+                ret = -ENXIO;
+                goto out_unmap;
+        }
+
         vgic->vcpu_base = vcpu_res.start;
 
         kvm_info("%s@%llx IRQ%d\n", vgic_node->name,
diff --git a/virt/kvm/arm/vgic.c b/virt/kvm/arm/vgic.c
index ede8f6466c95..73eba793b17f 100644
--- a/virt/kvm/arm/vgic.c
+++ b/virt/kvm/arm/vgic.c
@@ -1587,11 +1587,11 @@ int kvm_vgic_hyp_init(void)
                 goto out_free_irq;
         }
 
-        on_each_cpu(vgic_init_maintenance_interrupt, NULL, 1);
-
         /* Callback into for arch code for setup */
         vgic_arch_setup(vgic);
 
+        on_each_cpu(vgic_init_maintenance_interrupt, NULL, 1);
+
         return 0;
 
 out_free_irq:
diff --git a/virt/kvm/ioapic.c b/virt/kvm/ioapic.c
index 2458a1dc2ba9..e8ce34c9db32 100644
--- a/virt/kvm/ioapic.c
+++ b/virt/kvm/ioapic.c
@@ -254,10 +254,9 @@ void kvm_ioapic_scan_entry(struct kvm_vcpu *vcpu, u64 *eoi_exit_bitmap,
         spin_lock(&ioapic->lock);
         for (index = 0; index < IOAPIC_NUM_PINS; index++) {
                 e = &ioapic->redirtbl[index];
-                if (!e->fields.mask &&
-                        (e->fields.trig_mode == IOAPIC_LEVEL_TRIG ||
-                         kvm_irq_has_notifier(ioapic->kvm, KVM_IRQCHIP_IOAPIC,
-                                 index) || index == RTC_GSI)) {
+                if (e->fields.trig_mode == IOAPIC_LEVEL_TRIG ||
+                    kvm_irq_has_notifier(ioapic->kvm, KVM_IRQCHIP_IOAPIC, index) ||
+                    index == RTC_GSI) {
                         if (kvm_apic_match_dest(vcpu, NULL, 0,
                                 e->fields.dest_id, e->fields.dest_mode)) {
                                 __set_bit(e->fields.vector,
diff --git a/virt/kvm/irq_comm.c b/virt/kvm/irq_comm.c
index ced4a542a031..a228ee82bad2 100644
--- a/virt/kvm/irq_comm.c
+++ b/virt/kvm/irq_comm.c
@@ -323,13 +323,13 @@ out:
 
 #define IOAPIC_ROUTING_ENTRY(irq) \
         { .gsi = irq, .type = KVM_IRQ_ROUTING_IRQCHIP,  \
-          .u.irqchip.irqchip = KVM_IRQCHIP_IOAPIC, .u.irqchip.pin = (irq) }
+          .u.irqchip = { .irqchip = KVM_IRQCHIP_IOAPIC, .pin = (irq) } }
 #define ROUTING_ENTRY1(irq) IOAPIC_ROUTING_ENTRY(irq)
 
 #ifdef CONFIG_X86
 #  define PIC_ROUTING_ENTRY(irq) \
         { .gsi = irq, .type = KVM_IRQ_ROUTING_IRQCHIP,  \
-          .u.irqchip.irqchip = SELECT_PIC(irq), .u.irqchip.pin = (irq) % 8 }
+          .u.irqchip = { .irqchip = SELECT_PIC(irq), .pin = (irq) % 8 } }
 #  define ROUTING_ENTRY2(irq) \
         IOAPIC_ROUTING_ENTRY(irq), PIC_ROUTING_ENTRY(irq)
 #else