From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.1 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 600DFC43331 for ; Thu, 26 Mar 2020 17:53:16 +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 2A4662070A for ; Thu, 26 Mar 2020 17:53:16 +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="VyBKoeYv" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 2A4662070A 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+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:57192 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jHWgt-00062b-Bu for qemu-devel@archiver.kernel.org; Thu, 26 Mar 2020 13:53:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44569) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jHWfz-0005Be-19 for qemu-devel@nongnu.org; Thu, 26 Mar 2020 13:52:20 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jHWfx-0000Nd-F8 for qemu-devel@nongnu.org; Thu, 26 Mar 2020 13:52:18 -0400 Received: from us-smtp-delivery-74.mimecast.com ([216.205.24.74]:33836) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1jHWfx-0000NW-Aj for qemu-devel@nongnu.org; Thu, 26 Mar 2020 13:52:17 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1585245136; 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=GtZ5eB4GqDq3rr9nbE8wp0mqB+medFwHDcVbI1TtPNI=; b=VyBKoeYvvWbVSbBtiyC1iLEIJw7u9gw6a6IcEJurrozD/MRojT4gsN9jZoW+NrBM6JlObM 5MZgpXPojYpcl9BlXjBNjmCrtxMEcfiHJ9MTHUxx7qvXngG56N7VEP8udgGq6eusFoxj5y lWmW0I4mECk9G+JStp79T1Lj16Suw88= 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-311-8GmMWDyHN9SNKOZGKQXi0A-1; Thu, 26 Mar 2020 13:52:14 -0400 X-MC-Unique: 8GmMWDyHN9SNKOZGKQXi0A-1 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 260E81405; Thu, 26 Mar 2020 17:52:12 +0000 (UTC) Received: from work-vm (ovpn-114-228.ams2.redhat.com [10.36.114.228]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 23FB210027AC; Thu, 26 Mar 2020 17:52:04 +0000 (UTC) Date: Thu, 26 Mar 2020 17:52:02 +0000 From: "Dr. David Alan Gilbert" To: Kirti Wankhede Subject: Re: [PATCH v16 QEMU 05/16] vfio: Add migration region initialization and finalize function Message-ID: <20200326175202.GH2713@work-vm> References: <1585084154-29461-1-git-send-email-kwankhede@nvidia.com> <1585084154-29461-6-git-send-email-kwankhede@nvidia.com> MIME-Version: 1.0 In-Reply-To: <1585084154-29461-6-git-send-email-kwankhede@nvidia.com> User-Agent: Mutt/1.13.3 (2020-01-12) X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: quoted-printable Content-Disposition: inline X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 216.205.24.74 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: Zhengxiao.zx@alibaba-inc.com, kevin.tian@intel.com, yi.l.liu@intel.com, cjia@nvidia.com, eskultet@redhat.com, ziye.yang@intel.com, cohuck@redhat.com, shuangtai.tst@alibaba-inc.com, qemu-devel@nongnu.org, zhi.a.wang@intel.com, mlevitsk@redhat.com, pasic@linux.ibm.com, aik@ozlabs.ru, alex.williamson@redhat.com, eauger@redhat.com, felipe@nutanix.com, jonathan.davies@nutanix.com, yan.y.zhao@intel.com, changpeng.liu@intel.com, Ken.Xue@amd.com Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" * Kirti Wankhede (kwankhede@nvidia.com) wrote: > - Migration functions are implemented for VFIO_DEVICE_TYPE_PCI device in = this > patch series. > - VFIO device supports migration or not is decided based of migration reg= ion > query. If migration region query is successful and migration region > initialization is successful then migration is supported else migration= is > blocked. >=20 > Signed-off-by: Kirti Wankhede > Reviewed-by: Neo Jia > --- > hw/vfio/Makefile.objs | 2 +- > hw/vfio/migration.c | 138 ++++++++++++++++++++++++++++++++++++= ++++++ > hw/vfio/trace-events | 3 + > include/hw/vfio/vfio-common.h | 9 +++ > 4 files changed, 151 insertions(+), 1 deletion(-) > create mode 100644 hw/vfio/migration.c >=20 > diff --git a/hw/vfio/Makefile.objs b/hw/vfio/Makefile.objs > index 9bb1c09e8477..8b296c889ed9 100644 > --- a/hw/vfio/Makefile.objs > +++ b/hw/vfio/Makefile.objs > @@ -1,4 +1,4 @@ > -obj-y +=3D common.o spapr.o > +obj-y +=3D common.o spapr.o migration.o > obj-$(CONFIG_VFIO_PCI) +=3D pci.o pci-quirks.o display.o > obj-$(CONFIG_VFIO_CCW) +=3D ccw.o > obj-$(CONFIG_VFIO_PLATFORM) +=3D platform.o > diff --git a/hw/vfio/migration.c b/hw/vfio/migration.c > new file mode 100644 > index 000000000000..a078dcf1dd8f > --- /dev/null > +++ b/hw/vfio/migration.c > @@ -0,0 +1,138 @@ > +/* > + * Migration support for VFIO devices > + * > + * Copyright NVIDIA, Inc. 2019 Time flies by... > + * > + * This work is licensed under the terms of the GNU GPL, version 2. See > + * the COPYING file in the top-level directory. Are you sure you want this to be V2 only? Most code added to qemu now is v2 or later. > + */ > + > +#include "qemu/osdep.h" > +#include > + > +#include "hw/vfio/vfio-common.h" > +#include "cpu.h" > +#include "migration/migration.h" > +#include "migration/qemu-file.h" > +#include "migration/register.h" > +#include "migration/blocker.h" > +#include "migration/misc.h" > +#include "qapi/error.h" > +#include "exec/ramlist.h" > +#include "exec/ram_addr.h" > +#include "pci.h" > +#include "trace.h" > + > +static void vfio_migration_region_exit(VFIODevice *vbasedev) > +{ > + VFIOMigration *migration =3D vbasedev->migration; > + > + if (!migration) { > + return; > + } > + > + if (migration->region.size) { > + vfio_region_exit(&migration->region); > + vfio_region_finalize(&migration->region); > + } > +} > + > +static int vfio_migration_region_init(VFIODevice *vbasedev, int index) > +{ > + VFIOMigration *migration =3D vbasedev->migration; > + Object *obj =3D NULL; > + int ret =3D -EINVAL; > + > + if (!vbasedev->ops->vfio_get_object) { > + return ret; > + } > + > + obj =3D vbasedev->ops->vfio_get_object(vbasedev); > + if (!obj) { > + return ret; > + } > + > + ret =3D vfio_region_setup(obj, vbasedev, &migration->region, index, > + "migration"); > + if (ret) { > + error_report("%s: Failed to setup VFIO migration region %d: %s", > + vbasedev->name, index, strerror(-ret)); > + goto err; > + } > + > + if (!migration->region.size) { > + ret =3D -EINVAL; > + error_report("%s: Invalid region size of VFIO migration region %= d: %s", > + vbasedev->name, index, strerror(-ret)); > + goto err; > + } > + > + return 0; > + > +err: > + vfio_migration_region_exit(vbasedev); > + return ret; > +} > + > +static int vfio_migration_init(VFIODevice *vbasedev, > + struct vfio_region_info *info) > +{ > + int ret; > + > + vbasedev->migration =3D g_new0(VFIOMigration, 1); > + > + ret =3D vfio_migration_region_init(vbasedev, info->index); > + if (ret) { > + error_report("%s: Failed to initialise migration region", > + vbasedev->name); > + g_free(vbasedev->migration); > + vbasedev->migration =3D NULL; > + return ret; > + } > + > + return 0; > +} > + > +/* ---------------------------------------------------------------------= - */ > + > +int vfio_migration_probe(VFIODevice *vbasedev, Error **errp) > +{ > + struct vfio_region_info *info; > + Error *local_err =3D NULL; > + int ret; > + > + ret =3D vfio_get_dev_region_info(vbasedev, VFIO_REGION_TYPE_MIGRATIO= N, > + VFIO_REGION_SUBTYPE_MIGRATION, &info)= ; > + if (ret) { > + goto add_blocker; > + } > + > + ret =3D vfio_migration_init(vbasedev, info); > + if (ret) { > + goto add_blocker; > + } > + > + trace_vfio_migration_probe(vbasedev->name, info->index); > + return 0; > + > +add_blocker: > + error_setg(&vbasedev->migration_blocker, > + "VFIO device doesn't support migration"); > + ret =3D migrate_add_blocker(vbasedev->migration_blocker, &local_err)= ; > + if (local_err) { > + error_propagate(errp, local_err); > + error_free(vbasedev->migration_blocker); > + } > + return ret; > +} > + > +void vfio_migration_finalize(VFIODevice *vbasedev) > +{ > + if (vbasedev->migration_blocker) { > + migrate_del_blocker(vbasedev->migration_blocker); > + error_free(vbasedev->migration_blocker); > + } > + > + vfio_migration_region_exit(vbasedev); > + g_free(vbasedev->migration); > +} > diff --git a/hw/vfio/trace-events b/hw/vfio/trace-events > index 8cdc27946cb8..191a726a1312 100644 > --- a/hw/vfio/trace-events > +++ b/hw/vfio/trace-events > @@ -143,3 +143,6 @@ vfio_display_edid_link_up(void) "" > vfio_display_edid_link_down(void) "" > vfio_display_edid_update(uint32_t prefx, uint32_t prefy) "%ux%u" > vfio_display_edid_write_error(void) "" > + > +# migration.c > +vfio_migration_probe(char *name, uint32_t index) " (%s) Region %d" > diff --git a/include/hw/vfio/vfio-common.h b/include/hw/vfio/vfio-common.= h > index d69a7f3ae31e..d4b268641173 100644 > --- a/include/hw/vfio/vfio-common.h > +++ b/include/hw/vfio/vfio-common.h > @@ -57,6 +57,10 @@ typedef struct VFIORegion { > uint8_t nr; /* cache the region number for debug */ > } VFIORegion; > =20 > +typedef struct VFIOMigration { > + VFIORegion region; > +} VFIOMigration; > + > typedef struct VFIOAddressSpace { > AddressSpace *as; > QLIST_HEAD(, VFIOContainer) containers; > @@ -113,6 +117,8 @@ typedef struct VFIODevice { > unsigned int num_irqs; > unsigned int num_regions; > unsigned int flags; > + VFIOMigration *migration; > + Error *migration_blocker; > } VFIODevice; > =20 > struct VFIODeviceOps { > @@ -204,4 +210,7 @@ int vfio_spapr_create_window(VFIOContainer *container= , > int vfio_spapr_remove_window(VFIOContainer *container, > hwaddr offset_within_address_space); > =20 > +int vfio_migration_probe(VFIODevice *vbasedev, Error **errp); > +void vfio_migration_finalize(VFIODevice *vbasedev); > + > #endif /* HW_VFIO_VFIO_COMMON_H */ > --=20 > 2.7.0 >=20 -- Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK