From nobody Tue Feb 10 05:45:23 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass header.i=@intel.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1654692327; cv=none; d=zohomail.com; s=zohoarc; b=h93i5kbdk6tIxXNYHpR58qIQPLpAUffN7p3rDOvBAoDoGJ58yC6q05X6frGDRpzzoE6EetI2IurSMInRB0y6EAtOdl/LjzMkSd/IS5aQs83tcv68n2F31RP47wlzFF4+4IWCcQoKb8nfqBPkDPB/4oThqRFZKiz0R9zzioTuTJ4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1654692327; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=hipBqw66JC0QwxT72iXHuiQSOr1RoqZgcqn41UoA/es=; b=PDDzcwxRkfZrrfIaJdqYoOFTR6+jtmJtPBzcJnm6KJnFZqADkNETgnCDOSoPI1u8vAExp51cjRt0xUUq+DZaUJ6NCZVWQkfmHxvK4yrcLpw0vuGFH86dPfKf6OPNLe8X5+xjbJfVYKARcyj3GgyrdH/YxwJkg4wcnlKrT2mBZPo= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass header.i=@intel.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1654692327089430.8698477811454; Wed, 8 Jun 2022 05:45:27 -0700 (PDT) Received: from localhost ([::1]:45836 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nyv3t-0006rx-IE for importer@patchew.org; Wed, 08 Jun 2022 08:45:25 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58046) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nyuqw-0000WH-QL for qemu-devel@nongnu.org; Wed, 08 Jun 2022 08:32:02 -0400 Received: from mga05.intel.com ([192.55.52.43]:56952) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nyuqr-0005kl-I9 for qemu-devel@nongnu.org; Wed, 08 Jun 2022 08:32:02 -0400 Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Jun 2022 05:31:47 -0700 Received: from 984fee00a4c6.jf.intel.com ([10.165.58.231]) by FMSMGA003.fm.intel.com with ESMTP; 08 Jun 2022 05:31:46 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1654691517; x=1686227517; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=lifPEPAqd0/u6utnK71bM3OvcAqpE8N/lgs7hmF7yN4=; b=QJqP/85CiFD1IS17L/4kap2orbCkAsy62jo0b1RmhY+Xd5EBs4NrGyPx T8wmZWqqPY1Bcw99LArF2836ikz9/SwRD06Kwr5MrvN169b0R2MsgfDxq GjS5s09wXs5f3+Vvo+LSR+CsgeDlFJCbqBp9Twmref1jEWo0+qyrhloPI JbPmPeZStDHu3BOAnxpsKV1xlsDAGTgybyuy6HUoORa+jIJNEBlOg9Q/G EQkjzXaboE0HaM1nE+90EIMheXSecK/LCrhF6/txa0d13Ck2C0U7avK4D xS1TunPUHscLUPawNMobY2oHwfjgMgCYZasjpUYuWO5Iuin9W2wmFrH5S A==; X-IronPort-AV: E=McAfee;i="6400,9594,10371"; a="363210154" X-IronPort-AV: E=Sophos;i="5.91,286,1647327600"; d="scan'208";a="363210154" X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.91,286,1647327600"; d="scan'208";a="670529854" From: Yi Liu To: alex.williamson@redhat.com, cohuck@redhat.com, qemu-devel@nongnu.org Cc: david@gibson.dropbear.id.au, thuth@redhat.com, farman@linux.ibm.com, mjrosato@linux.ibm.com, akrowiak@linux.ibm.com, pasic@linux.ibm.com, jjherne@linux.ibm.com, jasowang@redhat.com, kvm@vger.kernel.org, jgg@nvidia.com, nicolinc@nvidia.com, eric.auger@redhat.com, eric.auger.pro@gmail.com, kevin.tian@intel.com, yi.l.liu@intel.com, chao.p.peng@intel.com, yi.y.sun@intel.com, peterx@redhat.com, shameerali.kolothum.thodi@huawei.com, zhangfei.gao@linaro.org, berrange@redhat.com Subject: [RFC v2 10/15] vfio/container-base: Introduce VFIOContainer reset callback Date: Wed, 8 Jun 2022 05:31:34 -0700 Message-Id: <20220608123139.19356-11-yi.l.liu@intel.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20220608123139.19356-1-yi.l.liu@intel.com> References: <20220608123139.19356-1-yi.l.liu@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=192.55.52.43; envelope-from=yi.l.liu@intel.com; helo=mga05.intel.com X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_MED=-2.3, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @intel.com) X-ZM-MESSAGEID: 1654692329250100001 Content-Type: text/plain; charset="utf-8" From: Eric Auger Reset implementation depends on the container backend. Let's introduce a VFIOContainer class function and register a generic reset handler that will be able to call the right reset function depending on the container type. Also, let's move the registration/unregistration to a place that is not backend-specific (first vfio address space created instead of the first group). Signed-off-by: Eric Auger Signed-off-by: Yi Liu --- hw/vfio/as.c | 18 ++++++++++++++++++ hw/vfio/container-base.c | 9 +++++++++ hw/vfio/container.c | 27 +++++++++++++++------------ include/hw/vfio/vfio-container-base.h | 2 ++ 4 files changed, 44 insertions(+), 12 deletions(-) diff --git a/hw/vfio/as.c b/hw/vfio/as.c index 2c83b8e1fe..1a3ceb5e62 100644 --- a/hw/vfio/as.c +++ b/hw/vfio/as.c @@ -872,6 +872,18 @@ const MemoryListener vfio_memory_listener =3D { .log_sync =3D vfio_listener_log_sync, }; =20 +void vfio_reset_handler(void *opaque) +{ + VFIOAddressSpace *space; + VFIOContainer *bcontainer; + + QLIST_FOREACH(space, &vfio_address_spaces, list) { + QLIST_FOREACH(bcontainer, &space->containers, next) { + vfio_container_reset(bcontainer); + } + } +} + VFIOAddressSpace *vfio_get_address_space(AddressSpace *as) { VFIOAddressSpace *space; @@ -887,6 +899,9 @@ VFIOAddressSpace *vfio_get_address_space(AddressSpace *= as) space->as =3D as; QLIST_INIT(&space->containers); =20 + if (QLIST_EMPTY(&vfio_address_spaces)) { + qemu_register_reset(vfio_reset_handler, NULL); + } QLIST_INSERT_HEAD(&vfio_address_spaces, space, list); =20 return space; @@ -898,6 +913,9 @@ void vfio_put_address_space(VFIOAddressSpace *space) QLIST_REMOVE(space, list); g_free(space); } + if (QLIST_EMPTY(&vfio_address_spaces)) { + qemu_unregister_reset(vfio_reset_handler, NULL); + } } =20 static const VFIOContainerOps * diff --git a/hw/vfio/container-base.c b/hw/vfio/container-base.c index 6aaf0e0faa..a9f28e4b9d 100644 --- a/hw/vfio/container-base.c +++ b/hw/vfio/container-base.c @@ -58,6 +58,15 @@ int vfio_container_dma_unmap(VFIOContainer *container, return container->ops->dma_unmap(container, iova, size, iotlb); } =20 +int vfio_container_reset(VFIOContainer *container) +{ + if (!container->ops->reset) { + return -ENOENT; + } + + return container->ops->reset(container); +} + void vfio_container_set_dirty_page_tracking(VFIOContainer *container, bool start) { diff --git a/hw/vfio/container.c b/hw/vfio/container.c index f303c08aa5..2d9704bc1a 100644 --- a/hw/vfio/container.c +++ b/hw/vfio/container.c @@ -465,12 +465,16 @@ vfio_legacy_container_del_section_window(VFIOContaine= r *bcontainer, } } =20 -void vfio_reset_handler(void *opaque) +static int vfio_legacy_container_reset(VFIOContainer *bcontainer) { + VFIOLegacyContainer *container =3D container_of(bcontainer, + VFIOLegacyContainer, + bcontainer); VFIOGroup *group; VFIODevice *vbasedev; + int ret, final_ret =3D 0; =20 - QLIST_FOREACH(group, &vfio_group_list, next) { + QLIST_FOREACH(group, &container->group_list, container_next) { QLIST_FOREACH(vbasedev, &group->device_list, next) { if (vbasedev->dev->realized) { vbasedev->ops->vfio_compute_needs_reset(vbasedev); @@ -478,13 +482,19 @@ void vfio_reset_handler(void *opaque) } } =20 - QLIST_FOREACH(group, &vfio_group_list, next) { + QLIST_FOREACH(group, &container->group_list, next) { QLIST_FOREACH(vbasedev, &group->device_list, next) { if (vbasedev->dev->realized && vbasedev->needs_reset) { - vbasedev->ops->vfio_hot_reset_multi(vbasedev); + ret =3D vbasedev->ops->vfio_hot_reset_multi(vbasedev); + if (ret) { + error_report("failed to reset %s (%d)", + vbasedev->name, ret); + final_ret =3D ret; + } } } } + return final_ret; } =20 static void vfio_kvm_device_add_group(VFIOGroup *group) @@ -1010,10 +1020,6 @@ static VFIOGroup *vfio_get_group(int groupid, Addres= sSpace *as, Error **errp) goto close_fd_exit; } =20 - if (QLIST_EMPTY(&vfio_group_list)) { - qemu_register_reset(vfio_reset_handler, NULL); - } - QLIST_INSERT_HEAD(&vfio_group_list, group, next); =20 return group; @@ -1042,10 +1048,6 @@ static void vfio_put_group(VFIOGroup *group) trace_vfio_put_group(group->fd); close(group->fd); g_free(group); - - if (QLIST_EMPTY(&vfio_group_list)) { - qemu_unregister_reset(vfio_reset_handler, NULL); - } } =20 static int vfio_get_device(VFIOGroup *group, const char *name, @@ -1295,6 +1297,7 @@ const VFIOContainerOps legacy_container_ops =3D { .add_window =3D vfio_legacy_container_add_section_window, .del_window =3D vfio_legacy_container_del_section_window, .check_extension =3D vfio_legacy_container_check_extension, + .reset =3D vfio_legacy_container_reset, .attach_device =3D legacy_attach_device, .detach_device =3D legacy_detach_device, }; diff --git a/include/hw/vfio/vfio-container-base.h b/include/hw/vfio/vfio-c= ontainer-base.h index 71df8743fb..f9fb8b6af7 100644 --- a/include/hw/vfio/vfio-container-base.h +++ b/include/hw/vfio/vfio-container-base.h @@ -78,6 +78,7 @@ typedef struct VFIOContainerOps { int (*dma_unmap)(VFIOContainer *container, hwaddr iova, ram_addr_t size, IOMMUTLBEntry *iotlb); + int (*reset)(VFIOContainer *container); /* migration feature */ bool (*devices_all_dirty_tracking)(VFIOContainer *container); void (*set_dirty_page_tracking)(VFIOContainer *container, bool start); @@ -122,6 +123,7 @@ int vfio_container_dma_map(VFIOContainer *container, int vfio_container_dma_unmap(VFIOContainer *container, hwaddr iova, ram_addr_t size, IOMMUTLBEntry *iotlb); +int vfio_container_reset(VFIOContainer *container); bool vfio_container_devices_all_dirty_tracking(VFIOContainer *container); void vfio_container_set_dirty_page_tracking(VFIOContainer *container, bool start); --=20 2.27.0