From: Eric Auger <eric.auger@redhat.com>
To: eric.auger.pro@gmail.com, eric.auger@redhat.com,
qemu-devel@nongnu.org, qemu-arm@nongnu.org,
peter.maydell@linaro.org, mst@redhat.com, armbru@redhat.com,
jean-philippe.brucker@arm.com, bharatb.linux@gmail.com,
yang.zhong@intel.com, dgilbert@redhat.com, quintela@redhat.com
Cc: kevin.tian@intel.com, peterx@redhat.com, tnowicki@marvell.com
Subject: [PATCH for-5.0 v11 18/20] virtio-iommu: Support migration
Date: Fri, 22 Nov 2019 19:29:41 +0100 [thread overview]
Message-ID: <20191122182943.4656-19-eric.auger@redhat.com> (raw)
In-Reply-To: <20191122182943.4656-1-eric.auger@redhat.com>
Add Migration support. We rely on recently added gtree and qlist
migration. Besides, we have to fixup end point <-> domain link.
Indeed each domain has a list of endpoints attached to it. And each
endpoint has a pointer to its domain.
Raw gtree and qlist migration cannot handle this as it re-allocates
all the nodes while reconstructing the trees/lists.
So in post_load we re-construct the relationship between endpoints
and domains.
Signed-off-by: Eric Auger <eric.auger@redhat.com>
---
hw/virtio/virtio-iommu.c | 127 ++++++++++++++++++++++++++++++++++++---
1 file changed, 117 insertions(+), 10 deletions(-)
diff --git a/hw/virtio/virtio-iommu.c b/hw/virtio/virtio-iommu.c
index c5b202fab7..4e92fc0c95 100644
--- a/hw/virtio/virtio-iommu.c
+++ b/hw/virtio/virtio-iommu.c
@@ -692,16 +692,6 @@ static void virtio_iommu_set_features(VirtIODevice *vdev, uint64_t val)
trace_virtio_iommu_set_features(dev->acked_features);
}
-/*
- * Migration is not yet supported: most of the state consists
- * of balanced binary trees which are not yet ready for getting
- * migrated
- */
-static const VMStateDescription vmstate_virtio_iommu_device = {
- .name = "virtio-iommu-device",
- .unmigratable = 1,
-};
-
static gint int_cmp(gconstpointer a, gconstpointer b, gpointer user_data)
{
uint ua = GPOINTER_TO_UINT(a);
@@ -778,6 +768,123 @@ static void virtio_iommu_instance_init(Object *obj)
{
}
+#define VMSTATE_INTERVAL \
+{ \
+ .name = "interval", \
+ .version_id = 1, \
+ .minimum_version_id = 1, \
+ .fields = (VMStateField[]) { \
+ VMSTATE_UINT64(low, viommu_interval), \
+ VMSTATE_UINT64(high, viommu_interval), \
+ VMSTATE_END_OF_LIST() \
+ } \
+}
+
+#define VMSTATE_MAPPING \
+{ \
+ .name = "mapping", \
+ .version_id = 1, \
+ .minimum_version_id = 1, \
+ .fields = (VMStateField[]) { \
+ VMSTATE_UINT64(phys_addr, viommu_mapping), \
+ VMSTATE_UINT32(flags, viommu_mapping), \
+ VMSTATE_END_OF_LIST() \
+ }, \
+}
+
+static const VMStateDescription vmstate_interval_mapping[2] = {
+ VMSTATE_MAPPING, /* value */
+ VMSTATE_INTERVAL /* key */
+};
+
+static int domain_preload(void *opaque)
+{
+ viommu_domain *domain = opaque;
+
+ domain->mappings = g_tree_new_full((GCompareDataFunc)interval_cmp,
+ NULL, g_free, g_free);
+ return 0;
+}
+
+static const VMStateDescription vmstate_endpoint = {
+ .name = "endpoint",
+ .version_id = 1,
+ .minimum_version_id = 1,
+ .fields = (VMStateField[]) {
+ VMSTATE_UINT32(id, viommu_endpoint),
+ VMSTATE_END_OF_LIST()
+ }
+};
+
+static const VMStateDescription vmstate_domain = {
+ .name = "domain",
+ .version_id = 1,
+ .minimum_version_id = 1,
+ .pre_load = domain_preload,
+ .fields = (VMStateField[]) {
+ VMSTATE_UINT32(id, viommu_domain),
+ VMSTATE_GTREE_V(mappings, viommu_domain, 1,
+ vmstate_interval_mapping,
+ viommu_interval, viommu_mapping),
+ VMSTATE_QLIST_V(endpoint_list, viommu_domain, 1,
+ vmstate_endpoint, viommu_endpoint, next),
+ VMSTATE_END_OF_LIST()
+ }
+};
+
+static gboolean reconstruct_ep_domain_link(gpointer key, gpointer value,
+ gpointer data)
+{
+ viommu_domain *d = (viommu_domain *)value;
+ viommu_endpoint *iter, *tmp;
+ viommu_endpoint *ep = (viommu_endpoint *)data;
+
+ QLIST_FOREACH_SAFE(iter, &d->endpoint_list, next, tmp) {
+ if (iter->id == ep->id) {
+ /* remove the ep */
+ QLIST_REMOVE(iter, next);
+ g_free(iter);
+ /* replace it with the good one */
+ QLIST_INSERT_HEAD(&d->endpoint_list, ep, next);
+ /* update the domain */
+ ep->domain = d;
+ return true; /* stop the search */
+ }
+ }
+ return false; /* continue the traversal */
+}
+
+static gboolean fix_endpoint(gpointer key, gpointer value, gpointer data)
+{
+ VirtIOIOMMU *s = (VirtIOIOMMU *)data;
+
+ g_tree_foreach(s->domains, reconstruct_ep_domain_link, value);
+ return false;
+}
+
+static int iommu_post_load(void *opaque, int version_id)
+{
+ VirtIOIOMMU *s = opaque;
+
+ g_tree_foreach(s->endpoints, fix_endpoint, s);
+ return 0;
+}
+
+static const VMStateDescription vmstate_virtio_iommu_device = {
+ .name = "virtio-iommu-device",
+ .minimum_version_id = 1,
+ .version_id = 1,
+ .post_load = iommu_post_load,
+ .fields = (VMStateField[]) {
+ VMSTATE_GTREE_DIRECT_KEY_V(domains, VirtIOIOMMU, 1,
+ &vmstate_domain, viommu_domain),
+ VMSTATE_GTREE_DIRECT_KEY_V(endpoints, VirtIOIOMMU, 1,
+ &vmstate_endpoint, viommu_endpoint),
+ VMSTATE_END_OF_LIST()
+ },
+};
+
+
static const VMStateDescription vmstate_virtio_iommu = {
.name = "virtio-iommu",
.minimum_version_id = 1,
--
2.20.1
next prev parent reply other threads:[~2019-11-22 18:52 UTC|newest]
Thread overview: 89+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-22 18:29 [PATCH for-5.0 v11 00/20] VIRTIO-IOMMU device Eric Auger
2019-11-22 18:29 ` [PATCH for-5.0 v11 01/20] migration: Support QLIST migration Eric Auger
2019-11-27 11:46 ` Dr. David Alan Gilbert
2020-01-08 13:19 ` Juan Quintela
2020-01-08 13:40 ` Auger Eric
2020-01-08 13:51 ` Juan Quintela
2020-01-08 14:02 ` Auger Eric
2019-11-22 18:29 ` [PATCH for-5.0 v11 02/20] virtio-iommu: Add skeleton Eric Auger
2019-12-10 16:31 ` Jean-Philippe Brucker
2019-12-19 10:31 ` Auger Eric
2019-11-22 18:29 ` [PATCH for-5.0 v11 03/20] virtio-iommu: Decode the command payload Eric Auger
2019-12-10 16:32 ` Jean-Philippe Brucker
2019-12-10 19:14 ` Peter Xu
2019-11-22 18:29 ` [PATCH for-5.0 v11 04/20] virtio-iommu: Add the iommu regions Eric Auger
2019-12-10 16:34 ` Jean-Philippe Brucker
2019-12-19 18:11 ` Auger Eric
2019-12-10 19:18 ` Peter Xu
2019-11-22 18:29 ` [PATCH for-5.0 v11 05/20] virtio-iommu: Endpoint and domains structs and helpers Eric Auger
2019-12-10 16:37 ` Jean-Philippe Brucker
2019-12-19 18:31 ` Auger Eric
2019-12-20 17:00 ` Jean-Philippe Brucker
2019-12-23 9:11 ` Auger Eric
2019-11-22 18:29 ` [PATCH for-5.0 v11 06/20] virtio-iommu: Implement attach/detach command Eric Auger
2019-12-10 16:41 ` Jean-Philippe Brucker
2019-12-23 9:14 ` Auger Eric
2019-11-22 18:29 ` [PATCH for-5.0 v11 07/20] virtio-iommu: Implement map/unmap Eric Auger
2019-12-10 16:43 ` Jean-Philippe Brucker
2019-12-23 9:42 ` Auger Eric
2019-11-22 18:29 ` [PATCH for-5.0 v11 08/20] virtio-iommu: Implement translate Eric Auger
2019-12-10 16:43 ` Jean-Philippe Brucker
2019-12-10 19:33 ` Peter Xu
2019-12-19 10:30 ` Auger Eric
2019-12-19 13:33 ` Peter Xu
2019-12-19 14:38 ` Auger Eric
2019-12-19 14:49 ` Peter Xu
2019-12-19 15:09 ` Auger Eric
2019-12-20 16:26 ` Jean-Philippe Brucker
2019-12-20 16:51 ` Peter Xu
2020-01-06 17:06 ` Jean-Philippe Brucker
2020-01-06 17:58 ` Peter Xu
2020-01-07 10:10 ` Jean-Philippe Brucker
2020-01-08 16:55 ` Auger Eric
2020-01-09 8:47 ` Jean-Philippe Brucker
2020-01-09 8:58 ` Auger Eric
2020-01-09 10:40 ` Jean-Philippe Brucker
2020-01-09 11:01 ` Auger Eric
2020-01-09 11:15 ` Jean-Philippe Brucker
2020-01-09 11:32 ` Auger Eric
2019-11-22 18:29 ` [PATCH for-5.0 v11 09/20] virtio-iommu: Implement fault reporting Eric Auger
2019-12-10 16:44 ` Jean-Philippe Brucker
2019-11-22 18:29 ` [PATCH for-5.0 v11 10/20] virtio-iommu-pci: Add virtio iommu pci support Eric Auger
2019-12-10 16:44 ` Jean-Philippe Brucker
2019-11-22 18:29 ` [PATCH for-5.0 v11 11/20] hw/arm/virt: Add the virtio-iommu device tree mappings Eric Auger
2019-12-10 16:45 ` Jean-Philippe Brucker
2019-11-22 18:29 ` [PATCH for-5.0 v11 12/20] qapi: Introduce DEFINE_PROP_INTERVAL Eric Auger
2019-11-22 19:03 ` Dr. David Alan Gilbert
2019-11-25 13:12 ` Auger Eric
2019-12-12 12:17 ` Markus Armbruster
2019-12-12 15:13 ` Auger Eric
2019-12-13 10:03 ` Markus Armbruster
2019-11-22 18:29 ` [PATCH for-5.0 v11 13/20] virtio-iommu: Implement probe request Eric Auger
2019-12-10 16:46 ` Jean-Philippe Brucker
2019-12-10 19:36 ` Peter Xu
2019-11-22 18:29 ` [PATCH for-5.0 v11 14/20] virtio-iommu: Handle reserved regions in the translation process Eric Auger
2019-12-10 16:46 ` Jean-Philippe Brucker
2019-12-10 19:39 ` Peter Xu
2019-11-22 18:29 ` [PATCH for-5.0 v11 15/20] virtio-iommu-pci: Add array of Interval properties Eric Auger
2019-12-10 16:47 ` Jean-Philippe Brucker
2019-11-22 18:29 ` [PATCH for-5.0 v11 16/20] hw/arm/virt-acpi-build: Introduce fill_iort_idmap helper Eric Auger
2019-12-10 16:47 ` Jean-Philippe Brucker
2019-11-22 18:29 ` [PATCH for-5.0 v11 17/20] hw/arm/virt-acpi-build: Add virtio-iommu node in IORT table Eric Auger
2019-12-10 16:48 ` Jean-Philippe Brucker
2019-11-22 18:29 ` Eric Auger [this message]
2019-11-27 12:06 ` [PATCH for-5.0 v11 18/20] virtio-iommu: Support migration Dr. David Alan Gilbert
2019-12-10 16:50 ` Jean-Philippe Brucker
2019-12-19 11:03 ` Auger Eric
2019-12-10 20:01 ` Peter Xu
2019-12-24 7:39 ` Auger Eric
2019-11-22 18:29 ` [PATCH for-5.0 v11 19/20] pc: Add support for virtio-iommu-pci Eric Auger
2019-12-10 16:50 ` Jean-Philippe Brucker
2019-12-24 7:39 ` Auger Eric
2020-01-09 12:02 ` Michael S. Tsirkin
2020-01-09 13:34 ` Auger Eric
2019-11-22 18:29 ` [PATCH for-5.0 v11 20/20] tests: Add virtio-iommu test Eric Auger
2019-11-22 21:56 ` [PATCH for-5.0 v11 00/20] VIRTIO-IOMMU device no-reply
2019-12-11 16:40 ` Michael S. Tsirkin
2019-12-11 16:48 ` Auger Eric
2019-12-11 20:40 ` Michael S. Tsirkin
2019-12-12 15:05 ` Auger Eric
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=20191122182943.4656-19-eric.auger@redhat.com \
--to=eric.auger@redhat.com \
--cc=armbru@redhat.com \
--cc=bharatb.linux@gmail.com \
--cc=dgilbert@redhat.com \
--cc=eric.auger.pro@gmail.com \
--cc=jean-philippe.brucker@arm.com \
--cc=kevin.tian@intel.com \
--cc=mst@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=peterx@redhat.com \
--cc=qemu-arm@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=quintela@redhat.com \
--cc=tnowicki@marvell.com \
--cc=yang.zhong@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).