Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5386cef2 authored by Michael S. Tsirkin's avatar Michael S. Tsirkin
Browse files

virtio_pci: delete vqs indirectly 



VQ deletion is mostly version-specific, add another level of indirection
to split the version-independent code out.

Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
parent f30eaf4a

drivers/virtio/virtio_pci.c

+20 −7
Original line number Diff line number Diff line
@@ -81,6 +81,8 @@ struct virtio_pci_device { 


	/* Whether we have vector per vq */

	bool per_vq_vectors;



	void (*del_vq)(struct virtio_pci_vq_info *info);

};



/* Constants for MSI-X */
@@ -468,15 +470,11 @@ static struct virtqueue *setup_vq(struct virtio_device *vdev, unsigned index, 
	return ERR_PTR(err);

}



static void vp_del_vq(struct virtqueue *vq)

static void del_vq(struct virtio_pci_vq_info *info)

{

	struct virtqueue *vq = info->vq;

	struct virtio_pci_device *vp_dev = to_vp_device(vq->vdev);

	struct virtio_pci_vq_info *info = vp_dev->vqs[vq->index];

	unsigned long flags, size;



	spin_lock_irqsave(&vp_dev->lock, flags);

	list_del(&info->node);

	spin_unlock_irqrestore(&vp_dev->lock, flags);

	unsigned long size;



	iowrite16(vq->index, vp_dev->ioaddr + VIRTIO_PCI_QUEUE_SEL);
@@ -494,6 +492,19 @@ static void vp_del_vq(struct virtqueue *vq) 


	size = PAGE_ALIGN(vring_size(info->num, VIRTIO_PCI_VRING_ALIGN));

	free_pages_exact(info->queue, size);

}



static void vp_del_vq(struct virtqueue *vq)

{

	struct virtio_pci_device *vp_dev = to_vp_device(vq->vdev);

	struct virtio_pci_vq_info *info = vp_dev->vqs[vq->index];

	unsigned long flags;



	spin_lock_irqsave(&vp_dev->lock, flags);

	list_del(&info->node);

	spin_unlock_irqrestore(&vp_dev->lock, flags);



	vp_dev->del_vq(info);

	kfree(info);

}
@@ -737,6 +748,8 @@ static int virtio_pci_probe(struct pci_dev *pci_dev, 
	vp_dev->vdev.id.vendor = pci_dev->subsystem_vendor;

	vp_dev->vdev.id.device = pci_dev->subsystem_device;



	vp_dev->del_vq = del_vq;



	/* finally register the virtio device */

	err = register_virtio_device(&vp_dev->vdev);

	if (err)