From nobody Fri Nov 7 04:17:15 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=intel.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1546928052022596.1410442361096; Mon, 7 Jan 2019 22:14:12 -0800 (PST) Received: from localhost ([127.0.0.1]:51288 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ggkeR-0002gu-2q for importer@patchew.org; Tue, 08 Jan 2019 01:14:11 -0500 Received: from eggs.gnu.org ([209.51.188.92]:48676) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ggkbx-0001KZ-0p for qemu-devel@nongnu.org; Tue, 08 Jan 2019 01:11:38 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ggkbv-00041M-VT for qemu-devel@nongnu.org; Tue, 08 Jan 2019 01:11:37 -0500 Received: from mga02.intel.com ([134.134.136.20]:33825) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ggkbv-0003ui-ML for qemu-devel@nongnu.org; Tue, 08 Jan 2019 01:11:35 -0500 Received: from orsmga007.jf.intel.com ([10.7.209.58]) by orsmga101.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 07 Jan 2019 22:11:32 -0800 Received: from joy-optiplex-7040.sh.intel.com ([10.239.13.9]) by orsmga007.jf.intel.com with ESMTP; 07 Jan 2019 22:11:31 -0800 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.56,453,1539673200"; d="scan'208";a="104817710" From: Zhao Yan To: qemu-devel@nongnu.org Date: Tue, 8 Jan 2019 01:03:48 -0500 Message-Id: <20190108060348.3359-2-yan.y.zhao@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190108060348.3359-1-yan.y.zhao@intel.com> References: <20190108060348.3359-1-yan.y.zhao@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 134.134.136.20 Subject: [Qemu-devel] [PATCH] vfio: assign idstr for VFIO's mmaped regions for migration X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: pbonzini@redhat.com, alex.williamson@redhat.com, Zhao Yan Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" if multiple regions in vfio are mmaped, their corresponding ramblocks are like below, i.e. their idstrs are "". (qemu) info ramblock Block Name PSize Offset Used Total pc.ram 4 KiB 0x0000000000000000 0x0000000020000000 0x0000000020000000 4 KiB 0x0000000021100000 0x0000000020000000 0x0000000020000000 4 KiB 0x0000000020900000 0x0000000000800000 0x0000000000800000 4 KiB 0x0000000020240000 0x0000000000687000 0x0000000000687000 4 KiB 0x00000000200c0000 0x0000000000178000 0x0000000000178000 pc.bios 4 KiB 0x0000000020000000 0x0000000000040000 0x0000000000040000 pc.rom 4 KiB 0x0000000020040000 0x0000000000020000 0x0000000000020000 This is because ramblocks' idstr are assigned by calling vmstate_register_ram(), but memory region of type ram device ptr does not call vmstate_register_ram(). vfio_region_mmap |->memory_region_init_ram_device_ptr |-> memory_region_init_ram_ptr Without empty idstrs will cause problem to snapshot copying during migration, because it uses ramblocks' idstr to identify ramblocks. ram_save_setup { =E2=80=A6 RAMBLOCK_FOREACH(block) { qemu_put_byte(f, strlen(block->idstr)); qemu_put_buffer(f, (uint8_t *)block->idstr,strlen(block->idstr)); qemu_put_be64(f, block->used_length); } =E2=80=A6 } ram_load() { block =3D qemu_ram_block_by_name(id); if (block) { if (length !=3D block->used_length) { qemu_ram_resize(block, length, &local_err); } =E2=80=A6. } } Therefore, in this patch, vmstate_register_ram() is called for memory region of type ram ptr, also a unique vfioid is assigned to vfio devices across source and target vms. e.g. in source vm, use qemu parameter -device vfio-pci,sysfsdev=3D/sys/bus/pci/devices/0000:00:02.0/ 882cc4da-dede-11e7-9180-078a62063ab1,vfioid=3Digd and in target vm, use qemu paramter -device vfio-pci,sysfsdev=3D/sys/bus/pci/devices/0000:00:02.0/ 5ac1fb20-2bbf-4842-bb7e-36c58c3be9cd,vfioid=3Digd Signed-off-by: Zhao Yan --- hw/vfio/pci.c | 8 +++++++- include/hw/vfio/vfio-common.h | 1 + memory.c | 4 ++++ 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/hw/vfio/pci.c b/hw/vfio/pci.c index c0cb1ec289..7bc2ed0752 100644 --- a/hw/vfio/pci.c +++ b/hw/vfio/pci.c @@ -2533,7 +2533,12 @@ static void vfio_populate_device(VFIOPCIDevice *vdev= , Error **errp) } =20 for (i =3D VFIO_PCI_BAR0_REGION_INDEX; i < VFIO_PCI_ROM_REGION_INDEX; = i++) { - char *name =3D g_strdup_printf("%s BAR %d", vbasedev->name, i); + char *name; + if (vbasedev->vfioid) { + name =3D g_strdup_printf("%s BAR %d", vbasedev->vfioid, i); + } else { + name =3D g_strdup_printf("%s BAR %d", vbasedev->name, i); + } =20 ret =3D vfio_region_setup(OBJECT(vdev), vbasedev, &vdev->bars[i].region, i, name); @@ -3180,6 +3185,7 @@ static void vfio_instance_init(Object *obj) static Property vfio_pci_dev_properties[] =3D { DEFINE_PROP_PCI_HOST_DEVADDR("host", VFIOPCIDevice, host), DEFINE_PROP_STRING("sysfsdev", VFIOPCIDevice, vbasedev.sysfsdev), + DEFINE_PROP_STRING("vfioid", VFIOPCIDevice, vbasedev.vfioid), DEFINE_PROP_ON_OFF_AUTO("display", VFIOPCIDevice, display, ON_OFF_AUTO_OFF), DEFINE_PROP_UINT32("x-intx-mmap-timeout-ms", VFIOPCIDevice, diff --git a/include/hw/vfio/vfio-common.h b/include/hw/vfio/vfio-common.h index 1b434d02f6..84bab94f52 100644 --- a/include/hw/vfio/vfio-common.h +++ b/include/hw/vfio/vfio-common.h @@ -108,6 +108,7 @@ typedef struct VFIODevice { struct VFIOGroup *group; char *sysfsdev; char *name; + char *vfioid; DeviceState *dev; int fd; int type; diff --git a/memory.c b/memory.c index d14c6dec1d..dbb29fa989 100644 --- a/memory.c +++ b/memory.c @@ -1588,6 +1588,7 @@ void memory_region_init_ram_ptr(MemoryRegion *mr, uint64_t size, void *ptr) { + DeviceState *owner_dev; memory_region_init(mr, owner, name, size); mr->ram =3D true; mr->terminates =3D true; @@ -1597,6 +1598,9 @@ void memory_region_init_ram_ptr(MemoryRegion *mr, /* qemu_ram_alloc_from_ptr cannot fail with ptr !=3D NULL. */ assert(ptr !=3D NULL); mr->ram_block =3D qemu_ram_alloc_from_ptr(size, ptr, mr, &error_fatal); + + owner_dev =3D DEVICE(owner); + vmstate_register_ram(mr, owner_dev); } =20 void memory_region_init_ram_device_ptr(MemoryRegion *mr, --=20 2.17.1