From patchwork Thu Apr 14 10:47:05 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yi Liu X-Patchwork-Id: 12813330 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 85321C433F5 for ; Thu, 14 Apr 2022 10:49:33 +0000 (UTC) Received: from localhost ([::1]:50558 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nex2a-0006o7-I9 for qemu-devel@archiver.kernel.org; Thu, 14 Apr 2022 06:49:32 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55576) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nex0p-0002Xz-JF for qemu-devel@nongnu.org; Thu, 14 Apr 2022 06:47:43 -0400 Received: from mga12.intel.com ([192.55.52.136]:34770) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nex0l-0005Ke-5H for qemu-devel@nongnu.org; Thu, 14 Apr 2022 06:47:41 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1649933259; x=1681469259; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=xY7UyaVEvJ5caj+3+YkMuOpNZxDlr5V2P2U4rZef+Fc=; b=UiZrWBHmej0sSc9tdH4+6AjFPkJ5nENUfsXGj1/Jf7e854eOmHWvAjtd VKNN5+G7C1LzvP43MG0kF82YVMqey/1q3VK9WuRgWo7brtmaP2nOldbal IokS7hlojfeCHeCCY1bwmBX4zDvwx3uiyzU0/XWMnfkEsmk94F9UoAxPz 5EWnuu1lysZxKHs3LgCa03FeSouXtp8T1k9C95XvFXMvfQTiv1f1BEGLH kwl6nd8cJfy39cUCvX2RkcYEQ54fKuP40HzEbR7T9StL1cy/kGB4Fi3yM ct9efVBDGs9OtaY8ic7h4+upwIQC6s4/gAaTRkxJGgZdmAzbl6SZjOo4P g==; X-IronPort-AV: E=McAfee;i="6400,9594,10316"; a="242836511" X-IronPort-AV: E=Sophos;i="5.90,259,1643702400"; d="scan'208";a="242836511" Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Apr 2022 03:47:22 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.90,259,1643702400"; d="scan'208";a="803091245" Received: from 984fee00a4c6.jf.intel.com ([10.165.58.231]) by fmsmga006.fm.intel.com with ESMTP; 14 Apr 2022 03:47:20 -0700 From: Yi Liu To: alex.williamson@redhat.com, cohuck@redhat.com, qemu-devel@nongnu.org Subject: [RFC 13/18] vfio/container-obj: Introduce VFIOContainer reset callback Date: Thu, 14 Apr 2022 03:47:05 -0700 Message-Id: <20220414104710.28534-14-yi.l.liu@intel.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20220414104710.28534-1-yi.l.liu@intel.com> References: <20220414104710.28534-1-yi.l.liu@intel.com> MIME-Version: 1.0 Received-SPF: pass client-ip=192.55.52.136; envelope-from=yi.l.liu@intel.com; helo=mga12.intel.com X-Spam_score_int: -44 X-Spam_score: -4.5 X-Spam_bar: ---- X-Spam_report: (-4.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, 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_PASS=-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: , Cc: akrowiak@linux.ibm.com, jjherne@linux.ibm.com, thuth@redhat.com, yi.l.liu@intel.com, kvm@vger.kernel.org, mjrosato@linux.ibm.com, jasowang@redhat.com, farman@linux.ibm.com, peterx@redhat.com, pasic@linux.ibm.com, eric.auger@redhat.com, yi.y.sun@intel.com, chao.p.peng@intel.com, nicolinc@nvidia.com, kevin.tian@intel.com, jgg@nvidia.com, eric.auger.pro@gmail.com, david@gibson.dropbear.id.au Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" 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-obj.c | 13 +++++++++++++ hw/vfio/container.c | 26 ++++++++++++++------------ include/hw/vfio/vfio-container-obj.h | 2 ++ 4 files changed, 47 insertions(+), 12 deletions(-) diff --git a/hw/vfio/as.c b/hw/vfio/as.c index 30e86f6833..4abaa4068f 100644 --- a/hw/vfio/as.c +++ b/hw/vfio/as.c @@ -847,6 +847,18 @@ const MemoryListener vfio_memory_listener = { .log_sync = vfio_listener_log_sync, }; +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; @@ -862,6 +874,9 @@ VFIOAddressSpace *vfio_get_address_space(AddressSpace *as) space->as = as; QLIST_INIT(&space->containers); + if (QLIST_EMPTY(&vfio_address_spaces)) { + qemu_register_reset(vfio_reset_handler, NULL); + } QLIST_INSERT_HEAD(&vfio_address_spaces, space, list); return space; @@ -873,6 +888,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); + } } static VFIOContainerClass * diff --git a/hw/vfio/container-obj.c b/hw/vfio/container-obj.c index 40c1e2a2b5..c4220336af 100644 --- a/hw/vfio/container-obj.c +++ b/hw/vfio/container-obj.c @@ -68,6 +68,19 @@ int vfio_container_dma_unmap(VFIOContainer *container, return vccs->dma_unmap(container, iova, size, iotlb); } +int vfio_container_reset(VFIOContainer *container) +{ + VFIOContainerClass *vccs = VFIO_CONTAINER_OBJ_GET_CLASS(container); + + vccs = VFIO_CONTAINER_OBJ_GET_CLASS(container); + + if (!vccs->reset) { + return -ENOENT; + } + + return vccs->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 74febc1567..2f59422048 100644 --- a/hw/vfio/container.c +++ b/hw/vfio/container.c @@ -458,12 +458,15 @@ vfio_legacy_container_del_section_window(VFIOContainer *bcontainer, } } -void vfio_reset_handler(void *opaque) +static int vfio_legacy_container_reset(VFIOContainer *bcontainer) { + VFIOLegacyContainer *container = container_of(bcontainer, + VFIOLegacyContainer, obj); VFIOGroup *group; VFIODevice *vbasedev; + int ret, final_ret = 0; - 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); @@ -471,13 +474,19 @@ void vfio_reset_handler(void *opaque) } } - 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 = vbasedev->ops->vfio_hot_reset_multi(vbasedev); + if (ret) { + error_report("failed to reset %s (%d)", + vbasedev->name, ret); + final_ret = ret; + } } } } + return final_ret; } static void vfio_kvm_device_add_group(VFIOGroup *group) @@ -1004,10 +1013,6 @@ static VFIOGroup *vfio_get_group(int groupid, AddressSpace *as, Error **errp) goto close_fd_exit; } - if (QLIST_EMPTY(&vfio_group_list)) { - qemu_register_reset(vfio_reset_handler, NULL); - } - QLIST_INSERT_HEAD(&vfio_group_list, group, next); return group; @@ -1036,10 +1041,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); - } } static int vfio_get_device(VFIOGroup *group, const char *name, @@ -1293,6 +1294,7 @@ static void vfio_legacy_container_class_init(ObjectClass *klass, vccs->add_window = vfio_legacy_container_add_section_window; vccs->del_window = vfio_legacy_container_del_section_window; vccs->check_extension = vfio_legacy_container_check_extension; + vccs->reset = vfio_legacy_container_reset; vccs->attach_device = legacy_attach_device; vccs->detach_device = legacy_detach_device; } diff --git a/include/hw/vfio/vfio-container-obj.h b/include/hw/vfio/vfio-container-obj.h index ebc1340530..ffd8590ff8 100644 --- a/include/hw/vfio/vfio-container-obj.h +++ b/include/hw/vfio/vfio-container-obj.h @@ -118,6 +118,7 @@ typedef struct VFIOContainerClass { 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); @@ -142,6 +143,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);