On Mon, Jun 13, 2022 at 08:58:40AM +0200, Jason Wang wrote:
> On Fri, Jun 10, 2022 at 11:12 PM Vincent Whitchurch
> <vincent.whitchu...@axis.com> wrote:
> > diff --git a/arch/um/drivers/virt-pci.c b/arch/um/drivers/virt-pci.c
> > index 5c092a9153ea..027847023184 100644
> > --- a/arch/um/drivers/virt-pci.c
> > +++ b/arch/um/drivers/virt-pci.c
> > @@ -544,6 +544,8 @@ static int um_pci_init_vqs(struct um_pci_device *dev)
> > dev->cmd_vq = vqs[0];
> > dev->irq_vq = vqs[1];
> >
> > + virtio_device_ready(dev->vdev);
> > +
> > for (i = 0; i < NUM_IRQ_MSGS; i++) {
> > void *msg = kzalloc(MAX_IRQ_MSG_SIZE, GFP_KERNEL);
> >
> > @@ -587,7 +589,7 @@ static int um_pci_virtio_probe(struct virtio_device
> > *vdev)
> > dev->irq = irq_alloc_desc(numa_node_id());
> > if (dev->irq < 0) {
> > err = dev->irq;
> > - goto error;
> > + goto err_reset;
> > }
> > um_pci_devices[free].dev = dev;
> > vdev->priv = dev;
> > @@ -604,6 +606,9 @@ static int um_pci_virtio_probe(struct virtio_device
> > *vdev)
> >
> > um_pci_rescan();
> > return 0;
> > +err_reset:
> > + virtio_reset_device(vdev);
> > + vdev->config->del_vqs(vdev);
>
> This part seems to be an independent fix.
Yes, I guess that last line could have been added in a separate patch.
When adding the cleanup in the error path for the virtio_device_ready()
call added by the patch I noticed that this driver wasn't deleting its
virtqueues in the error path, unlike other virtio drivers I looked at.
_______________________________________________
linux-um mailing list
linux-um@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-um
