vfio/pci: vfio_pci_put_device on failure

[PATCH] vfio/pci: vfio_pci_put_device on failure

Steve Sistare posted 1 patch 5 months, 3 weeks ago

Download mbox

Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/qemu tags/patchew/1748379412-150475-1-git-send-email-steven.sistare@oracle.com

Maintainers: Alex Williamson <alex.williamson@redhat.com>, "Cédric Le Goater" <clg@redhat.com>

hw/vfio/pci.c | 1 +
1 file changed, 1 insertion(+)

Expand all Fold all

[PATCH] vfio/pci: vfio_pci_put_device on failure

Posted by Steve Sistare 5 months, 3 weeks ago

If vfio_realize fails after vfio_device_attach, it should call
vfio_device_detach during error recovery.  If it fails after
vfio_device_get_name, it should free vbasedev->name.  If it fails
after vfio_pci_config_setup, it should free vdev->msix.

To fix all, call vfio_pci_put_device().

Signed-off-by: Steve Sistare <steven.sistare@oracle.com>
---
 hw/vfio/pci.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/hw/vfio/pci.c b/hw/vfio/pci.c
index a1bfdfe..7d3b9ff 100644
--- a/hw/vfio/pci.c
+++ b/hw/vfio/pci.c
@@ -3296,6 +3296,7 @@ out_teardown:
     vfio_bars_exit(vdev);
 error:
     error_prepend(errp, VFIO_MSG_PREFIX, vbasedev->name);
+    vfio_pci_put_device(vdev);
 }
 
 static void vfio_instance_finalize(Object *obj)
-- 
1.8.3.1

Re: [PATCH] vfio/pci: vfio_pci_put_device on failure

Posted by John Levon 5 months, 3 weeks ago

On Tue, May 27, 2025 at 01:56:52PM -0700, Steve Sistare wrote:

> If vfio_realize fails after vfio_device_attach, it should call
> vfio_device_detach during error recovery.  If it fails after
> vfio_device_get_name, it should free vbasedev->name.  If it fails
> after vfio_pci_config_setup, it should free vdev->msix.
> 
> To fix all, call vfio_pci_put_device().
> 
> Signed-off-by: Steve Sistare <steven.sistare@oracle.com>
> ---
>  hw/vfio/pci.c | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/hw/vfio/pci.c b/hw/vfio/pci.c
> index a1bfdfe..7d3b9ff 100644
> --- a/hw/vfio/pci.c
> +++ b/hw/vfio/pci.c
> @@ -3296,6 +3296,7 @@ out_teardown:
>      vfio_bars_exit(vdev);
>  error:
>      error_prepend(errp, VFIO_MSG_PREFIX, vbasedev->name);
> +    vfio_pci_put_device(vdev);
>  }
>  
>  static void vfio_instance_finalize(Object *obj)

Reviewed-by: John Levon <john.levon@nutanix.com>