All of lore.kernel.org
 help / color / mirror / Atom feed
From: Alex Williamson <alex.williamson@redhat.com>
To: qemu-devel@nongnu.org
Cc: Kirti Wankhede <kwankhede@nvidia.com>,
	Cornelia Huck <cohuck@redhat.com>, Neo Jia <cjia@nvidia.com>
Subject: [PULL v2 01/32] vfio: Add function to unmap VFIO region
Date: Wed, 28 Oct 2020 10:39:38 -0600	[thread overview]
Message-ID: <160390317835.12234.4749068381095472933.stgit@gimli.home> (raw)
In-Reply-To: <160390309510.12234.8858324597971641979.stgit@gimli.home>

From: Kirti Wankhede <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>
Signed-off-by: Alex Williamson <alex.williamson@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(&region->mmaps[index].mem),
+                            region->mmaps[index].offset,
+                            region->mmaps[index].offset +
+                            region->mmaps[index].size - 1);
+    memory_region_del_subregion(region->mem, &region->mmaps[index].mem);
+    munmap(region->mmaps[index].mmap, region->mmaps[index].size);
+    object_unparent(OBJECT(&region->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, &region->mmaps[i].mem);
-                munmap(region->mmaps[i].mmap, region->mmaps[i].size);
-                object_unparent(OBJECT(&region->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);



  reply	other threads:[~2020-10-28 16:42 UTC|newest]

Thread overview: 35+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-10-28 16:39 [PULL v2 00/32] VFIO updates 2020-10-28 (for QEMU 5.2 soft-freeze) Alex Williamson
2020-10-28 16:39 ` Alex Williamson [this message]
2020-10-28 16:39 ` [PULL v2 02/32] vfio: Add vfio_get_object callback to VFIODeviceOps Alex Williamson
2020-10-28 16:39 ` [PULL v2 03/32] vfio: Add save and load functions for VFIO PCI devices Alex Williamson
2020-10-28 16:40 ` [PULL v2 04/32] vfio: Add migration region initialization and finalize function Alex Williamson
2020-10-28 16:40 ` [PULL v2 05/32] vfio: Add VM state change handler to know state of VM Alex Williamson
2020-10-28 16:40 ` [PULL v2 06/32] vfio: Add migration state change notifier Alex Williamson
2020-10-28 16:40 ` [PULL v2 07/32] vfio: Register SaveVMHandlers for VFIO device Alex Williamson
2020-10-28 16:40 ` [PULL v2 08/32] vfio: Add save state functions to SaveVMHandlers Alex Williamson
2020-10-28 16:40 ` [PULL v2 09/32] vfio: Add load " Alex Williamson
2020-10-28 16:40 ` [PULL v2 10/32] memory: Set DIRTY_MEMORY_MIGRATION when IOMMU is enabled Alex Williamson
2020-10-28 16:41 ` [PULL v2 11/32] vfio: Get migration capability flags for container Alex Williamson
2020-10-28 16:41 ` [PULL v2 12/32] vfio: Add function to start and stop dirty pages tracking Alex Williamson
2020-10-28 16:41 ` [PULL v2 13/32] vfio: Add vfio_listener_log_sync to mark dirty pages Alex Williamson
2020-10-28 16:41 ` [PULL v2 14/32] vfio: Dirty page tracking when vIOMMU is enabled Alex Williamson
2020-10-28 16:41 ` [PULL v2 15/32] vfio: Add ioctl to get dirty pages bitmap during dma unmap Alex Williamson
2020-10-28 16:41 ` [PULL v2 16/32] vfio: Make vfio-pci device migration capable Alex Williamson
2020-10-28 16:42 ` [PULL v2 17/32] qapi: Add VFIO devices migration stats in Migration stats Alex Williamson
2020-10-28 16:42 ` [PULL v2 18/32] update-linux-headers: Add vfio_zdev.h Alex Williamson
2020-10-28 16:42 ` [PULL v2 19/32] linux-headers: update against 5.10-rc1 Alex Williamson
2020-10-28 16:42 ` [PULL v2 20/32] s390x/pci: Move header files to include/hw/s390x Alex Williamson
2020-10-28 16:42 ` [PULL v2 21/32] vfio: Create shared routine for scanning info capabilities Alex Williamson
2020-10-28 16:42 ` [PULL v2 22/32] vfio: Find DMA available capability Alex Williamson
2020-10-28 16:42 ` [PULL v2 23/32] s390x/pci: Add routine to get the vfio dma available count Alex Williamson
2020-10-28 16:42 ` [PULL v2 24/32] s390x/pci: Honor DMA limits set by vfio Alex Williamson
2020-10-28 16:43 ` [PULL v2 25/32] s390x/pci: create a header dedicated to PCI CLP Alex Williamson
2020-10-28 16:43 ` [PULL v2 26/32] s390x/pci: use a PCI Group structure Alex Williamson
2020-10-28 16:43 ` [PULL v2 27/32] s390x/pci: clean up s390 PCI groups Alex Williamson
2020-10-28 16:43 ` [PULL v2 28/32] s390x/pci: use a PCI Function structure Alex Williamson
2020-10-28 16:43 ` [PULL v2 29/32] vfio: Add routine for finding VFIO_DEVICE_GET_INFO capabilities Alex Williamson
2020-10-28 16:43 ` [PULL v2 30/32] s390x/pci: get zPCI function info from host Alex Williamson
2020-10-28 16:44 ` [PULL v2 31/32] hw/vfio: Use lock guard macros Alex Williamson
2020-10-28 16:44 ` [PULL v2 32/32] vfio: fix incorrect print type Alex Williamson
2020-10-31 14:54 ` [PULL v2 00/32] VFIO updates 2020-10-28 (for QEMU 5.2 soft-freeze) Peter Maydell
2020-11-01 20:46   ` Alex Williamson

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=160390317835.12234.4749068381095472933.stgit@gimli.home \
    --to=alex.williamson@redhat.com \
    --cc=cjia@nvidia.com \
    --cc=cohuck@redhat.com \
    --cc=kwankhede@nvidia.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.