From patchwork Fri Nov 22 18:29:41 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Auger X-Patchwork-Id: 11258305 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id F01F9930 for ; Fri, 22 Nov 2019 18:52:27 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id C349F2067D for ; Fri, 22 Nov 2019 18:52:27 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="N60b60Em" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C349F2067D Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:54326 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iYE2c-0006js-FH for patchwork-qemu-devel@patchwork.kernel.org; Fri, 22 Nov 2019 13:52:26 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:40221) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iYDj2-0001eZ-IV for qemu-devel@nongnu.org; Fri, 22 Nov 2019 13:32:14 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iYDj1-0000hy-6T for qemu-devel@nongnu.org; Fri, 22 Nov 2019 13:32:12 -0500 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:46222 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iYDj1-0000h8-1u for qemu-devel@nongnu.org; Fri, 22 Nov 2019 13:32:11 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1574447530; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=mfZYIw3UEsPwHAATMfS141k0p6DtF7ITPQOxirCtQ/o=; b=N60b60Em4NjMiqzXOTPHqGA36wwda+WJ+zH4byA4Wi4bcTY+ybcLb5GaYo9e1tUOqw+XMD 98vChgp9hCF4kBaLJuCdc9yHqUDemS6RxU7PPauhrtXwt4MEd+IN+b61rzhxftf2nyrZ2+ ls4SkvKev9CNpmEc/q2J1MmwQPWoJ0w= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-213-gO6uWk4uOd2yIJgV7sIkWw-1; Fri, 22 Nov 2019 13:32:09 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id BBE18DB60; Fri, 22 Nov 2019 18:32:07 +0000 (UTC) Received: from laptop.redhat.com (ovpn-116-37.ams2.redhat.com [10.36.116.37]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6225361074; Fri, 22 Nov 2019 18:32:04 +0000 (UTC) From: Eric Auger 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 Subject: [PATCH for-5.0 v11 18/20] virtio-iommu: Support migration Date: Fri, 22 Nov 2019 19:29:41 +0100 Message-Id: <20191122182943.4656-19-eric.auger@redhat.com> In-Reply-To: <20191122182943.4656-1-eric.auger@redhat.com> References: <20191122182943.4656-1-eric.auger@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-MC-Unique: gO6uWk4uOd2yIJgV7sIkWw-1 X-Mimecast-Spam-Score: 0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 207.211.31.120 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kevin.tian@intel.com, peterx@redhat.com, tnowicki@marvell.com Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" 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 Acked-by: Dr. David Alan Gilbert Reviewed-by: Jean-Philippe Brucker --- 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,