1 files changed, 7 insertions, 0 deletions

diff --git a/drivers/virtio/virtio_ring.c b/drivers/virtio/virtio_ring.c
index 9849babd6b37..9859213aa658 100644
--- a/drivers/virtio/virtio_ring.c
+++ b/drivers/virtio/virtio_ring.c
@@ -255,6 +255,13 @@ irqreturn_t vring_interrupt(int irq, void *_vq)
         if (unlikely(vq->broken))
                 return IRQ_HANDLED;
 
+        /* Other side may have missed us turning off the interrupt,
+         * but we should preserve disable semantic for virtio users. */
+        if (unlikely(vq->vring.avail->flags & VRING_AVAIL_F_NO_INTERRUPT)) {
+                pr_debug("virtqueue interrupt after disable for %p\n", vq);
+                return IRQ_HANDLED;
+        }
+
         pr_debug("virtqueue callback for %p (%p)\n", vq, vq->vq.callback);
         if (vq->vq.callback)
                 vq->vq.callback(&vq->vq);