qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Steve Sistare <steven.sistare@oracle.com>
To: qemu-devel@nongnu.org
Cc: Alex Williamson <alex.williamson@redhat.com>,
	Cedric Le Goater <clg@redhat.com>, Yi Liu <yi.l.liu@intel.com>,
	Eric Auger <eric.auger@redhat.com>,
	Zhenzhong Duan <zhenzhong.duan@intel.com>,
	"Michael S. Tsirkin" <mst@redhat.com>,
	Marcel Apfelbaum <marcel.apfelbaum@gmail.com>,
	Peter Xu <peterx@redhat.com>, Fabiano Rosas <farosas@suse.de>,
	Steve Sistare <steven.sistare@oracle.com>
Subject: [PATCH V3 09/42] vfio/container: discard old DMA vaddr
Date: Mon, 12 May 2025 08:32:20 -0700	[thread overview]
Message-ID: <1747063973-124548-10-git-send-email-steven.sistare@oracle.com> (raw)
In-Reply-To: <1747063973-124548-1-git-send-email-steven.sistare@oracle.com>

In the container pre_save handler, discard the virtual addresses in DMA
mappings with VFIO_DMA_UNMAP_FLAG_VADDR, because guest RAM will be
remapped at a different VA after in new QEMU.  DMA to already-mapped
pages continues.

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

diff --git a/hw/vfio/cpr-legacy.c b/hw/vfio/cpr-legacy.c
index 638a8e0..519d772 100644
--- a/hw/vfio/cpr-legacy.c
+++ b/hw/vfio/cpr-legacy.c
@@ -17,6 +17,22 @@
 #include "migration/vmstate.h"
 #include "qapi/error.h"
 
+static bool vfio_dma_unmap_vaddr_all(VFIOContainer *container, Error **errp)
+{
+    struct vfio_iommu_type1_dma_unmap unmap = {
+        .argsz = sizeof(unmap),
+        .flags = VFIO_DMA_UNMAP_FLAG_VADDR | VFIO_DMA_UNMAP_FLAG_ALL,
+        .iova = 0,
+        .size = 0,
+    };
+    if (ioctl(container->fd, VFIO_IOMMU_UNMAP_DMA, &unmap)) {
+        error_setg_errno(errp, errno, "vfio_dma_unmap_vaddr_all");
+        return false;
+    }
+    return true;
+}
+
+
 static bool vfio_cpr_supported(VFIOContainer *container, Error **errp)
 {
     if (!ioctl(container->fd, VFIO_CHECK_EXTENSION, VFIO_UPDATE_VADDR)) {
@@ -32,6 +48,18 @@ static bool vfio_cpr_supported(VFIOContainer *container, Error **errp)
     }
 }
 
+static int vfio_container_pre_save(void *opaque)
+{
+    VFIOContainer *container = opaque;
+    Error *err = NULL;
+
+    if (!vfio_dma_unmap_vaddr_all(container, &err)) {
+        error_report_err(err);
+        return -1;
+    }
+    return 0;
+}
+
 static int vfio_container_post_load(void *opaque, int version_id)
 {
     VFIOContainer *container = opaque;
@@ -52,6 +80,7 @@ static const VMStateDescription vfio_container_vmstate = {
     .name = "vfio-container",
     .version_id = 0,
     .minimum_version_id = 0,
+    .pre_save = vfio_container_pre_save,
     .post_load = vfio_container_post_load,
     .needed = cpr_needed_for_reuse,
     .fields = (VMStateField[]) {
-- 
1.8.3.1



  parent reply	other threads:[~2025-05-12 15:35 UTC|newest]

Thread overview: 157+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-05-12 15:32 [PATCH V3 00/42] Live update: vfio and iommufd Steve Sistare
2025-05-12 15:32 ` [PATCH V3 01/42] MAINTAINERS: Add reviewer for CPR Steve Sistare
2025-05-15  7:36   ` Cédric Le Goater
2025-05-12 15:32 ` [PATCH V3 02/42] migration: cpr helpers Steve Sistare
2025-05-15  7:43   ` Cédric Le Goater
2025-05-12 15:32 ` [PATCH V3 03/42] migration: lower handler priority Steve Sistare
2025-05-12 15:32 ` [PATCH V3 04/42] vfio: vfio_find_ram_discard_listener Steve Sistare
2025-05-12 15:32 ` [PATCH V3 05/42] vfio: move vfio-cpr.h Steve Sistare
2025-05-15  7:46   ` Cédric Le Goater
2025-05-12 15:32 ` [PATCH V3 06/42] vfio/container: register container for cpr Steve Sistare
2025-05-15  7:54   ` Cédric Le Goater
2025-05-15 19:06     ` Steven Sistare
2025-05-16 16:20       ` Cédric Le Goater
2025-05-16 17:21         ` Steven Sistare
2025-05-12 15:32 ` [PATCH V3 07/42] vfio/container: preserve descriptors Steve Sistare
2025-05-15 12:59   ` Cédric Le Goater
2025-05-15 19:08     ` Steven Sistare
2025-05-19 13:20       ` Cédric Le Goater
2025-05-19 16:21         ` Steven Sistare
2025-05-22 13:51   ` Cédric Le Goater
2025-05-22 13:56     ` Steven Sistare
2025-05-12 15:32 ` [PATCH V3 08/42] vfio/container: export vfio_legacy_dma_map Steve Sistare
2025-05-15 13:42   ` Cédric Le Goater
2025-05-15 19:08     ` Steven Sistare
2025-05-12 15:32 ` Steve Sistare [this message]
2025-05-15 13:30   ` [PATCH V3 09/42] vfio/container: discard old DMA vaddr Cédric Le Goater
2025-05-12 15:32 ` [PATCH V3 10/42] vfio/container: restore " Steve Sistare
2025-05-15 13:42   ` Cédric Le Goater
2025-05-15 19:08     ` Steven Sistare
2025-05-19 13:32       ` Cédric Le Goater
2025-05-19 16:33         ` Steven Sistare
2025-05-22  6:37   ` Cédric Le Goater
2025-05-22 14:00     ` Steven Sistare
2025-05-12 15:32 ` [PATCH V3 11/42] vfio/container: mdev cpr blocker Steve Sistare
2025-05-16  8:16   ` Cédric Le Goater
2025-05-12 15:32 ` [PATCH V3 12/42] vfio/container: recover from unmap-all-vaddr failure Steve Sistare
2025-05-20  6:29   ` Cédric Le Goater
2025-05-20 13:39     ` Steven Sistare
2025-05-12 15:32 ` [PATCH V3 13/42] pci: export msix_is_pending Steve Sistare
2025-05-12 15:32 ` [PATCH V3 14/42] pci: skip reset during cpr Steve Sistare
2025-05-16  8:19   ` Cédric Le Goater
2025-05-16 17:58     ` Steven Sistare
2025-05-24  9:34     ` Michael S. Tsirkin
2025-05-27 20:42       ` Steven Sistare
2025-05-27 21:03         ` Michael S. Tsirkin
2025-05-28 16:11           ` Steven Sistare
2025-05-12 15:32 ` [PATCH V3 15/42] vfio-pci: " Steve Sistare
2025-05-20  6:48   ` Cédric Le Goater
2025-05-20 13:44     ` Steven Sistare
2025-05-12 15:32 ` [PATCH V3 16/42] vfio/pci: vfio_vector_init Steve Sistare
2025-05-16  8:32   ` Cédric Le Goater
2025-05-12 15:32 ` [PATCH V3 17/42] vfio/pci: vfio_notifier_init Steve Sistare
2025-05-16  8:29   ` Cédric Le Goater
2025-05-12 15:32 ` [PATCH V3 18/42] vfio/pci: pass vector to virq functions Steve Sistare
2025-05-16  8:28   ` Cédric Le Goater
2025-05-12 15:32 ` [PATCH V3 19/42] vfio/pci: vfio_notifier_init cpr parameters Steve Sistare
2025-05-16  8:29   ` Cédric Le Goater
2025-05-12 15:32 ` [PATCH V3 20/42] vfio/pci: vfio_notifier_cleanup Steve Sistare
2025-05-16  8:30   ` Cédric Le Goater
2025-05-12 15:32 ` [PATCH V3 21/42] vfio/pci: export MSI functions Steve Sistare
2025-05-16  8:31   ` Cédric Le Goater
2025-05-16 17:58     ` Steven Sistare
2025-05-20  5:52       ` Cédric Le Goater
2025-05-20 14:56         ` Steven Sistare
2025-05-20 15:10           ` Cédric Le Goater
2025-05-12 15:32 ` [PATCH V3 22/42] vfio-pci: preserve MSI Steve Sistare
2025-05-28 17:44   ` Steven Sistare
2025-06-01 17:28     ` Cédric Le Goater
2025-05-12 15:32 ` [PATCH V3 23/42] vfio-pci: preserve INTx Steve Sistare
2025-05-12 15:32 ` [PATCH V3 24/42] migration: close kvm after cpr Steve Sistare
2025-05-16  8:35   ` Cédric Le Goater
2025-05-16 17:14     ` Peter Xu
2025-05-16 19:17       ` Steven Sistare
2025-05-16 18:18     ` Steven Sistare
2025-05-19  8:51       ` Cédric Le Goater
2025-05-19 19:07         ` Steven Sistare
2025-05-12 15:32 ` [PATCH V3 25/42] migration: cpr_get_fd_param helper Steve Sistare
2025-05-19 21:22   ` Fabiano Rosas
2025-05-12 15:32 ` [PATCH V3 26/42] vfio: return mr from vfio_get_xlat_addr Steve Sistare
2025-05-12 20:51   ` John Levon
2025-05-14 17:03     ` Cédric Le Goater
2025-05-15  8:22       ` David Hildenbrand
2025-05-15 19:13         ` Steven Sistare
2025-05-15 17:24     ` Steven Sistare
2025-05-13 11:12   ` Mark Cave-Ayland
2025-05-15 19:40     ` Steven Sistare
2025-05-12 15:32 ` [PATCH V3 27/42] vfio: pass ramblock to vfio_container_dma_map Steve Sistare
2025-05-16  8:26   ` Duan, Zhenzhong
2025-05-12 15:32 ` [PATCH V3 28/42] backends/iommufd: iommufd_backend_map_file_dma Steve Sistare
2025-05-16  8:26   ` Duan, Zhenzhong
2025-05-19 15:51     ` Steven Sistare
2025-05-20 19:32       ` Steven Sistare
2025-05-21  2:48         ` Duan, Zhenzhong
2025-05-12 15:32 ` [PATCH V3 29/42] backends/iommufd: change process ioctl Steve Sistare
2025-05-16  8:42   ` Duan, Zhenzhong
2025-05-19 15:51     ` Steven Sistare
2025-05-20 19:34       ` Steven Sistare
2025-05-21  3:11         ` Duan, Zhenzhong
2025-05-21 13:01           ` Steven Sistare
2025-05-22  3:19             ` Duan, Zhenzhong
2025-05-22 21:11               ` Steven Sistare
2025-05-23  8:56                 ` Duan, Zhenzhong
2025-05-23 14:56                   ` Steven Sistare
2025-05-23 19:19                     ` Steven Sistare
2025-05-26  2:31                       ` Duan, Zhenzhong
2025-05-28 13:31                         ` Steven Sistare
2025-05-30  9:56                           ` Duan, Zhenzhong
2025-05-12 15:32 ` [PATCH V3 30/42] physmem: qemu_ram_get_fd_offset Steve Sistare
2025-05-16  8:40   ` Duan, Zhenzhong
2025-05-12 15:32 ` [PATCH V3 31/42] vfio/iommufd: use IOMMU_IOAS_MAP_FILE Steve Sistare
2025-05-16  8:48   ` Duan, Zhenzhong
2025-05-19 15:52     ` Steven Sistare
2025-05-20 19:39       ` Steven Sistare
2025-05-21  3:13         ` Duan, Zhenzhong
2025-05-20 12:27   ` Cédric Le Goater
2025-05-20 13:58     ` Steven Sistare
2025-05-12 15:32 ` [PATCH V3 32/42] vfio/iommufd: export iommufd_cdev_get_info_iova_range Steve Sistare
2025-05-21 18:35   ` Steven Sistare
2025-05-12 15:32 ` [PATCH V3 33/42] vfio/iommufd: define hwpt constructors Steve Sistare
2025-05-16  8:55   ` Duan, Zhenzhong
2025-05-19 15:55     ` Steven Sistare
2025-05-23 17:47       ` Steven Sistare
2025-05-20 12:34     ` Cédric Le Goater
2025-05-21  2:48       ` Duan, Zhenzhong
2025-05-21  8:19         ` Cédric Le Goater
2025-05-12 15:32 ` [PATCH V3 34/42] vfio/iommufd: invariant device name Steve Sistare
2025-05-16  9:29   ` Duan, Zhenzhong
2025-05-19 15:52     ` Steven Sistare
2025-05-20 13:55   ` Cédric Le Goater
2025-05-20 21:00     ` Steven Sistare
2025-05-21  8:20       ` Cédric Le Goater
2025-05-12 15:32 ` [PATCH V3 35/42] vfio/iommufd: register container for cpr Steve Sistare
2025-05-16 10:23   ` Duan, Zhenzhong
2025-05-19 15:52     ` Steven Sistare
2025-05-12 15:32 ` [PATCH V3 36/42] vfio/iommufd: preserve descriptors Steve Sistare
2025-05-16 10:06   ` Duan, Zhenzhong
2025-05-19 15:53     ` Steven Sistare
2025-05-20  9:15       ` Duan, Zhenzhong
2025-05-12 15:32 ` [PATCH V3 37/42] vfio/iommufd: reconstruct device Steve Sistare
2025-05-16 10:22   ` Duan, Zhenzhong
2025-05-19 15:53     ` Steven Sistare
2025-05-20  9:14       ` Duan, Zhenzhong
2025-05-21 18:38   ` Steven Sistare
2025-05-12 15:32 ` [PATCH V3 38/42] vfio/iommufd: reconstruct hw_caps Steve Sistare
2025-05-21 19:59   ` Steven Sistare
2025-05-12 15:32 ` [PATCH V3 39/42] vfio/iommufd: reconstruct hwpt Steve Sistare
2025-05-19  3:25   ` Duan, Zhenzhong
2025-05-19 15:53     ` Steven Sistare
2025-05-20  9:16       ` Duan, Zhenzhong
2025-05-21 17:40         ` Steven Sistare
2025-05-12 15:32 ` [PATCH V3 40/42] vfio/iommufd: change process Steve Sistare
2025-05-12 15:32 ` [PATCH V3 41/42] iommufd: preserve DMA mappings Steve Sistare
2025-05-12 15:32 ` [PATCH V3 42/42] vfio/container: delete old cpr register Steve Sistare
2025-05-16 16:37 ` [PATCH V3 00/42] Live update: vfio and iommufd Cédric Le Goater
2025-05-16 17:17   ` Steven Sistare
2025-05-16 19:48     ` Steven Sistare
2025-05-19  8:54       ` Cédric Le Goater

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=1747063973-124548-10-git-send-email-steven.sistare@oracle.com \
    --to=steven.sistare@oracle.com \
    --cc=alex.williamson@redhat.com \
    --cc=clg@redhat.com \
    --cc=eric.auger@redhat.com \
    --cc=farosas@suse.de \
    --cc=marcel.apfelbaum@gmail.com \
    --cc=mst@redhat.com \
    --cc=peterx@redhat.com \
    --cc=qemu-devel@nongnu.org \
    --cc=yi.l.liu@intel.com \
    --cc=zhenzhong.duan@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).