qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Zhenzhong Duan <zhenzhong.duan@intel.com>
To: qemu-devel@nongnu.org
Cc: alex.williamson@redhat.com, clg@redhat.com,
	joao.m.martins@oracle.com, avihaih@nvidia.com,
	chao.p.peng@intel.com
Subject: [PATCH v3 1/3] vfio/pci: Fix resource leak in vfio_realize
Date: Wed, 21 Jun 2023 16:02:02 +0800	[thread overview]
Message-ID: <20230621080204.420723-2-zhenzhong.duan@intel.com> (raw)
In-Reply-To: <20230621080204.420723-1-zhenzhong.duan@intel.com>

When adding migration blocker failed in vfio_migration_realize(),
hotplug will fail and we see below:

(qemu) device_add vfio-pci,host=81:11.1,id=vfio1,bus=root1,x-enable-migration=true
0000:81:11.1: VFIO migration is not supported in kernel
Error: disallowing migration blocker (--only-migratable) for: VFIO device doesn't support migration

If we hotplug again we should see same log as above, but we see:
(qemu) device_add vfio-pci,host=81:11.0,id=vfio0,bus=root0,x-enable-migration=true
Error: vfio 0000:81:11.0: device is already attached

That's because some references to VFIO device isn't released,
we should check return value of vfio_migration_realize() and
release the references, then VFIO device will be truely
released when hotplug failed.

Signed-off-by: Zhenzhong Duan <zhenzhong.duan@intel.com>
---
 hw/vfio/pci.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/hw/vfio/pci.c b/hw/vfio/pci.c
index 73874a94de12..c71b0955d81c 100644
--- a/hw/vfio/pci.c
+++ b/hw/vfio/pci.c
@@ -3210,6 +3210,7 @@ static void vfio_realize(PCIDevice *pdev, Error **errp)
         ret = vfio_migration_realize(vbasedev, errp);
         if (ret) {
             error_report("%s: Migration disabled", vbasedev->name);
+            goto out_deregister;
         }
     }
 
-- 
2.34.1



  reply	other threads:[~2023-06-21  8:15 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-06-21  8:02 [PATCH v3 0/3] VFIO migration related refactor and bug fix Zhenzhong Duan
2023-06-21  8:02 ` Zhenzhong Duan [this message]
2023-06-21 11:08   ` [PATCH v3 1/3] vfio/pci: Fix resource leak in vfio_realize Joao Martins
2023-06-25  6:00     ` Duan, Zhenzhong
2023-06-26  7:02       ` Duan, Zhenzhong
2023-06-26 10:07         ` Joao Martins
2023-06-27  2:38           ` Duan, Zhenzhong
2023-06-27 10:21             ` Joao Martins
2023-06-27 10:28               ` Duan, Zhenzhong
2023-06-21  8:02 ` [PATCH v3 2/3] vfio/pci: Fix a segfault " Zhenzhong Duan
2023-06-21 11:08   ` Joao Martins
2023-06-25  6:01     ` Duan, Zhenzhong
2023-06-26  9:58       ` Joao Martins
2023-06-21  8:02 ` [PATCH v3 3/3] vfio/migration: vfio/migration: Refactor and fix print of "Migration disabled" Zhenzhong Duan
2023-06-26  9:34   ` Avihai Horon
2023-06-26 10:18     ` Joao Martins
2023-06-27  2:55       ` Duan, Zhenzhong
2023-06-27 10:56         ` Joao Martins
2023-06-28  2:26           ` Duan, Zhenzhong
2023-06-27  2:46     ` Duan, Zhenzhong

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20230621080204.420723-2-zhenzhong.duan@intel.com \
    --to=zhenzhong.duan@intel.com \
    --cc=alex.williamson@redhat.com \
    --cc=avihaih@nvidia.com \
    --cc=chao.p.peng@intel.com \
    --cc=clg@redhat.com \
    --cc=joao.m.martins@oracle.com \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).