um: virtio-pci: free the IRQ message buffers
PATCH 1/1 um: virtio-pci: free the IRQ message buffers
From: Benjamin Berg <[email protected]>
These buffers are allocated when initializing the virtual queues, but were not freed again. Wrap all of the del_vqs calls to detach and free the unused buffers before deleting the IRQ VQ.
Signed-off-by Benjamin Berg <[email protected]>
--- arch/um/drivers/virtio_pcidev.c | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-)
arch/um/drivers/virtio_pcidev.c +15 -4
@@ -490,13 +490,24 @@ static int virtio_pcidev_init_vqs(struct virtio_pcidev_device *dev)return 0 ; } +static void virtio_pcidev_del_vqs (struct virtio_device *vdev, +struct virtio_pcidev_device *dev) +{ +void *msg; + +while ((msg =virtqueue_detach_unused_buf (dev->irq_vq))) +kfree (msg); + + vdev->config->del_vqs (vdev); +} +static void __virtio_pcidev_virtio_platform_remove (struct virtio_device *vdev,struct virtio_pcidev_device *dev) {um_pci_platform_device_unregister (&dev->pdev);virtio_reset_device (vdev); - vdev->config->del_vqs (vdev); +virtio_pcidev_del_vqs (vdev, dev);kfree (dev); }
@@ -526,7 +537,7 @@ static int virtio_pcidev_virtio_platform_probe(struct virtio_device *vdev,um_pci_platform_device_unregister (&dev->pdev); err_reset:virtio_reset_device (vdev); - vdev->config->del_vqs (vdev); +virtio_pcidev_del_vqs (vdev, dev); err_free:kfree (dev);return err;
@@ -569,7 +580,7 @@ static int virtio_pcidev_virtio_probe(struct virtio_device *vdev) err_reset:virtio_reset_device (vdev); - vdev->config->del_vqs (vdev); +virtio_pcidev_del_vqs (vdev, dev); err_free:kfree (dev);return err;
@@ -591,9 +602,9 @@ static void virtio_pcidev_virtio_remove(struct virtio_device *vdev)/* Stop all virtqueues */ virtio_reset_device (vdev); +virtio_pcidev_del_vqs (vdev, dev); dev->cmd_vq =NULL ; dev->irq_vq =NULL ; - vdev->config->del_vqs (vdev);kfree (dev); }
Signature · 1 line
2.54.0