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 933E9C433E0 for ; Tue, 19 May 2020 19:33:44 +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 605132070A for ; Tue, 19 May 2020 19:33:44 +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="DKvG1gGS" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 605132070A 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]:35426 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jb7zj-00040J-G7 for qemu-devel@archiver.kernel.org; Tue, 19 May 2020 15:33:43 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54242) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jb7yv-00037H-IB for qemu-devel@nongnu.org; Tue, 19 May 2020 15:32:53 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:28446 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1jb7yu-0007y5-8Z for qemu-devel@nongnu.org; Tue, 19 May 2020 15:32:53 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1589916771; 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: in-reply-to:in-reply-to:references:references; bh=Xtws45HpYAAZrwdJudPsba3FeVLyHs/PHAgUQV3c0AE=; b=DKvG1gGSxo/yfv/2agj8aNLOHQZzpRJOcXYfDHOkFSkEnyuJxyvakLH6D1smSlm7tx1B3c +KjusWWTAhNjTqNkAhzz4Pra7wkIFndyWnPTt2bqHAHmXVIE6D/Zs1jGTzBaIaCF64bjry VSDu4ds2pIhqkQzWEfr4FGeZnZdaQT8= 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-308-9PDYbB0LMPeHdLjzf6H01Q-1; Tue, 19 May 2020 15:32:47 -0400 X-MC-Unique: 9PDYbB0LMPeHdLjzf6H01Q-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 1A8458005AA; Tue, 19 May 2020 19:32:45 +0000 (UTC) Received: from work-vm (ovpn-114-247.ams2.redhat.com [10.36.114.247]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 29C8D5C1D0; Tue, 19 May 2020 19:32:38 +0000 (UTC) Date: Tue, 19 May 2020 20:32:35 +0100 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: <20200519193235.GA20699@work-vm> References: <1585084154-29461-1-git-send-email-kwankhede@nvidia.com> <1585084154-29461-6-git-send-email-kwankhede@nvidia.com> <20200326175202.GH2713@work-vm> MIME-Version: 1.0 In-Reply-To: User-Agent: Mutt/1.13.4 (2020-02-15) X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Received-SPF: pass client-ip=205.139.110.120; envelope-from=dgilbert@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/05/18 23:56:10 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_PASS=-0.001, T_HK_NAME_DR=0.01, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN X-Spam_action: no action 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: > > > On 3/26/2020 11:22 PM, Dr. David Alan Gilbert wrote: > > * 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 region > > > query. If migration region query is successful and migration region > > > initialization is successful then migration is supported else migration is > > > blocked. > > > > > > 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 > > > > > > 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 += common.o spapr.o > > > +obj-y += common.o spapr.o migration.o > > > obj-$(CONFIG_VFIO_PCI) += pci.o pci-quirks.o display.o > > > obj-$(CONFIG_VFIO_CCW) += ccw.o > > > obj-$(CONFIG_VFIO_PLATFORM) += 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. > > > > I kept it same as in files vfio-pci and hw/vfio/common.c > > Should it be different? Can you give some reference what it should be? It's OK to be v2; there's a statement in LICENSE saying hw/vfio is acceptable for that; most other new code we try and make 'version 2 or later' - if you want it as 2 that is fine though. Dave > Thanks, > Kirti > > > > + */ > > > + > > > +#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 = 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 = vbasedev->migration; > > > + Object *obj = NULL; > > > + int ret = -EINVAL; > > > + > > > + if (!vbasedev->ops->vfio_get_object) { > > > + return ret; > > > + } > > > + > > > + obj = vbasedev->ops->vfio_get_object(vbasedev); > > > + if (!obj) { > > > + return ret; > > > + } > > > + > > > + ret = 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 = -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 = g_new0(VFIOMigration, 1); > > > + > > > + ret = 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 = NULL; > > > + return ret; > > > + } > > > + > > > + return 0; > > > +} > > > + > > > +/* ---------------------------------------------------------------------- */ > > > + > > > +int vfio_migration_probe(VFIODevice *vbasedev, Error **errp) > > > +{ > > > + struct vfio_region_info *info; > > > + Error *local_err = NULL; > > > + int ret; > > > + > > > + ret = vfio_get_dev_region_info(vbasedev, VFIO_REGION_TYPE_MIGRATION, > > > + VFIO_REGION_SUBTYPE_MIGRATION, &info); > > > + if (ret) { > > > + goto add_blocker; > > > + } > > > + > > > + ret = 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 = 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; > > > +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; > > > 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); > > > +int vfio_migration_probe(VFIODevice *vbasedev, Error **errp); > > > +void vfio_migration_finalize(VFIODevice *vbasedev); > > > + > > > #endif /* HW_VFIO_VFIO_COMMON_H */ > > > -- > > > 2.7.0 > > > > > -- > > Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK > > > -- Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK