1 files changed, 26 insertions, 18 deletions

diff --git a/virt/kvm/arm/vgic/vgic-mmio.c b/virt/kvm/arm/vgic/vgic-mmio.c
index c1e4bdd66131..deb51ee16a3d 100644
--- a/virt/kvm/arm/vgic/vgic-mmio.c
+++ b/virt/kvm/arm/vgic/vgic-mmio.c
@@ -69,13 +69,14 @@ void vgic_mmio_write_senable(struct kvm_vcpu *vcpu,
 {
         u32 intid = VGIC_ADDR_TO_INTID(addr, 1);
         int i;
+        unsigned long flags;
 
         for_each_set_bit(i, &val, len * 8) {
                 struct vgic_irq *irq = vgic_get_irq(vcpu->kvm, vcpu, intid + i);
 
-                spin_lock(&irq->irq_lock);
+                spin_lock_irqsave(&irq->irq_lock, flags);
                 irq->enabled = true;
-                vgic_queue_irq_unlock(vcpu->kvm, irq);
+                vgic_queue_irq_unlock(vcpu->kvm, irq, flags);
 
                 vgic_put_irq(vcpu->kvm, irq);
         }
@@ -87,15 +88,16 @@ void vgic_mmio_write_cenable(struct kvm_vcpu *vcpu,
 {
         u32 intid = VGIC_ADDR_TO_INTID(addr, 1);
         int i;
+        unsigned long flags;
 
         for_each_set_bit(i, &val, len * 8) {
                 struct vgic_irq *irq = vgic_get_irq(vcpu->kvm, vcpu, intid + i);
 
-                spin_lock(&irq->irq_lock);
+                spin_lock_irqsave(&irq->irq_lock, flags);
 
                 irq->enabled = false;
 
-                spin_unlock(&irq->irq_lock);
+                spin_unlock_irqrestore(&irq->irq_lock, flags);
                 vgic_put_irq(vcpu->kvm, irq);
         }
 }
@@ -126,14 +128,15 @@ void vgic_mmio_write_spending(struct kvm_vcpu *vcpu,
 {
         u32 intid = VGIC_ADDR_TO_INTID(addr, 1);
         int i;
+        unsigned long flags;
 
         for_each_set_bit(i, &val, len * 8) {
                 struct vgic_irq *irq = vgic_get_irq(vcpu->kvm, vcpu, intid + i);
 
-                spin_lock(&irq->irq_lock);
+                spin_lock_irqsave(&irq->irq_lock, flags);
                 irq->pending_latch = true;
 
-                vgic_queue_irq_unlock(vcpu->kvm, irq);
+                vgic_queue_irq_unlock(vcpu->kvm, irq, flags);
                 vgic_put_irq(vcpu->kvm, irq);
         }
 }
@@ -144,15 +147,16 @@ void vgic_mmio_write_cpending(struct kvm_vcpu *vcpu,
 {
         u32 intid = VGIC_ADDR_TO_INTID(addr, 1);
         int i;
+        unsigned long flags;
 
         for_each_set_bit(i, &val, len * 8) {
                 struct vgic_irq *irq = vgic_get_irq(vcpu->kvm, vcpu, intid + i);
 
-                spin_lock(&irq->irq_lock);
+                spin_lock_irqsave(&irq->irq_lock, flags);
 
                 irq->pending_latch = false;
 
-                spin_unlock(&irq->irq_lock);
+                spin_unlock_irqrestore(&irq->irq_lock, flags);
                 vgic_put_irq(vcpu->kvm, irq);
         }
 }
@@ -181,7 +185,8 @@ static void vgic_mmio_change_active(struct kvm_vcpu *vcpu, struct vgic_irq *irq,
                                     bool new_active_state)
 {
         struct kvm_vcpu *requester_vcpu;
-        spin_lock(&irq->irq_lock);
+        unsigned long flags;
+        spin_lock_irqsave(&irq->irq_lock, flags);
 
         /*
          * The vcpu parameter here can mean multiple things depending on how
@@ -216,9 +221,9 @@ static void vgic_mmio_change_active(struct kvm_vcpu *vcpu, struct vgic_irq *irq,
 
         irq->active = new_active_state;
         if (new_active_state)
-                vgic_queue_irq_unlock(vcpu->kvm, irq);
+                vgic_queue_irq_unlock(vcpu->kvm, irq, flags);
         else
-                spin_unlock(&irq->irq_lock);
+                spin_unlock_irqrestore(&irq->irq_lock, flags);
 }
 
 /*
@@ -352,14 +357,15 @@ void vgic_mmio_write_priority(struct kvm_vcpu *vcpu,
 {
         u32 intid = VGIC_ADDR_TO_INTID(addr, 8);
         int i;
+        unsigned long flags;
 
         for (i = 0; i < len; i++) {
                 struct vgic_irq *irq = vgic_get_irq(vcpu->kvm, vcpu, intid + i);
 
-                spin_lock(&irq->irq_lock);
+                spin_lock_irqsave(&irq->irq_lock, flags);
                 /* Narrow the priority range to what we actually support */
                 irq->priority = (val >> (i * 8)) & GENMASK(7, 8 - VGIC_PRI_BITS);
-                spin_unlock(&irq->irq_lock);
+                spin_unlock_irqrestore(&irq->irq_lock, flags);
 
                 vgic_put_irq(vcpu->kvm, irq);
         }
@@ -390,6 +396,7 @@ void vgic_mmio_write_config(struct kvm_vcpu *vcpu,
 {
         u32 intid = VGIC_ADDR_TO_INTID(addr, 2);
         int i;
+        unsigned long flags;
 
         for (i = 0; i < len * 4; i++) {
                 struct vgic_irq *irq;
@@ -404,14 +411,14 @@ void vgic_mmio_write_config(struct kvm_vcpu *vcpu,
                         continue;
 
                 irq = vgic_get_irq(vcpu->kvm, vcpu, intid + i);
-                spin_lock(&irq->irq_lock);
+                spin_lock_irqsave(&irq->irq_lock, flags);
 
                 if (test_bit(i * 2 + 1, &val))
                         irq->config = VGIC_CONFIG_EDGE;
                 else
                         irq->config = VGIC_CONFIG_LEVEL;
 
-                spin_unlock(&irq->irq_lock);
+                spin_unlock_irqrestore(&irq->irq_lock, flags);
                 vgic_put_irq(vcpu->kvm, irq);
         }
 }
@@ -443,6 +450,7 @@ void vgic_write_irq_line_level_info(struct kvm_vcpu *vcpu, u32 intid,
 {
         int i;
         int nr_irqs = vcpu->kvm->arch.vgic.nr_spis + VGIC_NR_PRIVATE_IRQS;
+        unsigned long flags;
 
         for (i = 0; i < 32; i++) {
                 struct vgic_irq *irq;
@@ -459,12 +467,12 @@ void vgic_write_irq_line_level_info(struct kvm_vcpu *vcpu, u32 intid,
                  * restore irq config before line level.
                  */
                 new_level = !!(val & (1U << i));
-                spin_lock(&irq->irq_lock);
+                spin_lock_irqsave(&irq->irq_lock, flags);
                 irq->line_level = new_level;
                 if (new_level)
-                        vgic_queue_irq_unlock(vcpu->kvm, irq);
+                        vgic_queue_irq_unlock(vcpu->kvm, irq, flags);
                 else
-                        spin_unlock(&irq->irq_lock);
+                        spin_unlock_irqrestore(&irq->irq_lock, flags);
 
                 vgic_put_irq(vcpu->kvm, irq);
         }