From: Kirti Wankhede <kwankhede@nvidia.com>
To: <alex.williamson@redhat.com>, <cjia@nvidia.com>
Cc: cohuck@redhat.com, zhi.wang.linux@gmail.com, aik@ozlabs.ru,
Zhengxiao.zx@Alibaba-inc.com, shuangtai.tst@alibaba-inc.com,
qemu-devel@nongnu.org, peterx@redhat.com,
Kirti Wankhede <kwankhede@nvidia.com>,
eauger@redhat.com, artemp@nvidia.com, yi.l.liu@intel.com,
quintela@redhat.com, ziye.yang@intel.com, armbru@redhat.com,
mlevitsk@redhat.com, pasic@linux.ibm.com, felipe@nutanix.com,
zhi.a.wang@intel.com, mcrossley@nvidia.com, kevin.tian@intel.com,
yan.y.zhao@intel.com, dgilbert@redhat.com,
changpeng.liu@intel.com, eskultet@redhat.com, Ken.Xue@amd.com,
jonathan.davies@nutanix.com, pbonzini@redhat.com,
dnigam@nvidia.com
Subject: [PATCH v28 01/17] vfio: Add function to unmap VFIO region
Date: Fri, 23 Oct 2020 16:10:27 +0530 [thread overview]
Message-ID: <1603449643-12851-2-git-send-email-kwankhede@nvidia.com> (raw)
In-Reply-To: <1603449643-12851-1-git-send-email-kwankhede@nvidia.com>
This function will be used for migration region.
Migration region is mmaped when migration starts and will be unmapped when
migration is complete.
Signed-off-by: Kirti Wankhede <kwankhede@nvidia.com>
Reviewed-by: Neo Jia <cjia@nvidia.com>
Reviewed-by: Cornelia Huck <cohuck@redhat.com>
---
hw/vfio/common.c | 32 ++++++++++++++++++++++++++++----
hw/vfio/trace-events | 1 +
include/hw/vfio/vfio-common.h | 1 +
3 files changed, 30 insertions(+), 4 deletions(-)
diff --git a/hw/vfio/common.c b/hw/vfio/common.c
index 13471ae29436..c6e98b8d61be 100644
--- a/hw/vfio/common.c
+++ b/hw/vfio/common.c
@@ -924,6 +924,18 @@ int vfio_region_setup(Object *obj, VFIODevice *vbasedev, VFIORegion *region,
return 0;
}
+static void vfio_subregion_unmap(VFIORegion *region, int index)
+{
+ trace_vfio_region_unmap(memory_region_name(®ion->mmaps[index].mem),
+ region->mmaps[index].offset,
+ region->mmaps[index].offset +
+ region->mmaps[index].size - 1);
+ memory_region_del_subregion(region->mem, ®ion->mmaps[index].mem);
+ munmap(region->mmaps[index].mmap, region->mmaps[index].size);
+ object_unparent(OBJECT(®ion->mmaps[index].mem));
+ region->mmaps[index].mmap = NULL;
+}
+
int vfio_region_mmap(VFIORegion *region)
{
int i, prot = 0;
@@ -954,10 +966,7 @@ int vfio_region_mmap(VFIORegion *region)
region->mmaps[i].mmap = NULL;
for (i--; i >= 0; i--) {
- memory_region_del_subregion(region->mem, ®ion->mmaps[i].mem);
- munmap(region->mmaps[i].mmap, region->mmaps[i].size);
- object_unparent(OBJECT(®ion->mmaps[i].mem));
- region->mmaps[i].mmap = NULL;
+ vfio_subregion_unmap(region, i);
}
return ret;
@@ -982,6 +991,21 @@ int vfio_region_mmap(VFIORegion *region)
return 0;
}
+void vfio_region_unmap(VFIORegion *region)
+{
+ int i;
+
+ if (!region->mem) {
+ return;
+ }
+
+ for (i = 0; i < region->nr_mmaps; i++) {
+ if (region->mmaps[i].mmap) {
+ vfio_subregion_unmap(region, i);
+ }
+ }
+}
+
void vfio_region_exit(VFIORegion *region)
{
int i;
diff --git a/hw/vfio/trace-events b/hw/vfio/trace-events
index 93a0bc2522f8..a0c7b49a2ebc 100644
--- a/hw/vfio/trace-events
+++ b/hw/vfio/trace-events
@@ -113,6 +113,7 @@ vfio_region_mmap(const char *name, unsigned long offset, unsigned long end) "Reg
vfio_region_exit(const char *name, int index) "Device %s, region %d"
vfio_region_finalize(const char *name, int index) "Device %s, region %d"
vfio_region_mmaps_set_enabled(const char *name, bool enabled) "Region %s mmaps enabled: %d"
+vfio_region_unmap(const char *name, unsigned long offset, unsigned long end) "Region %s unmap [0x%lx - 0x%lx]"
vfio_region_sparse_mmap_header(const char *name, int index, int nr_areas) "Device %s region %d: %d sparse mmap entries"
vfio_region_sparse_mmap_entry(int i, unsigned long start, unsigned long end) "sparse entry %d [0x%lx - 0x%lx]"
vfio_get_dev_region(const char *name, int index, uint32_t type, uint32_t subtype) "%s index %d, %08x/%0x8"
diff --git a/include/hw/vfio/vfio-common.h b/include/hw/vfio/vfio-common.h
index c78f3ff5593c..dc95f527b583 100644
--- a/include/hw/vfio/vfio-common.h
+++ b/include/hw/vfio/vfio-common.h
@@ -171,6 +171,7 @@ int vfio_region_setup(Object *obj, VFIODevice *vbasedev, VFIORegion *region,
int index, const char *name);
int vfio_region_mmap(VFIORegion *region);
void vfio_region_mmaps_set_enabled(VFIORegion *region, bool enabled);
+void vfio_region_unmap(VFIORegion *region);
void vfio_region_exit(VFIORegion *region);
void vfio_region_finalize(VFIORegion *region);
void vfio_reset_handler(void *opaque);
--
2.7.0
next prev parent reply other threads:[~2020-10-23 11:17 UTC|newest]
Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-23 10:40 [PATCH v28 00/17] Add migration support for VFIO devices Kirti Wankhede
2020-10-23 10:40 ` Kirti Wankhede [this message]
2020-10-23 10:40 ` [PATCH v28 02/17] vfio: Add vfio_get_object callback to VFIODeviceOps Kirti Wankhede
2020-10-23 10:40 ` [PATCH v28 03/17] vfio: Add save and load functions for VFIO PCI devices Kirti Wankhede
2020-10-24 11:53 ` Yan Zhao
2020-10-24 14:16 ` Alex Williamson
2020-10-24 19:48 ` Kirti Wankhede
2020-10-24 20:23 ` Alex Williamson
2020-10-25 4:26 ` Yan Zhao
2020-10-23 10:40 ` [PATCH v28 04/17] vfio: Add migration region initialization and finalize function Kirti Wankhede
2020-10-23 11:24 ` Cornelia Huck
2020-10-24 20:22 ` Kirti Wankhede
2020-10-23 16:52 ` Alex Williamson
2020-10-24 9:39 ` Kirti Wankhede
2020-10-24 14:21 ` Alex Williamson
2020-10-24 14:48 ` Kirti Wankhede
2020-10-23 10:40 ` [PATCH v28 05/17] vfio: Add VM state change handler to know state of VM Kirti Wankhede
2020-10-23 11:32 ` Cornelia Huck
2020-10-24 20:27 ` Kirti Wankhede
2020-10-23 10:40 ` [PATCH v28 06/17] vfio: Add migration state change notifier Kirti Wankhede
2020-10-23 11:45 ` Cornelia Huck
2020-10-23 10:40 ` [PATCH v28 07/17] vfio: Register SaveVMHandlers for VFIO device Kirti Wankhede
2020-10-23 12:18 ` Cornelia Huck
2020-10-24 11:26 ` Yan Zhao
2020-10-24 20:35 ` Kirti Wankhede
2020-10-23 10:40 ` [PATCH v28 08/17] vfio: Add save state functions to SaveVMHandlers Kirti Wankhede
2020-10-24 11:59 ` Yan Zhao
2020-10-23 10:40 ` [PATCH v28 09/17] vfio: Add load " Kirti Wankhede
2020-10-24 11:58 ` Yan Zhao
2020-10-23 10:40 ` [PATCH v28 10/17] memory: Set DIRTY_MEMORY_MIGRATION when IOMMU is enabled Kirti Wankhede
2020-10-24 12:00 ` Yan Zhao
2020-10-23 10:40 ` [PATCH v28 11/17] vfio: Get migration capability flags for container Kirti Wankhede
2020-10-23 10:40 ` [PATCH v28 12/17] vfio: Add function to start and stop dirty pages tracking Kirti Wankhede
2020-10-23 10:40 ` [PATCH v28 13/17] vfio: Add vfio_listener_log_sync to mark dirty pages Kirti Wankhede
2020-10-23 10:40 ` [PATCH v28 14/17] vfio: Dirty page tracking when vIOMMU is enabled Kirti Wankhede
2020-10-24 11:56 ` Yan Zhao
2020-10-23 10:40 ` [PATCH v28 15/17] vfio: Add ioctl to get dirty pages bitmap during dma unmap Kirti Wankhede
2020-10-23 10:40 ` [PATCH v28 16/17] vfio: Make vfio-pci device migration capable Kirti Wankhede
2020-10-23 10:40 ` [PATCH v28 17/17] qapi: Add VFIO devices migration stats in Migration stats Kirti Wankhede
2020-10-24 16:56 ` [PATCH v28 00/17] Add migration support for VFIO devices Philippe Mathieu-Daudé
2020-10-24 17:48 ` Kirti Wankhede
2020-10-24 19:43 ` Philippe Mathieu-Daudé
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=1603449643-12851-2-git-send-email-kwankhede@nvidia.com \
--to=kwankhede@nvidia.com \
--cc=Ken.Xue@amd.com \
--cc=Zhengxiao.zx@Alibaba-inc.com \
--cc=aik@ozlabs.ru \
--cc=alex.williamson@redhat.com \
--cc=armbru@redhat.com \
--cc=artemp@nvidia.com \
--cc=changpeng.liu@intel.com \
--cc=cjia@nvidia.com \
--cc=cohuck@redhat.com \
--cc=dgilbert@redhat.com \
--cc=dnigam@nvidia.com \
--cc=eauger@redhat.com \
--cc=eskultet@redhat.com \
--cc=felipe@nutanix.com \
--cc=jonathan.davies@nutanix.com \
--cc=kevin.tian@intel.com \
--cc=mcrossley@nvidia.com \
--cc=mlevitsk@redhat.com \
--cc=pasic@linux.ibm.com \
--cc=pbonzini@redhat.com \
--cc=peterx@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=quintela@redhat.com \
--cc=shuangtai.tst@alibaba-inc.com \
--cc=yan.y.zhao@intel.com \
--cc=yi.l.liu@intel.com \
--cc=zhi.a.wang@intel.com \
--cc=zhi.wang.linux@gmail.com \
--cc=ziye.yang@intel.com \
/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).