[PATCH v2 05/12] virito: queue_reset: pci: move the per queue irq logic from vp_del_vqs to vp_del_vq

[Xuan Zhuo]

Move irq's processing logic into vp_del_vq(), so that this function can
handle a vq's del operation independently.

In the subsequent patches that supports queue reset, I have the
need to delete a vq separately.

Signed-off-by: Xuan Zhuo <xuanz...@linux.alibaba.com>
---
 drivers/virtio/virtio_pci_common.c | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/drivers/virtio/virtio_pci_common.c 
b/drivers/virtio/virtio_pci_common.c
index fdbde1db5ec5..cb1eec0a6bf3 100644
--- a/drivers/virtio/virtio_pci_common.c
+++ b/drivers/virtio/virtio_pci_common.c
@@ -248,6 +248,17 @@ static void vp_del_vq(struct virtqueue *vq)
        struct virtio_pci_vq_info *info = vp_dev->vqs[vq->index];
        unsigned long flags;
 
+       if (vp_dev->per_vq_vectors) {
+               int v = vp_dev->vqs[vq->index]->msix_vector;
+
+               if (v != VIRTIO_MSI_NO_VECTOR) {
+                       int irq = pci_irq_vector(vp_dev->pci_dev, v);
+
+                       irq_set_affinity_hint(irq, NULL);
+                       free_irq(irq, vq);
+               }
+       }
+
        spin_lock_irqsave(&vp_dev->lock, flags);
        list_del(&info->node);
        spin_unlock_irqrestore(&vp_dev->lock, flags);
@@ -263,19 +274,9 @@ void vp_del_vqs(struct virtio_device *vdev)
        struct virtqueue *vq, *n;
        int i;
 
-       list_for_each_entry_safe(vq, n, &vdev->vqs, list) {
-               if (vp_dev->per_vq_vectors) {
-                       int v = vp_dev->vqs[vq->index]->msix_vector;
-
-                       if (v != VIRTIO_MSI_NO_VECTOR) {
-                               int irq = pci_irq_vector(vp_dev->pci_dev, v);
-
-                               irq_set_affinity_hint(irq, NULL);
-                               free_irq(irq, vq);
-                       }
-               }
+       list_for_each_entry_safe(vq, n, &vdev->vqs, list)
                vp_del_vq(vq);
-       }
+
        vp_dev->per_vq_vectors = false;
 
        if (vp_dev->intx_enabled) {
-- 
2.31.0

_______________________________________________
Virtualization mailing list
Virtualization@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/virtualization