qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Steve Sistare <steven.sistare@oracle.com>
To: qemu-devel@nongnu.org
Cc: Yi Liu <yi.l.liu@intel.com>, Eric Auger <eric.auger@redhat.com>,
	Zhenzhong Duan <zhenzhong.duan@intel.com>,
	Alex Williamson <alex.williamson@redhat.com>,
	Cedric Le Goater <clg@redhat.com>,
	"Michael S. Tsirkin" <mst@redhat.com>,
	Peter Xu <peterx@redhat.com>, Fabiano Rosas <farosas@suse.de>,
	Philippe Mathieu-Daude <philmd@linaro.org>,
	David Hildenbrand <david@redhat.com>,
	Steve Sistare <steven.sistare@oracle.com>
Subject: [RFC V1 11/12] iommufd: update DMA virtual addresses
Date: Sat, 20 Jul 2024 12:15:36 -0700	[thread overview]
Message-ID: <1721502937-87102-12-git-send-email-steven.sistare@oracle.com> (raw)
In-Reply-To: <1721502937-87102-1-git-send-email-steven.sistare@oracle.com>

Register a vmstate post_load handler to call IOMMU_IOAS_CHANGE_PROCESS and
update the virtual address of all DMA mappings after CPR.

Signed-off-by: Steve Sistare <steven.sistare@oracle.com>
---
 backends/iommufd.c | 81 +++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 80 insertions(+), 1 deletion(-)

diff --git a/backends/iommufd.c b/backends/iommufd.c
index 86fd9db..2e72b6f 100644
--- a/backends/iommufd.c
+++ b/backends/iommufd.c
@@ -17,7 +17,9 @@
 #include "qom/object_interfaces.h"
 #include "qemu/error-report.h"
 #include "migration/cpr.h"
+#include "migration/vmstate.h"
 #include "monitor/monitor.h"
+#include "exec/ramblock.h"
 #include "trace.h"
 #include <sys/ioctl.h>
 #include <linux/iommufd.h>
@@ -81,6 +83,83 @@ bool iommufd_change_process_capable(IOMMUFDBackend *be)
     return (errno != ENOTTY);
 }
 
+static int iommufd_change_process(IOMMUFDBackend *be,
+                                 struct iommu_ioas_change_process *args)
+{
+    int ret, fd = be->fd;
+
+    ret = ioctl(fd, IOMMU_IOAS_CHANGE_PROCESS, args);
+    if (ret) {
+        ret = -errno;
+        error_report("IOMMU_IOAS_CHANGE_PROCESS failed: %m");
+    }
+    return ret;
+}
+
+static int count_umap(RAMBlock *rb, void *opaque)
+{
+    if (qemu_ram_is_migratable(rb)) {
+        (*(int *)opaque)++;
+    }
+    return 0;
+}
+
+static int fill_umap(RAMBlock *rb, void *opaque)
+{
+    if (qemu_ram_is_migratable(rb)) {
+        struct iommu_ioas_change_process *args = opaque;
+        struct iommu_ioas_userspace_map *umap = (void *)args->umap;
+        int i = args->n_umap++;
+
+        assert(rb->host_old && rb->host);
+        umap[i].addr_old = (__u64)rb->host_old;
+        umap[i].addr_new = (__u64)rb->host;
+        umap[i].size = rb->max_length;
+    }
+    return 0;
+}
+
+static int cmp_umap(const void *elem1, const void *elem2)
+{
+    const struct iommu_ioas_userspace_map *e1 = elem1;
+    const struct iommu_ioas_userspace_map *e2 = elem2;
+
+    return (e1->addr_old < e2->addr_old) ? -1 :
+           (e1->addr_old > e2->addr_old);
+}
+
+static int iommufd_cpr_post_load(void *opaque, int version_id)
+{
+    IOMMUFDBackend *be = opaque;
+    struct iommu_ioas_change_process args = {
+        .size = sizeof(args),
+        .flags = 0,
+        .n_umap = 0,
+        .umap = 0,
+    };
+    int n = 0;
+    g_autofree struct iommu_ioas_userspace_map *umap = NULL;
+
+    RCU_READ_LOCK_GUARD();
+    qemu_ram_foreach_block(count_umap, &n);
+    umap = g_malloc_n(n, sizeof(*umap));
+    args.umap = (__u64)umap;
+    qemu_ram_foreach_block(fill_umap, &args);
+    qsort(umap, args.n_umap, sizeof(*umap), cmp_umap);
+    return iommufd_change_process(be, &args);
+}
+
+static const VMStateDescription iommufd_cpr_vmstate = {
+    .name = "iommufd",
+    .version_id = 0,
+    .minimum_version_id = 0,
+    .post_load = iommufd_cpr_post_load,
+    .needed = cpr_needed_for_reuse,
+    .fields = (VMStateField[]) {
+        VMSTATE_END_OF_LIST()
+    }
+};
+
 bool iommufd_backend_connect(IOMMUFDBackend *be, const char *name, Error **errp)
 {
     int fd;
@@ -100,7 +179,7 @@ bool iommufd_backend_connect(IOMMUFDBackend *be, const char *name, Error **errp)
         be->fd = fd;
     }
     be->users++;
-
+    vmstate_register(NULL, -1, &iommufd_cpr_vmstate, be);
     trace_iommufd_backend_connect(be->fd, be->owned, be->users);
     return true;
 }
-- 
1.8.3.1



  parent reply	other threads:[~2024-07-20 19:18 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-07-20 19:15 [RFC V1 00/12] Live update: iommufd Steve Sistare
2024-07-20 19:15 ` [RFC V1 01/12] vfio: move cpr_exec_notifier Steve Sistare
2024-07-20 19:15 ` [RFC V1 02/12] iommufd: no DMA to BARs Steve Sistare
2024-08-12 22:05   ` Alex Williamson
2024-08-13  1:39   ` Yi Liu
2024-08-13 14:53     ` Steven Sistare
2024-07-20 19:15 ` [RFC V1 03/12] iommufd: pass name to connect Steve Sistare
2024-07-20 19:15 ` [RFC V1 04/12] migration: cpr_find_fd_any Steve Sistare
2024-07-20 19:15 ` [RFC V1 05/12] iommufd: preserve device fd Steve Sistare
2024-07-20 19:15 ` [RFC V1 06/12] iommufd: export iommufd_cdev_get_info_iova_range Steve Sistare
2024-07-20 19:15 ` [RFC V1 07/12] iommufd: change_process kernel interface Steve Sistare
2024-07-20 19:15 ` [RFC V1 08/12] vfio/iommufd: register container for cpr Steve Sistare
2024-07-20 19:15 ` [RFC V1 09/12] vfio/iommufd: rebuild device Steve Sistare
2024-07-20 19:15 ` [RFC V1 10/12] migration/ram: old host address Steve Sistare
2024-08-16 17:57   ` Fabiano Rosas
2024-08-16 18:13     ` Steven Sistare
2024-07-20 19:15 ` Steve Sistare [this message]
2024-07-20 19:15 ` [RFC V1 12/12] vfio: mdev blocker Steve Sistare

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=1721502937-87102-12-git-send-email-steven.sistare@oracle.com \
    --to=steven.sistare@oracle.com \
    --cc=alex.williamson@redhat.com \
    --cc=clg@redhat.com \
    --cc=david@redhat.com \
    --cc=eric.auger@redhat.com \
    --cc=farosas@suse.de \
    --cc=mst@redhat.com \
    --cc=peterx@redhat.com \
    --cc=philmd@linaro.org \
    --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).