From nobody Fri Nov 14 16:48:28 2025 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=1760689422; cv=none; d=zohomail.com; s=zohoarc; b=nevwx9FYxD0bdJj0Tp+o86rcszX/lfzlPqBPw9pQeFPJTTqWdLRiRdxBZcfD4gWG8XGIdBcbRn8smEzwzETyu3scsFGgsbOEd7eeRJKmzsmGydunP5L/Bkts3en8vn7udUF/KDBdonZa8MSN/pZ/ncQe0qJc4yY5AJGgMT0tUps= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1760689422; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=fs1J4vWf9rIaj9Mum50g7l/lWYXq8PELrslWW5QEf6Q=; b=XuvsTwJzynPf9QIeIze05MMO7i4II9zFnuRtPAwofZu1ONrEhJj2rzZtb17r3uVH6HdmOzGXUtj9IdMHd3ixkfj+X1huov3INcsoR/K32cKtAqpQWyILtm25vxjHSnkVeZdzVlIsjAqzqg4uv2twaCmOkThnvXX5DTVhueIT/wk= 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 1760689422003902.0559113528267; Fri, 17 Oct 2025 01:23:42 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1v9fk3-00012Q-4s; Fri, 17 Oct 2025 04:23:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1v9fju-000112-Rd for qemu-devel@nongnu.org; Fri, 17 Oct 2025 04:23:08 -0400 Received: from mgamail.intel.com ([192.198.163.19]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1v9fjm-0001BE-F2 for qemu-devel@nongnu.org; Fri, 17 Oct 2025 04:23:05 -0400 Received: from orviesa007.jf.intel.com ([10.64.159.147]) by fmvoesa113.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Oct 2025 01:22:49 -0700 Received: from unknown (HELO gnr-sp-2s-612.sh.intel.com) ([10.112.230.229]) by orviesa007-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Oct 2025 01:22:46 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1760689378; x=1792225378; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=obN4zXwtXoyM1GltB8aOZ1VpAFihc3VGNbYoQhEDvnc=; b=ODhzEr83m1U3h5+49sBSQE1SVgMCiEnR2n87TMCrZ2oL9oQXIuGLpkGB 1AmKiwgn+68IcdNxG1BAsccnWpblV00vo2dB3/qEWeKYBdYxRBKEvGKFn fy8DRqesCez/NhqYWB0lNWNpq6mK/I/tqC2qRiBgakYSiGD9fDwEz2Vg5 tOwCzcPNECsVAH2C7sRINdNlR9tTJvHCVNeQhmjfkh5ODH8xjLnNHuwkZ m3AvhaVU9ZU8ilYDh0o7mSkqC8gY+uKS6usbvdZsiqh+4dCOuHsyZxRbS pDGG2WeTOrY+6RRsqNLRax+gmAx4DhvASlWJbHdrKQVdt8kiQppFQJJ6W w==; X-CSE-ConnectionGUID: 8ICip55BTH+tXloaks9vvg== X-CSE-MsgGUID: tq28DsKDSge3jTnSFDtFKw== X-IronPort-AV: E=McAfee;i="6800,10657,11584"; a="61927388" X-IronPort-AV: E=Sophos;i="6.19,234,1754982000"; d="scan'208";a="61927388" X-CSE-ConnectionGUID: ofchU3kgRVel2dkmlNZZhw== X-CSE-MsgGUID: NFEXSwm3T6mUQUeWfBinhA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.19,234,1754982000"; d="scan'208";a="182484678" From: Zhenzhong Duan To: qemu-devel@nongnu.org Cc: alex.williamson@redhat.com, clg@redhat.com, mst@redhat.com, jasowang@redhat.com, yi.l.liu@intel.com, clement.mathieu--drif@eviden.com, eric.auger@redhat.com, joao.m.martins@oracle.com, avihaih@nvidia.com, xudong.hao@intel.com, giovanni.cabiddu@intel.com, mark.gross@intel.com, arjan.van.de.ven@intel.com, Zhenzhong Duan Subject: [PATCH v2 1/8] vfio/iommufd: Add framework code to support getting dirty bitmap before unmap Date: Fri, 17 Oct 2025 04:22:26 -0400 Message-ID: <20251017082234.517827-2-zhenzhong.duan@intel.com> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20251017082234.517827-1-zhenzhong.duan@intel.com> References: <20251017082234.517827-1-zhenzhong.duan@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.198.163.19; envelope-from=zhenzhong.duan@intel.com; helo=mgamail.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, 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_MED=-2.3, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 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-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @intel.com) X-ZM-MESSAGEID: 1760689427937158500 Content-Type: text/plain; charset="utf-8" Currently we support device and iommu dirty tracking, device dirty tracking is preferred. Add the framework code in iommufd_cdev_unmap() to choose either device or iommu dirty tracking, just like vfio_legacy_dma_unmap_one(). Signed-off-by: Zhenzhong Duan Tested-by: Xudong Hao Tested-by: Giovannio Cabiddu Reviewed-by: C=C3=A9dric Le Goater Reviewed-by: Yi Liu --- hw/vfio/iommufd.c | 34 +++++++++++++++++++++++++++++++--- 1 file changed, 31 insertions(+), 3 deletions(-) diff --git a/hw/vfio/iommufd.c b/hw/vfio/iommufd.c index fc9cd9d22f..976c0a8814 100644 --- a/hw/vfio/iommufd.c +++ b/hw/vfio/iommufd.c @@ -61,14 +61,42 @@ static int iommufd_cdev_unmap(const VFIOContainer *bcon= tainer, IOMMUTLBEntry *iotlb, bool unmap_all) { const VFIOIOMMUFDContainer *container =3D VFIO_IOMMU_IOMMUFD(bcontaine= r); + IOMMUFDBackend *be =3D container->be; + uint32_t ioas_id =3D container->ioas_id; + bool need_dirty_sync =3D false; + Error *local_err =3D NULL; + int ret; =20 if (unmap_all) { size =3D UINT64_MAX; } =20 - /* TODO: Handle dma_unmap_bitmap with iotlb args (migration) */ - return iommufd_backend_unmap_dma(container->be, - container->ioas_id, iova, size); + if (iotlb && vfio_container_dirty_tracking_is_started(bcontainer)) { + if (!vfio_container_devices_dirty_tracking_is_supported(bcontainer= ) && + bcontainer->dirty_pages_supported) { + /* TODO: query dirty bitmap before DMA unmap */ + return iommufd_backend_unmap_dma(be, ioas_id, iova, size); + } + + need_dirty_sync =3D true; + } + + ret =3D iommufd_backend_unmap_dma(be, ioas_id, iova, size); + if (ret) { + return ret; + } + + if (need_dirty_sync) { + ret =3D vfio_container_query_dirty_bitmap(bcontainer, iova, size, + iotlb->translated_addr, + &local_err); + if (ret) { + error_report_err(local_err); + return ret; + } + } + + return 0; } =20 static bool iommufd_cdev_kvm_device_add(VFIODevice *vbasedev, Error **errp) --=20 2.47.1 From nobody Fri Nov 14 16:48:28 2025 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=1760689504; cv=none; d=zohomail.com; s=zohoarc; b=iOF0v93B+HPreuuEeUGz0zxacAUp/0a8dYrN8RB3wwPY7GryjjP7Gha+tY5TAJYWt4tWussJgu0sM4Fefirn9bBaiM0Il9aH0UCPe1O2lRlBRUjzWm+Rldtrq43Jh775SqGQMiLbH6AS3HvNAkQqpghmTQxL0/hnGFyJ6IlIkaU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1760689504; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=bQTY/R578nDzHbr+b2SynEIY2JBi6I0CFD3ETFUPCsg=; b=aJ2W+G59nOBcVc1D9OUGYIudvnLDZ+V/FApUKMow6+Ub953TQLC6adeaqpfTp/ThuVrTlPi90myvkCFcI4BaLV6p1IotLYNGi/+KYOEvnVfsQy45YvD4R+VwzFnA/cf5vCFhz4VmyLXMh/l/OGzcum1C/DtkjcrXvGxqj0DBK3o= 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 176068950455088.54304613094689; Fri, 17 Oct 2025 01:25:04 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1v9fkA-00016K-AU; Fri, 17 Oct 2025 04:23:22 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1v9fk0-00012P-DQ for qemu-devel@nongnu.org; Fri, 17 Oct 2025 04:23:13 -0400 Received: from mgamail.intel.com ([192.198.163.19]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1v9fjp-0001D4-Rj for qemu-devel@nongnu.org; Fri, 17 Oct 2025 04:23:10 -0400 Received: from orviesa007.jf.intel.com ([10.64.159.147]) by fmvoesa113.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Oct 2025 01:22:52 -0700 Received: from unknown (HELO gnr-sp-2s-612.sh.intel.com) ([10.112.230.229]) by orviesa007-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Oct 2025 01:22:49 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1760689382; x=1792225382; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=NBblPV8qhfIQ8dLU33306XjgXORx0k+B5vU5yzS/DOQ=; b=Yi2YtWS0lwkxQ+m++l3lssDjHHvoh4OhFNlfeMiFIuQAuuliXfBIqMV2 pMt1LFEFHkIbldBYaEmsUBzJxsva6BWg5U4asDejvM7VUsxS+hBWvY+ww +TmVTnsCAeIecORj66jf40lHS2kuNel+R+uKodimX+KMrsrmBdkYhoezn /+nfj0M/0/DFh1m8uqZ7w8zGN8cZYwcPk2DXKCNMidrBxo84J/IW6AMDD fg6l3EsQRDKqWiLDJmImeEXDbGHxrXWRaPIqnXLyfS/+VDJ7CJOVWQBRC 2cxlkdSMiuruT2HjHcfWNRgw3eCDcnqrfTFa4szHEKsyQpCspBbsiXTTr A==; X-CSE-ConnectionGUID: H7ygdN/VTNaW6d/7JdnQ8Q== X-CSE-MsgGUID: HMaeP5JCS8S2t2HiIF1Tyg== X-IronPort-AV: E=McAfee;i="6800,10657,11584"; a="61927396" X-IronPort-AV: E=Sophos;i="6.19,234,1754982000"; d="scan'208";a="61927396" X-CSE-ConnectionGUID: efCdwgt2RmS5kHnd495NCA== X-CSE-MsgGUID: a+GNPBusSL2Gy5ZkS5P5IA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.19,234,1754982000"; d="scan'208";a="182484681" From: Zhenzhong Duan To: qemu-devel@nongnu.org Cc: alex.williamson@redhat.com, clg@redhat.com, mst@redhat.com, jasowang@redhat.com, yi.l.liu@intel.com, clement.mathieu--drif@eviden.com, eric.auger@redhat.com, joao.m.martins@oracle.com, avihaih@nvidia.com, xudong.hao@intel.com, giovanni.cabiddu@intel.com, mark.gross@intel.com, arjan.van.de.ven@intel.com, Zhenzhong Duan Subject: [PATCH v2 2/8] vfio/iommufd: Query dirty bitmap before DMA unmap Date: Fri, 17 Oct 2025 04:22:27 -0400 Message-ID: <20251017082234.517827-3-zhenzhong.duan@intel.com> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20251017082234.517827-1-zhenzhong.duan@intel.com> References: <20251017082234.517827-1-zhenzhong.duan@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.198.163.19; envelope-from=zhenzhong.duan@intel.com; helo=mgamail.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, 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_MED=-2.3, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, T_SPF_HELO_TEMPERROR=0.01, T_SPF_TEMPERROR=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-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @intel.com) X-ZM-MESSAGEID: 1760689511858158500 Content-Type: text/plain; charset="utf-8" When a existing mapping is unmapped, there could already be dirty bits which need to be recorded before unmap. If query dirty bitmap fails, we still need to do unmapping or else there is stale mapping and it's risky to guest. Co-developed-by: Joao Martins Signed-off-by: Joao Martins Signed-off-by: Zhenzhong Duan Tested-by: Xudong Hao Tested-by: Giovannio Cabiddu Reviewed-by: C=C3=A9dric Le Goater Reviewed-by: Yi Liu --- hw/vfio/iommufd.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/hw/vfio/iommufd.c b/hw/vfio/iommufd.c index 976c0a8814..404e6249ca 100644 --- a/hw/vfio/iommufd.c +++ b/hw/vfio/iommufd.c @@ -74,7 +74,13 @@ static int iommufd_cdev_unmap(const VFIOContainer *bcont= ainer, if (iotlb && vfio_container_dirty_tracking_is_started(bcontainer)) { if (!vfio_container_devices_dirty_tracking_is_supported(bcontainer= ) && bcontainer->dirty_pages_supported) { - /* TODO: query dirty bitmap before DMA unmap */ + ret =3D vfio_container_query_dirty_bitmap(bcontainer, iova, si= ze, + iotlb->translated_addr, + &local_err); + if (ret) { + error_report_err(local_err); + } + /* Unmap stale mapping even if query dirty bitmap fails */ return iommufd_backend_unmap_dma(be, ioas_id, iova, size); } =20 --=20 2.47.1 From nobody Fri Nov 14 16:48:28 2025 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=1760689428; cv=none; d=zohomail.com; s=zohoarc; b=DHfpZCSq5d5Hi+TsHoCMgvVZA2y5Ym68GrjoAVckVXvRNZ/s6/0ihIGrJEQFy00E4IOsnkydANG+Z0FQMljzuXVEJyd6jmEOaZTBTfMPh8BfQnP50rB/AE3I2TOm2GZSj3iJuHn8TbyDvXf0y28QiVqAXjBZpwpSzp4/QYjJJ2s= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1760689428; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=0liuvVJEgSoHEHAZSK3ZD1dXn0GnnwtYnMMtSuMKE+M=; b=lLnrYHT8MXyYRgamMkgXkarkTzJyBBfGRsv5JUJ8AjJ46idgn71CbdC8mTCiFyqUUwqfbCsNFkZHqaKYjOqCbmR3VKQqH4Rl8mK2I/YDxOwGKSXW+3jj2p9Su5wi02yk6wgrdaV/KsWpJX8y7cpA3N7dEs/J8zLBM8GLkAkE7qw= 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 1760689428846165.815390615488; Fri, 17 Oct 2025 01:23:48 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1v9fk9-00017F-3e; Fri, 17 Oct 2025 04:23:21 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1v9fk1-00012j-FS for qemu-devel@nongnu.org; Fri, 17 Oct 2025 04:23:13 -0400 Received: from mgamail.intel.com ([192.198.163.19]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1v9fjr-0001DU-8S for qemu-devel@nongnu.org; Fri, 17 Oct 2025 04:23:11 -0400 Received: from orviesa007.jf.intel.com ([10.64.159.147]) by fmvoesa113.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Oct 2025 01:22:56 -0700 Received: from unknown (HELO gnr-sp-2s-612.sh.intel.com) ([10.112.230.229]) by orviesa007-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Oct 2025 01:22:53 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1760689383; x=1792225383; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=eUvpr75k1j2uvWL4kddKFkIdVg9vRV78axGTYPZrpTY=; b=RmzkV3FpEMdoXwS/LKBH6hEMEg+7syHUKEgjiXyZK2G9QsySt20fRsAt O4co97IEeoew4Sbf1s4yiTHbDgky2K04BbxNv+qeDX9EhnfMWyynPl7ID kFYS8WYBeZOZEn+OtefTMWV4CcZodivd9pJ4RSIIaHT4Ah/w4Dj3ohScn R6qKTdWlNdmnp8oPOz0su419chM7G4WUEcXvYNNOzOSssZFz8vf7SL8jf 8AWIeSHVS1RW8S10LJM2sD61ggrz2Dmn+yDqUJJ7sqeInFVKIgh9r1HkB mhZ3eAR33/NGUK8aBkGbGs1WDZ2qY961tXTuCvG/XwpY8vSxakkOkIdiT A==; X-CSE-ConnectionGUID: zyUpYnFSRkqMASY/PUZ5Ww== X-CSE-MsgGUID: /90XDavERVa0pKQvi0j+Nw== X-IronPort-AV: E=McAfee;i="6800,10657,11584"; a="61927403" X-IronPort-AV: E=Sophos;i="6.19,234,1754982000"; d="scan'208";a="61927403" X-CSE-ConnectionGUID: EVJrLkJSR5evd+DldmIolg== X-CSE-MsgGUID: 85VOb+7JQPSWJNkaTDnrZg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.19,234,1754982000"; d="scan'208";a="182484684" From: Zhenzhong Duan To: qemu-devel@nongnu.org Cc: alex.williamson@redhat.com, clg@redhat.com, mst@redhat.com, jasowang@redhat.com, yi.l.liu@intel.com, clement.mathieu--drif@eviden.com, eric.auger@redhat.com, joao.m.martins@oracle.com, avihaih@nvidia.com, xudong.hao@intel.com, giovanni.cabiddu@intel.com, mark.gross@intel.com, arjan.van.de.ven@intel.com, Zhenzhong Duan Subject: [PATCH v2 3/8] vfio/container-legacy: rename vfio_dma_unmap_bitmap() to vfio_legacy_dma_unmap_get_dirty_bitmap() Date: Fri, 17 Oct 2025 04:22:28 -0400 Message-ID: <20251017082234.517827-4-zhenzhong.duan@intel.com> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20251017082234.517827-1-zhenzhong.duan@intel.com> References: <20251017082234.517827-1-zhenzhong.duan@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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.198.163.19; envelope-from=zhenzhong.duan@intel.com; helo=mgamail.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, 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_MED=-2.3, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_NONE=0.001, T_SPF_TEMPERROR=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-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @intel.com) X-ZM-MESSAGEID: 1760689431290158500 This is to follow naming style in container-legacy.c to have low level func= tions with vfio_legacy_ prefix. No functional changes. Suggested-by: C=C3=A9dric Le Goater Signed-off-by: Zhenzhong Duan Reviewed-by: C=C3=A9dric Le Goater Reviewed-by: Yi Liu --- hw/vfio/container-legacy.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/hw/vfio/container-legacy.c b/hw/vfio/container-legacy.c index 8e9639603e..b7e3b892b9 100644 --- a/hw/vfio/container-legacy.c +++ b/hw/vfio/container-legacy.c @@ -68,9 +68,10 @@ static int vfio_ram_block_discard_disable(VFIOLegacyCont= ainer *container, } } =20 -static int vfio_dma_unmap_bitmap(const VFIOLegacyContainer *container, - hwaddr iova, uint64_t size, - IOMMUTLBEntry *iotlb) +static int +vfio_legacy_dma_unmap_get_dirty_bitmap(const VFIOLegacyContainer *containe= r, + hwaddr iova, uint64_t size, + IOMMUTLBEntry *iotlb) { const VFIOContainer *bcontainer =3D VFIO_IOMMU(container); struct vfio_iommu_type1_dma_unmap *unmap; @@ -141,7 +142,8 @@ static int vfio_legacy_dma_unmap_one(const VFIOLegacyCo= ntainer *container, if (iotlb && vfio_container_dirty_tracking_is_started(bcontainer)) { if (!vfio_container_devices_dirty_tracking_is_supported(bcontainer= ) && bcontainer->dirty_pages_supported) { - return vfio_dma_unmap_bitmap(container, iova, size, iotlb); + return vfio_legacy_dma_unmap_get_dirty_bitmap(container, iova,= size, + iotlb); } =20 need_dirty_sync =3D true; --=20 2.47.1 From nobody Fri Nov 14 16:48:28 2025 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=1760689451; cv=none; d=zohomail.com; s=zohoarc; b=SrlfvDaYdUyISy4al6d/9AE8aJcL6vWl4cVb9Ca1PLfmf8Au70pq4ZZ7vh4eUSOMrBZaGVFKvm9jZpVll9Vq92+yRv8ziWH7NyBV18bgAniSOBtv0H4Lfz0CDAGs3IhyTJjOWBWQGcCNISwmaz90cpksxJLixOPFRGFQDCRAek4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1760689451; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=RRq3JimfpW75OKcjhDyu8Q8s19L6wE8/u/T8PvXUi5Q=; b=MY1gpZCEPq11LY7YrCZRXVeL23H5IsZjrYB+6G6Z8y3LmQFi9z43dq0STzfF3LyuYNLjzIo5G0r9KbfNNIJphQ4oZ2gMnbGgOa0OCsmt1MMz3Zwn7BSfizQIHiQ3M7+ABl9C/xeF6AeNmp2ccGrbyfrsQ1LIzeYBT3NMzrob06o= 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 1760689451598642.7632622156538; Fri, 17 Oct 2025 01:24:11 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1v9fkD-0001Fe-LZ; Fri, 17 Oct 2025 04:23:25 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1v9fk4-00014W-BH for qemu-devel@nongnu.org; Fri, 17 Oct 2025 04:23:17 -0400 Received: from mgamail.intel.com ([192.198.163.19]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1v9fjz-0001BE-4f for qemu-devel@nongnu.org; Fri, 17 Oct 2025 04:23:15 -0400 Received: from orviesa007.jf.intel.com ([10.64.159.147]) by fmvoesa113.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Oct 2025 01:23:00 -0700 Received: from unknown (HELO gnr-sp-2s-612.sh.intel.com) ([10.112.230.229]) by orviesa007-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Oct 2025 01:22:57 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1760689391; x=1792225391; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=jBjO8eNO69bKUx8U08nAWCma0g7lSM7NYPl6HQJhvCI=; b=dujIbSy5PHgiHvGjGaRjumAuR+hZnmSSyrpUNa7pVTFsJi3rXTDAWuRP b3p/5xa7oLUp/3LqecEyOhwsaWed21321dOyuqlNll5ERR6Uq6FyrQvRj JCJRQHMDk/BQ4jkH8W5XN9yzIxiVGfgSXD7KBrDoK67cTfKZJcI6vBK2i aW/NZllURPbNW1LTJ3hCGocX++fCyB7tlGdEAJvLQqQRorKuFYnnrUQWe y4lQLV/2oGboYC2pVxv6HNwGAQkNRILtpf+s4PNVL+Zxc+FdkFlsNIY3A Vc7NrJFF6T2evAjqdHasRvcTWjSQ561uyqO/3OGMS2wcEnrf6dVRTJlMX Q==; X-CSE-ConnectionGUID: t29TglcSSSW+/CX2hvL04A== X-CSE-MsgGUID: E4/vA5KiSoKzNtJH6LO55A== X-IronPort-AV: E=McAfee;i="6800,10657,11584"; a="61927418" X-IronPort-AV: E=Sophos;i="6.19,234,1754982000"; d="scan'208";a="61927418" X-CSE-ConnectionGUID: 7LPVFTTPSJW+64H8j8NZ8w== X-CSE-MsgGUID: GBU/hiruQ0aYlbMdpHLkKQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.19,234,1754982000"; d="scan'208";a="182484688" From: Zhenzhong Duan To: qemu-devel@nongnu.org Cc: alex.williamson@redhat.com, clg@redhat.com, mst@redhat.com, jasowang@redhat.com, yi.l.liu@intel.com, clement.mathieu--drif@eviden.com, eric.auger@redhat.com, joao.m.martins@oracle.com, avihaih@nvidia.com, xudong.hao@intel.com, giovanni.cabiddu@intel.com, mark.gross@intel.com, arjan.van.de.ven@intel.com, Zhenzhong Duan Subject: [PATCH v2 4/8] vfio: Add a backend_flag parameter to vfio_contianer_query_dirty_bitmap() Date: Fri, 17 Oct 2025 04:22:29 -0400 Message-ID: <20251017082234.517827-5-zhenzhong.duan@intel.com> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20251017082234.517827-1-zhenzhong.duan@intel.com> References: <20251017082234.517827-1-zhenzhong.duan@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.198.163.19; envelope-from=zhenzhong.duan@intel.com; helo=mgamail.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, 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_MED=-2.3, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 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-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @intel.com) X-ZM-MESSAGEID: 1760689461649158500 Content-Type: text/plain; charset="utf-8" From: Joao Martins This new parameter will be used in following patch, currently 0 is passed. Signed-off-by: Joao Martins Signed-off-by: Zhenzhong Duan Tested-by: Giovannio Cabiddu Reviewed-by: C=C3=A9dric Le Goater Reviewed-by: Yi Liu --- include/hw/vfio/vfio-container.h | 8 ++++++-- hw/vfio-user/container.c | 5 +++-- hw/vfio/container-legacy.c | 5 +++-- hw/vfio/container.c | 15 +++++++++------ hw/vfio/iommufd.c | 7 ++++--- hw/vfio/listener.c | 6 +++--- hw/vfio/trace-events | 2 +- 7 files changed, 29 insertions(+), 19 deletions(-) diff --git a/include/hw/vfio/vfio-container.h b/include/hw/vfio/vfio-contai= ner.h index c4b58d664b..9f6e8cedfc 100644 --- a/include/hw/vfio/vfio-container.h +++ b/include/hw/vfio/vfio-container.h @@ -99,7 +99,9 @@ bool vfio_container_devices_dirty_tracking_is_supported( const VFIOContainer *bcontainer); int vfio_container_query_dirty_bitmap(const VFIOContainer *bcontainer, uint64_t iova, uint64_t size, - hwaddr translated_addr, Error **errp= ); + uint64_t backend_flag, + hwaddr translated_addr, + Error **errp); =20 GList *vfio_container_get_iova_ranges(const VFIOContainer *bcontainer); =20 @@ -253,12 +255,14 @@ struct VFIOIOMMUClass { * @vbmap: #VFIOBitmap internal bitmap structure * @iova: iova base address * @size: size of iova range + * @backend_flag: flags for backend, opaque to upper layer container * @errp: pointer to Error*, to store an error if it happens. * * Returns zero to indicate success and negative for error. */ int (*query_dirty_bitmap)(const VFIOContainer *bcontainer, - VFIOBitmap *vbmap, hwaddr iova, hwaddr size, Error **errp); + VFIOBitmap *vbmap, hwaddr iova, hwaddr size, + uint64_t backend_flag, Error **errp); /* PCI specific */ int (*pci_hot_reset)(VFIODevice *vbasedev, bool single); =20 diff --git a/hw/vfio-user/container.c b/hw/vfio-user/container.c index e45192fef6..3ce6ea12db 100644 --- a/hw/vfio-user/container.c +++ b/hw/vfio-user/container.c @@ -162,8 +162,9 @@ vfio_user_set_dirty_page_tracking(const VFIOContainer *= bcontainer, } =20 static int vfio_user_query_dirty_bitmap(const VFIOContainer *bcontainer, - VFIOBitmap *vbmap, hwaddr iova, - hwaddr size, Error **errp) + VFIOBitmap *vbmap, hwaddr iova, + hwaddr size, uint64_t backend_flag, + Error **errp) { error_setg_errno(errp, ENOTSUP, "Not supported"); return -ENOTSUP; diff --git a/hw/vfio/container-legacy.c b/hw/vfio/container-legacy.c index b7e3b892b9..dd9c4a6a5a 100644 --- a/hw/vfio/container-legacy.c +++ b/hw/vfio/container-legacy.c @@ -154,7 +154,7 @@ static int vfio_legacy_dma_unmap_one(const VFIOLegacyCo= ntainer *container, } =20 if (need_dirty_sync) { - ret =3D vfio_container_query_dirty_bitmap(bcontainer, iova, size, + ret =3D vfio_container_query_dirty_bitmap(bcontainer, iova, size, = 0, iotlb->translated_addr, &local_err); if (ret) { error_report_err(local_err); @@ -255,7 +255,8 @@ vfio_legacy_set_dirty_page_tracking(const VFIOContainer= *bcontainer, } =20 static int vfio_legacy_query_dirty_bitmap(const VFIOContainer *bcontainer, - VFIOBitmap *vbmap, hwaddr iova, hwaddr size, Error *= *errp) + VFIOBitmap *vbmap, hwaddr iova, hwaddr = size, + uint64_t backend_flag, Error **errp) { const VFIOLegacyContainer *container =3D VFIO_IOMMU_LEGACY(bcontainer); struct vfio_iommu_type1_dirty_bitmap *dbitmap; diff --git a/hw/vfio/container.c b/hw/vfio/container.c index 9ddec300e3..7706603c1c 100644 --- a/hw/vfio/container.c +++ b/hw/vfio/container.c @@ -213,13 +213,13 @@ static int vfio_device_dma_logging_report(VFIODevice = *vbasedev, hwaddr iova, =20 static int vfio_container_iommu_query_dirty_bitmap( const VFIOContainer *bcontainer, VFIOBitmap *vbmap, hwaddr iova, - hwaddr size, Error **errp) + hwaddr size, uint64_t backend_flag, Error **errp) { VFIOIOMMUClass *vioc =3D VFIO_IOMMU_GET_CLASS(bcontainer); =20 g_assert(vioc->query_dirty_bitmap); return vioc->query_dirty_bitmap(bcontainer, vbmap, iova, size, - errp); + backend_flag, errp); } =20 static int vfio_container_devices_query_dirty_bitmap( @@ -247,7 +247,9 @@ static int vfio_container_devices_query_dirty_bitmap( =20 int vfio_container_query_dirty_bitmap(const VFIOContainer *bcontainer, uint64_t iova, uint64_t size, - hwaddr translated_addr, Error **errp) + uint64_t backend_flag, + hwaddr translated_addr, + Error **errp) { bool all_device_dirty_tracking =3D vfio_container_devices_dirty_tracking_is_supported(bcontainer); @@ -274,7 +276,7 @@ int vfio_container_query_dirty_bitmap(const VFIOContain= er *bcontainer, errp); } else { ret =3D vfio_container_iommu_query_dirty_bitmap(bcontainer, &vbmap= , iova, size, - errp); + backend_flag, errp); } =20 if (ret) { @@ -285,8 +287,9 @@ int vfio_container_query_dirty_bitmap(const VFIOContain= er *bcontainer, translated_addr, vbmap.pages); =20 - trace_vfio_container_query_dirty_bitmap(iova, size, vbmap.size, - translated_addr, dirty_pages); + trace_vfio_container_query_dirty_bitmap(iova, size, backend_flag, + vbmap.size, translated_addr, + dirty_pages); out: g_free(vbmap.bitmap); =20 diff --git a/hw/vfio/iommufd.c b/hw/vfio/iommufd.c index 404e6249ca..6457cef344 100644 --- a/hw/vfio/iommufd.c +++ b/hw/vfio/iommufd.c @@ -74,7 +74,7 @@ static int iommufd_cdev_unmap(const VFIOContainer *bconta= iner, if (iotlb && vfio_container_dirty_tracking_is_started(bcontainer)) { if (!vfio_container_devices_dirty_tracking_is_supported(bcontainer= ) && bcontainer->dirty_pages_supported) { - ret =3D vfio_container_query_dirty_bitmap(bcontainer, iova, si= ze, + ret =3D vfio_container_query_dirty_bitmap(bcontainer, iova, si= ze, 0, iotlb->translated_addr, &local_err); if (ret) { @@ -93,7 +93,7 @@ static int iommufd_cdev_unmap(const VFIOContainer *bconta= iner, } =20 if (need_dirty_sync) { - ret =3D vfio_container_query_dirty_bitmap(bcontainer, iova, size, + ret =3D vfio_container_query_dirty_bitmap(bcontainer, iova, size, = 0, iotlb->translated_addr, &local_err); if (ret) { @@ -209,7 +209,8 @@ err: =20 static int iommufd_query_dirty_bitmap(const VFIOContainer *bcontainer, VFIOBitmap *vbmap, hwaddr iova, - hwaddr size, Error **errp) + hwaddr size, uint64_t backend_flag, + Error **errp) { VFIOIOMMUFDContainer *container =3D VFIO_IOMMU_IOMMUFD(bcontainer); unsigned long page_size =3D qemu_real_host_page_size(); diff --git a/hw/vfio/listener.c b/hw/vfio/listener.c index 2d7d3a4645..2109101158 100644 --- a/hw/vfio/listener.c +++ b/hw/vfio/listener.c @@ -1083,7 +1083,7 @@ static void vfio_iommu_map_dirty_notify(IOMMUNotifier= *n, IOMMUTLBEntry *iotlb) translated_addr =3D memory_region_get_ram_addr(mr) + xlat; =20 ret =3D vfio_container_query_dirty_bitmap(bcontainer, iova, iotlb->add= r_mask + 1, - translated_addr, &local_err); + 0, translated_addr, &local_err); if (ret) { error_prepend(&local_err, "vfio_iommu_map_dirty_notify(%p, 0x%"HWADDR_PRIx", " @@ -1119,7 +1119,7 @@ static int vfio_ram_discard_query_dirty_bitmap(Memory= RegionSection *section, * Sync the whole mapped region (spanning multiple individual mappings) * in one go. */ - ret =3D vfio_container_query_dirty_bitmap(vrdl->bcontainer, iova, size, + ret =3D vfio_container_query_dirty_bitmap(vrdl->bcontainer, iova, size= , 0, translated_addr, &local_err); if (ret) { error_report_err(local_err); @@ -1204,7 +1204,7 @@ static int vfio_sync_dirty_bitmap(VFIOContainer *bcon= tainer, =20 return vfio_container_query_dirty_bitmap(bcontainer, REAL_HOST_PAGE_ALIGN(section->offset_within_address_spa= ce), - int128_get64(section->size), translated_addr, errp); + int128_get64(section->size), 0, translated_addr, errp); } =20 static void vfio_listener_log_sync(MemoryListener *listener, diff --git a/hw/vfio/trace-events b/hw/vfio/trace-events index 1e895448cd..3c62bab764 100644 --- a/hw/vfio/trace-events +++ b/hw/vfio/trace-events @@ -105,7 +105,7 @@ vfio_device_dirty_tracking_start(int nr_ranges, uint64_= t min32, uint64_t max32, vfio_iommu_map_dirty_notify(uint64_t iova_start, uint64_t iova_end) "iommu= dirty @ 0x%"PRIx64" - 0x%"PRIx64 =20 # container.c -vfio_container_query_dirty_bitmap(uint64_t iova, uint64_t size, uint64_t b= itmap_size, uint64_t translated_addr, uint64_t dirty_pages) "iova=3D0x%"PRI= x64" size=3D 0x%"PRIx64" bitmap_size=3D0x%"PRIx64" gpa=3D0x%"PRIx64" dirty_= pages=3D%"PRIu64 +vfio_container_query_dirty_bitmap(uint64_t iova, uint64_t size, uint64_t b= ackend_flag, uint64_t bitmap_size, uint64_t translated_addr, uint64_t dirty= _pages) "iova=3D0x%"PRIx64" size=3D0x%"PRIx64" backend_flag=3D0x%"PRIx64" b= itmap_size=3D0x%"PRIx64" gpa=3D0x%"PRIx64" dirty_pages=3D%"PRIu64 =20 # container-legacy.c vfio_container_disconnect(int fd) "close container->fd=3D%d" --=20 2.47.1 From nobody Fri Nov 14 16:48:28 2025 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=1760689496; cv=none; d=zohomail.com; s=zohoarc; b=k+TobwdJyz1GtRD+h2Kethy+5l1c0BKDI+LHyJ+/3k9e/GVtGNfmouHdNcZvNPQmBQRg1pUSu9P8WIkfbFarC5QU48tTy3REDhM1+S6DC7mtKJMhucTBPeLuW4WpODKItafTHtLfyBwUeSkfkJdZ3y+9tOSHJ8LJemULochG+iE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1760689496; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=eLdd0/CNHLFIeuKClv6AVCMfWz0nRRAAcRhCMuPQaNs=; b=YsIH4ftUNiTIxOTSR0o0jPyC2chLyXjPEkm3QyOVqhnnUw/4OwDMXhkn+LmlU2sbgBUUf1PyQ9wP7MgJy38iUO49qaXzrYW4r/j1ibB/s8ksoHfscYDBCiAwJZgYSJ6fJLUDgWJZuLrKnOCFoPEF41aeuLDUJRJHR73aIRbV0XI= 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 1760689496499183.43245791438198; Fri, 17 Oct 2025 01:24:56 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1v9fkE-0001Fy-HG; Fri, 17 Oct 2025 04:23:26 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1v9fk8-00015d-9w for qemu-devel@nongnu.org; Fri, 17 Oct 2025 04:23:20 -0400 Received: from mgamail.intel.com ([192.198.163.19]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1v9fk2-0001D4-MJ for qemu-devel@nongnu.org; Fri, 17 Oct 2025 04:23:18 -0400 Received: from orviesa007.jf.intel.com ([10.64.159.147]) by fmvoesa113.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Oct 2025 01:23:03 -0700 Received: from unknown (HELO gnr-sp-2s-612.sh.intel.com) ([10.112.230.229]) by orviesa007-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Oct 2025 01:23:00 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1760689395; x=1792225395; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=4UxvzTf4x6lCPFrVrFwEYZCZrbimI3oS++oeIgtlnf4=; b=WYzNOz74x+plnRZnZN0gQpiuQsG52KnlnzikdUaUdJNTB1cauvead/cb cyrLZsjxsBwsrujItx5Zwr5MaIaeoV6ojYsgj/M5sSqC+S5zQt/ABTdt7 dyAy1A0mwSNu0SHkq5jIaOKPW01azG7XAdWMaDVvPhoz0DH/FwQM80e4I zjR1uKEWk+w1n+t8P6anCX+5rBq8lKVscmFpLDMV4GLyL9ll56z+Sc3mt 7FLR52S8tSgoKIXWMafSgPrM3YYGiEXew1N3vVEpucdPcFRhCrr+FRQJk d5d1IREN5cojUlXZZYj4B9uVR2LKBv9WfBkV9gP36pOfe2X3SlZf2FU0c Q==; X-CSE-ConnectionGUID: FWfupvRYRGWfjcMf89tMHg== X-CSE-MsgGUID: lz66UvEwSC2G4WkNs/16vg== X-IronPort-AV: E=McAfee;i="6800,10657,11584"; a="61927423" X-IronPort-AV: E=Sophos;i="6.19,234,1754982000"; d="scan'208";a="61927423" X-CSE-ConnectionGUID: DnMBatkMQNWBjgQUCdAVQQ== X-CSE-MsgGUID: Wq4om/+8Ti2xR0g15lMwPQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.19,234,1754982000"; d="scan'208";a="182484695" From: Zhenzhong Duan To: qemu-devel@nongnu.org Cc: alex.williamson@redhat.com, clg@redhat.com, mst@redhat.com, jasowang@redhat.com, yi.l.liu@intel.com, clement.mathieu--drif@eviden.com, eric.auger@redhat.com, joao.m.martins@oracle.com, avihaih@nvidia.com, xudong.hao@intel.com, giovanni.cabiddu@intel.com, mark.gross@intel.com, arjan.van.de.ven@intel.com, Zhenzhong Duan Subject: [PATCH v2 5/8] vfio/iommufd: Add IOMMU_HWPT_GET_DIRTY_BITMAP_NO_CLEAR flag support Date: Fri, 17 Oct 2025 04:22:30 -0400 Message-ID: <20251017082234.517827-6-zhenzhong.duan@intel.com> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20251017082234.517827-1-zhenzhong.duan@intel.com> References: <20251017082234.517827-1-zhenzhong.duan@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.198.163.19; envelope-from=zhenzhong.duan@intel.com; helo=mgamail.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, 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_MED=-2.3, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 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-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @intel.com) X-ZM-MESSAGEID: 1760689497904158500 Content-Type: text/plain; charset="utf-8" Pass IOMMU_HWPT_GET_DIRTY_BITMAP_NO_CLEAR when doing the last dirty bitmap query right before unmap, no PTEs flushes. This accelerates the query without issue because unmap will tear down the mapping anyway. Co-developed-by: Joao Martins Signed-off-by: Joao Martins Signed-off-by: Zhenzhong Duan Tested-by: Xudong Hao Tested-by: Giovannio Cabiddu Reviewed-by: C=C3=A9dric Le Goater Reviewed-by: Yi Liu --- include/system/iommufd.h | 2 +- backends/iommufd.c | 5 +++-- hw/vfio/iommufd.c | 5 +++-- backends/trace-events | 2 +- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/include/system/iommufd.h b/include/system/iommufd.h index a659f36a20..767a8e4cb6 100644 --- a/include/system/iommufd.h +++ b/include/system/iommufd.h @@ -64,7 +64,7 @@ bool iommufd_backend_set_dirty_tracking(IOMMUFDBackend *b= e, uint32_t hwpt_id, bool iommufd_backend_get_dirty_bitmap(IOMMUFDBackend *be, uint32_t hwpt_id, uint64_t iova, ram_addr_t size, uint64_t page_size, uint64_t *data, - Error **errp); + uint64_t flags, Error **errp); bool iommufd_backend_invalidate_cache(IOMMUFDBackend *be, uint32_t id, uint32_t data_type, uint32_t entry_l= en, uint32_t *entry_num, void *data, diff --git a/backends/iommufd.c b/backends/iommufd.c index fdfb7c9d67..086bd67aea 100644 --- a/backends/iommufd.c +++ b/backends/iommufd.c @@ -361,7 +361,7 @@ bool iommufd_backend_get_dirty_bitmap(IOMMUFDBackend *b= e, uint32_t hwpt_id, uint64_t iova, ram_addr_t size, uint64_t page_size, uint64_t *data, - Error **errp) + uint64_t flags, Error **errp) { int ret; struct iommu_hwpt_get_dirty_bitmap get_dirty_bitmap =3D { @@ -371,11 +371,12 @@ bool iommufd_backend_get_dirty_bitmap(IOMMUFDBackend = *be, .length =3D size, .page_size =3D page_size, .data =3D (uintptr_t)data, + .flags =3D flags, }; =20 ret =3D ioctl(be->fd, IOMMU_HWPT_GET_DIRTY_BITMAP, &get_dirty_bitmap); trace_iommufd_backend_get_dirty_bitmap(be->fd, hwpt_id, iova, size, - page_size, ret ? errno : 0); + flags, page_size, ret ? errno := 0); if (ret) { error_setg_errno(errp, errno, "IOMMU_HWPT_GET_DIRTY_BITMAP (iova: 0x%"HWADDR_PR= Ix diff --git a/hw/vfio/iommufd.c b/hw/vfio/iommufd.c index 6457cef344..937b80340c 100644 --- a/hw/vfio/iommufd.c +++ b/hw/vfio/iommufd.c @@ -74,7 +74,8 @@ static int iommufd_cdev_unmap(const VFIOContainer *bconta= iner, if (iotlb && vfio_container_dirty_tracking_is_started(bcontainer)) { if (!vfio_container_devices_dirty_tracking_is_supported(bcontainer= ) && bcontainer->dirty_pages_supported) { - ret =3D vfio_container_query_dirty_bitmap(bcontainer, iova, si= ze, 0, + ret =3D vfio_container_query_dirty_bitmap(bcontainer, iova, si= ze, + IOMMU_HWPT_GET_DIRTY_B= ITMAP_NO_CLEAR, iotlb->translated_addr, &local_err); if (ret) { @@ -224,7 +225,7 @@ static int iommufd_query_dirty_bitmap(const VFIOContain= er *bcontainer, if (!iommufd_backend_get_dirty_bitmap(container->be, hwpt->hwpt_id, iova, size, page_size, (uint64_t *)vbmap->bitmap, - errp)) { + backend_flag, errp)) { return -EINVAL; } } diff --git a/backends/trace-events b/backends/trace-events index 56132d3fd2..e1992ba12f 100644 --- a/backends/trace-events +++ b/backends/trace-events @@ -19,5 +19,5 @@ iommufd_backend_alloc_ioas(int iommufd, uint32_t ioas) " = iommufd=3D%d ioas=3D%d" iommufd_backend_alloc_hwpt(int iommufd, uint32_t dev_id, uint32_t pt_id, u= int32_t flags, uint32_t hwpt_type, uint32_t len, uint64_t data_ptr, uint32_= t out_hwpt_id, int ret) " iommufd=3D%d dev_id=3D%u pt_id=3D%u flags=3D0x%x = hwpt_type=3D%u len=3D%u data_ptr=3D0x%"PRIx64" out_hwpt=3D%u (%d)" iommufd_backend_free_id(int iommufd, uint32_t id, int ret) " iommufd=3D%d = id=3D%d (%d)" iommufd_backend_set_dirty(int iommufd, uint32_t hwpt_id, bool start, int r= et) " iommufd=3D%d hwpt=3D%u enable=3D%d (%d)" -iommufd_backend_get_dirty_bitmap(int iommufd, uint32_t hwpt_id, uint64_t i= ova, uint64_t size, uint64_t page_size, int ret) " iommufd=3D%d hwpt=3D%u i= ova=3D0x%"PRIx64" size=3D0x%"PRIx64" page_size=3D0x%"PRIx64" (%d)" +iommufd_backend_get_dirty_bitmap(int iommufd, uint32_t hwpt_id, uint64_t i= ova, uint64_t size, uint64_t flags, uint64_t page_size, int ret) " iommufd= =3D%d hwpt=3D%u iova=3D0x%"PRIx64" size=3D0x%"PRIx64" flags=3D0x%"PRIx64" p= age_size=3D0x%"PRIx64" (%d)" iommufd_backend_invalidate_cache(int iommufd, uint32_t id, uint32_t data_t= ype, uint32_t entry_len, uint32_t entry_num, uint32_t done_num, uint64_t da= ta_ptr, int ret) " iommufd=3D%d id=3D%u data_type=3D%u entry_len=3D%u entry= _num=3D%u done_num=3D%u data_ptr=3D0x%"PRIx64" (%d)" --=20 2.47.1 From nobody Fri Nov 14 16:48:28 2025 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=1760689503; cv=none; d=zohomail.com; s=zohoarc; b=jqIGiD7nkTRV0RmgU0VTegbc+MeruvPmIB6+nge5vE7qfc7pkh/2Mr9hzfhuIMlXzJm3Rk5ZFDOoHcjWMfKsg0PUjehKMihSgUoWQyKP/2/lLHA7fWtz2xIPtrwFcOpZYzVhbEo5Uj4b5sw7BC2h715vm+nbFN0Pm3CUcA2zLrI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1760689503; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=cWshnJQMw4UHXCVrgXXfHKsxgsHOTwUBNyHQRvlSL6E=; b=GcZal2uA0jg5SEXpM0D3T7qTKhdWdSJ1Qxhpde/rFHRcuytOyRqqfUz0M2rmR6gFUCfnI0dA6jAznPC+FkwqVhnWG/OBUnjbjejzq0XAiCENG/IdX0iHKgYgckLwN+4eAI5TPCPZjF8N1hQxPKwV50JNNeKDX41Et0rrt3/+HhE= 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 1760689503460229.35906225624103; Fri, 17 Oct 2025 01:25:03 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1v9fkL-0001H9-SZ; Fri, 17 Oct 2025 04:23:33 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1v9fkF-0001GR-Qz for qemu-devel@nongnu.org; Fri, 17 Oct 2025 04:23:28 -0400 Received: from mgamail.intel.com ([192.198.163.19]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1v9fk3-0001DU-LW for qemu-devel@nongnu.org; Fri, 17 Oct 2025 04:23:27 -0400 Received: from orviesa007.jf.intel.com ([10.64.159.147]) by fmvoesa113.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Oct 2025 01:23:07 -0700 Received: from unknown (HELO gnr-sp-2s-612.sh.intel.com) ([10.112.230.229]) by orviesa007-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Oct 2025 01:23:04 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1760689396; x=1792225396; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=B8RsLZ8p+QijWO4o8Awavo9qU6AbRzyIRgV0bwow53E=; b=NXwjAYI4Bn4c4UKXO64u2WB8o62yu6LEJBAo4cUGF/8IV2Djczp9DYDb nAtgfTLZ/FpICcdSVNv5+Ejq2crEC2u5nrRh2pYFt6A+VmORBn3Mfowvg U/YDnrh7d1yVo/ZaAJsHkiBTIpQZxEopGIFceJcUV2LGmLO/26GdtE19S YRLwKvBt0rv5XPZx9cRikLoLi25FdGov3h/p1V2u3LbB6vrC1ANFF64/U PNFT0wvaXUl11Yyctu6qrYj8rynHKxnQ3nwBAfTTzKlwUrK/QS9GltPHY Nm+Yj6Ywl3JPODISDVGVNkfMPtczM0l9U4FCnjFH0ojJVTBDhGHnr39cf A==; X-CSE-ConnectionGUID: mXs+fq7wTCGGijaW0eQAmw== X-CSE-MsgGUID: FU5CeVyPRJOsu4f1N6uxTQ== X-IronPort-AV: E=McAfee;i="6800,10657,11584"; a="61927432" X-IronPort-AV: E=Sophos;i="6.19,234,1754982000"; d="scan'208";a="61927432" X-CSE-ConnectionGUID: omXMVP9kQN2LttWG4ivX0Q== X-CSE-MsgGUID: WnjumPZhSw2O/uozIhDAiw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.19,234,1754982000"; d="scan'208";a="182484700" From: Zhenzhong Duan To: qemu-devel@nongnu.org Cc: alex.williamson@redhat.com, clg@redhat.com, mst@redhat.com, jasowang@redhat.com, yi.l.liu@intel.com, clement.mathieu--drif@eviden.com, eric.auger@redhat.com, joao.m.martins@oracle.com, avihaih@nvidia.com, xudong.hao@intel.com, giovanni.cabiddu@intel.com, mark.gross@intel.com, arjan.van.de.ven@intel.com, Zhenzhong Duan Subject: [PATCH v2 6/8] intel_iommu: Fix unmap_bitmap failure with legacy VFIO backend Date: Fri, 17 Oct 2025 04:22:31 -0400 Message-ID: <20251017082234.517827-7-zhenzhong.duan@intel.com> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20251017082234.517827-1-zhenzhong.duan@intel.com> References: <20251017082234.517827-1-zhenzhong.duan@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.198.163.19; envelope-from=zhenzhong.duan@intel.com; helo=mgamail.intel.com X-Spam_score_int: -39 X-Spam_score: -4.0 X-Spam_bar: ---- X-Spam_report: (-4.0 / 5.0 requ) BAYES_00=-1.9, DKIM_INVALID=0.1, DKIM_SIGNED=0.1, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 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-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @intel.com) X-ZM-MESSAGEID: 1760689506063158500 Content-Type: text/plain; charset="utf-8" If a VFIO device in guest switches from IOMMU domain to block domain, vtd_address_space_unmap() is called to unmap whole address space. If that happens during migration, migration fails with legacy VFIO backend as below: Status: failed (vfio_container_dma_unmap(0x561bbbd92d90, 0x100000000000, 0x= 100000000000) =3D -7 (Argument list too long)) Because legacy VFIO limits maximum bitmap size to 256MB which maps to 8TB on 4K page system, when 16TB sized UNMAP notification is sent, unmap_bitmap ioctl fails. Fix it by iterating over DMAMap list to unmap each range with active mapping when migration is active. If migration is not active, unmapping the whole address space in one go is optimal. There is no such limitation with iommufd backend, but it's still not optimal to allocate large bitmap, e.g., there may be large hole between IOVA ranges, allocating large bitmap and dirty tracking on the hole is time consuming and useless work. Signed-off-by: Zhenzhong Duan Tested-by: Giovannio Cabiddu Reviewed-by: Yi Liu --- hw/i386/intel_iommu.c | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/hw/i386/intel_iommu.c b/hw/i386/intel_iommu.c index 6a168d5107..f32d4f5a15 100644 --- a/hw/i386/intel_iommu.c +++ b/hw/i386/intel_iommu.c @@ -37,6 +37,7 @@ #include "system/system.h" #include "hw/i386/apic_internal.h" #include "kvm/kvm_i386.h" +#include "migration/misc.h" #include "migration/vmstate.h" #include "trace.h" =20 @@ -4533,6 +4534,42 @@ static void vtd_dev_unset_iommu_device(PCIBus *bus, = void *opaque, int devfn) vtd_iommu_unlock(s); } =20 +/* + * Unmapping a large range in one go is not optimal during migration becau= se + * a large dirty bitmap needs to be allocated while there may be only small + * mappings, iterate over DMAMap list to unmap each range with active mapp= ing. + */ +static void vtd_address_space_unmap_in_migration(VTDAddressSpace *as, + IOMMUNotifier *n) +{ + const DMAMap *map; + const DMAMap target =3D { + .iova =3D n->start, + .size =3D n->end, + }; + IOVATree *tree =3D as->iova_tree; + + /* + * DMAMap is created during IOMMU page table sync, it's either 4KB or = huge + * page size and always a power of 2 in size. So the range of DMAMap c= ould + * be used for UNMAP notification directly. + */ + while ((map =3D iova_tree_find(tree, &target))) { + IOMMUTLBEvent event; + + event.type =3D IOMMU_NOTIFIER_UNMAP; + event.entry.iova =3D map->iova; + event.entry.addr_mask =3D map->size; + event.entry.target_as =3D &address_space_memory; + event.entry.perm =3D IOMMU_NONE; + /* This field is meaningless for unmap */ + event.entry.translated_addr =3D 0; + memory_region_notify_iommu_one(n, &event); + + iova_tree_remove(tree, *map); + } +} + /* Unmap the whole range in the notifier's scope. */ static void vtd_address_space_unmap(VTDAddressSpace *as, IOMMUNotifier *n) { @@ -4542,6 +4579,11 @@ static void vtd_address_space_unmap(VTDAddressSpace = *as, IOMMUNotifier *n) IntelIOMMUState *s =3D as->iommu_state; DMAMap map; =20 + if (migration_is_running()) { + vtd_address_space_unmap_in_migration(as, n); + return; + } + /* * Note: all the codes in this function has a assumption that IOVA * bits are no more than VTD_MGAW bits (which is restricted by --=20 2.47.1 From nobody Fri Nov 14 16:48:28 2025 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=1760689463; cv=none; d=zohomail.com; s=zohoarc; b=OeA968W1/eSyjI8YI8pTUlyBMBCfBM0ZphAW368iNG2Y7MNQqu28gaUCpmCpZJ9xhmwTBiNrHQtzV6mEl0pqemzdCiPTQzG5wjo5E0UbcrJ1dkWN7g5yFz2IdV30yNwGmgiRAySOJ1OBNZfaSjqv7d+fLv2/3LSoZRsrDQWBNg8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1760689463; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=gKFcWL3o3puVC1HzJi/4XkqTV7TamFyNKF8Aonb/Pgs=; b=bGRebMt9rdgDmQB6VVtJ0a3wk4Ef6eeHwZd6sFpP8i+3qHmiTOrZhMiYWLgISWZM+au80F3+RX9jB5yrDhj4tdB26rKgz8kcNcORFSNZIC/aYqtAbtCKiqovpXzddQz5ZBHNiBQPH6WJ0fIbltHGWCpVi8xYblXmlWueYeoXxbw= 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 1760689463329679.3764988525011; Fri, 17 Oct 2025 01:24:23 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1v9fkE-0001G1-LY; Fri, 17 Oct 2025 04:23:26 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1v9fkD-0001EX-4w for qemu-devel@nongnu.org; Fri, 17 Oct 2025 04:23:25 -0400 Received: from mgamail.intel.com ([192.198.163.19]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1v9fk6-0001BE-Pa for qemu-devel@nongnu.org; Fri, 17 Oct 2025 04:23:24 -0400 Received: from orviesa007.jf.intel.com ([10.64.159.147]) by fmvoesa113.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Oct 2025 01:23:11 -0700 Received: from unknown (HELO gnr-sp-2s-612.sh.intel.com) ([10.112.230.229]) by orviesa007-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Oct 2025 01:23:08 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1760689399; x=1792225399; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=tUFPPm29u+6P7k6wOoH03Z1NWisfoxackVYz0mSbGHQ=; b=URtNv5bpFVhnnGSETP8wJ0N2r+j1nZSdAUb6xGXNT/UIFfVtWFm1miKz Mt+h0mRlDEucQlHNGLSTbd5MwWpEHyEK4onFrDQen0JdXJxb74+ScLk4q MyW544DBbGC8OgldyDdkzFaILOqFLALucfzU+kO7YA+J5WIZrBDbpcitl GVVDjSeFAngyD+S7ZrsO/fklpQJnVzQpwxcmE1FK7hV70JHJZFcwmcBlr /Bv5RCxxMVppogFqdPXVdka1+1xMI8Z1n1RH4qZ+yZHxgD3esSSuBKGyL /QN9EgQ28pIVZNVciaHVB4MWii1l0YKW8Zhrf/6aTrFjlDYMmKD9FXXdQ A==; X-CSE-ConnectionGUID: uvs+V4a+Td6ZwW1vy4ou3A== X-CSE-MsgGUID: fOj7b+VyS6+PpnpY49aIkQ== X-IronPort-AV: E=McAfee;i="6800,10657,11584"; a="61927445" X-IronPort-AV: E=Sophos;i="6.19,234,1754982000"; d="scan'208";a="61927445" X-CSE-ConnectionGUID: 9F8DiyzSTX+ZDd1ZOgi34Q== X-CSE-MsgGUID: vIRPZ3ntSDekMMxIw+w/8Q== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.19,234,1754982000"; d="scan'208";a="182484706" From: Zhenzhong Duan To: qemu-devel@nongnu.org Cc: alex.williamson@redhat.com, clg@redhat.com, mst@redhat.com, jasowang@redhat.com, yi.l.liu@intel.com, clement.mathieu--drif@eviden.com, eric.auger@redhat.com, joao.m.martins@oracle.com, avihaih@nvidia.com, xudong.hao@intel.com, giovanni.cabiddu@intel.com, mark.gross@intel.com, arjan.van.de.ven@intel.com, Zhenzhong Duan Subject: [PATCH v2 7/8] vfio/migration: Add migration blocker if VM memory is too large to cause unmap_bitmap failure Date: Fri, 17 Oct 2025 04:22:32 -0400 Message-ID: <20251017082234.517827-8-zhenzhong.duan@intel.com> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20251017082234.517827-1-zhenzhong.duan@intel.com> References: <20251017082234.517827-1-zhenzhong.duan@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.198.163.19; envelope-from=zhenzhong.duan@intel.com; helo=mgamail.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, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 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-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @intel.com) X-ZM-MESSAGEID: 1760689469198154100 Content-Type: text/plain; charset="utf-8" With default config, kernel VFIO type1 driver limits dirty bitmap to 256MB for unmap_bitmap ioctl so the maximum guest memory region is no more than 8TB size for the ioctl to succeed. Be conservative here to limit total guest memory to 8TB or else add a migration blocker. IOMMUFD backend doesn't have such limit, one can use IOMMUFD backed device if there is a need to migration such large VM. Suggested-by: Yi Liu Signed-off-by: Zhenzhong Duan --- hw/vfio/migration.c | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/hw/vfio/migration.c b/hw/vfio/migration.c index 4c06e3db93..1106ca7857 100644 --- a/hw/vfio/migration.c +++ b/hw/vfio/migration.c @@ -16,6 +16,7 @@ #include =20 #include "system/runstate.h" +#include "hw/boards.h" #include "hw/vfio/vfio-device.h" #include "hw/vfio/vfio-migration.h" #include "migration/misc.h" @@ -1152,6 +1153,35 @@ static bool vfio_viommu_preset(VFIODevice *vbasedev) return vbasedev->bcontainer->space->as !=3D &address_space_memory; } =20 +static bool vfio_dirty_tracking_exceed_limit(VFIODevice *vbasedev) +{ + VFIOContainer *bcontainer =3D vbasedev->bcontainer; + uint64_t max_size, page_size; + + if (!object_dynamic_cast(OBJECT(bcontainer), TYPE_VFIO_IOMMU_LEGACY)) { + return false; + } + + if (!bcontainer->dirty_pages_supported) { + return true; + } + /* + * VFIO type1 driver has a limitation of bitmap size on unmap_bitmap + * ioctl(), calculate the limit and compare with guest memory size to + * catch dirty tracking failure early. + * + * This limit is 8TB with default kernel and QEMU config, we are a bit + * conservative here as VM memory layout may be nonconsecutive or VM + * can run with vIOMMU enabled so the limitation could be relaxed. One + * can also switch to use IOMMUFD backend if there is a need to migrate + * large VM. + */ + page_size =3D 1 << ctz64(bcontainer->dirty_pgsizes); + max_size =3D bcontainer->max_dirty_bitmap_size * BITS_PER_BYTE * page_= size; + + return current_machine->ram_size > max_size; +} + /* * Return true when either migration initialized or blocker registered. * Currently only return false when adding blocker fails which will @@ -1208,6 +1238,13 @@ bool vfio_migration_realize(VFIODevice *vbasedev, Er= ror **errp) goto add_blocker; } =20 + if (vfio_dirty_tracking_exceed_limit(vbasedev)) { + error_setg(&err, "%s: Migration is currently not supported with " + "large memory VM due to dirty tracking limitation in " + "VFIO type1 driver", vbasedev->name); + goto add_blocker; + } + trace_vfio_migration_realize(vbasedev->name); return true; =20 --=20 2.47.1 From nobody Fri Nov 14 16:48:28 2025 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=1760689462; cv=none; d=zohomail.com; s=zohoarc; b=f/dykt5mbBk2quidutH+/zRklB7p3h+1cO86vQK904llQ7AulaeRFmIMz7izXZx80QWlyIsxxFnw8b+r6AXxmcKa1IUP7fMRAUVc4qCiGckG6P0glUCUXTr6+h7hZTinxtoHOfOK+vFNrUMVZ0ENU+WCNdt+qx6IluzyxYNK4CI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1760689462; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=q9B8APZsttFPlH1DcF/vvAA5WO2pThWWDhCtAnK5d38=; b=eP4+WAIIbv2bBnrbwGscmfdOBf5M1mAOjQN2oVY8ZPD1Umo/XcZG9KGZTIk3dVkfVocPgrseHVxKsCnauACS/3GW5HkZaaowHYBpcBJ0uFaujqfDqiFVFThpyf01iG4dZrymCExNY+G8sijUpjfITF6BfyccfMAt0mXiTMxoDyg= 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 1760689462354471.04723617912316; Fri, 17 Oct 2025 01:24:22 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1v9fkJ-0001Gu-9M; Fri, 17 Oct 2025 04:23:31 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1v9fkF-0001GG-2Q for qemu-devel@nongnu.org; Fri, 17 Oct 2025 04:23:27 -0400 Received: from mgamail.intel.com ([192.198.163.19]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1v9fkA-0001D4-Ta for qemu-devel@nongnu.org; Fri, 17 Oct 2025 04:23:26 -0400 Received: from orviesa007.jf.intel.com ([10.64.159.147]) by fmvoesa113.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Oct 2025 01:23:15 -0700 Received: from unknown (HELO gnr-sp-2s-612.sh.intel.com) ([10.112.230.229]) by orviesa007-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Oct 2025 01:23:12 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1760689403; x=1792225403; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=99JHrZ3heZiFx9ybLFmQo2l6rqpitP2LQYczzzOLO+I=; b=Z753gYkan03nUSyAgPmdW1dfycNAGouhlUotOgl2f3hsZ9wRiPUUrWkU STJSqrX+PvlXAUavaNfrjsRdJW0NvXYnZL7D7ysK3Mc8IxJ4frEQJtA+k 6cmDrWHewY5v9TEfo51S05f6liHOQjEQ9P+EZF+beIP+fbN5MCVl3ygyO e9bRcQJ0y6wo8XoScwFS5tPeS77YV8QGUQKtur7QvZgyaMnUNIs6uXrAX 4htJ95XBsU/PlGPdTQWerbGDZDkeBWOr05S2C0TxloTieNdbBDlQqQfYw Cdeg0y1ZEBsnHo7za/RVkg9uz5D2XOesyUpwjJmbCMMAJ1Nm6Yd9fFGVC A==; X-CSE-ConnectionGUID: Bq8R23JMRlOkkbVXUTgQ4g== X-CSE-MsgGUID: pOT9nlNySCyS1D3b/eF1XQ== X-IronPort-AV: E=McAfee;i="6800,10657,11584"; a="61927454" X-IronPort-AV: E=Sophos;i="6.19,234,1754982000"; d="scan'208";a="61927454" X-CSE-ConnectionGUID: ryH0PFVBSSadMP7NOa4gTg== X-CSE-MsgGUID: FFrA1QNlRYq7Pf3e3PVZ4g== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.19,234,1754982000"; d="scan'208";a="182484709" From: Zhenzhong Duan To: qemu-devel@nongnu.org Cc: alex.williamson@redhat.com, clg@redhat.com, mst@redhat.com, jasowang@redhat.com, yi.l.liu@intel.com, clement.mathieu--drif@eviden.com, eric.auger@redhat.com, joao.m.martins@oracle.com, avihaih@nvidia.com, xudong.hao@intel.com, giovanni.cabiddu@intel.com, mark.gross@intel.com, arjan.van.de.ven@intel.com, Zhenzhong Duan , Jason Zeng Subject: [PATCH v2 8/8] vfio/migration: Allow live migration with vIOMMU without VFs using device dirty tracking Date: Fri, 17 Oct 2025 04:22:33 -0400 Message-ID: <20251017082234.517827-9-zhenzhong.duan@intel.com> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20251017082234.517827-1-zhenzhong.duan@intel.com> References: <20251017082234.517827-1-zhenzhong.duan@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.198.163.19; envelope-from=zhenzhong.duan@intel.com; helo=mgamail.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, 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_MED=-2.3, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 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-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @intel.com) X-ZM-MESSAGEID: 1760689469807158500 Content-Type: text/plain; charset="utf-8" Commit e46883204c38 ("vfio/migration: Block migration with vIOMMU") introduces a migration blocker when vIOMMU is enabled, because we need to calculate the IOVA ranges for device dirty tracking. But this is unnecessary for iommu dirty tracking. Limit the vfio_viommu_preset() check to those devices which use device dirty tracking. This allows live migration with VFIO devices which use iommu dirty tracking. Introduce a helper vfio_device_dirty_pages_disabled() to facilicate it. Suggested-by: Jason Zeng Co-developed-by: Joao Martins Signed-off-by: Joao Martins Signed-off-by: Zhenzhong Duan Tested-by: Xudong Hao Tested-by: Giovannio Cabiddu Reviewed-by: Yi Liu --- include/hw/vfio/vfio-device.h | 10 ++++++++++ hw/vfio/container.c | 5 +---- hw/vfio/device.c | 6 ++++++ hw/vfio/migration.c | 6 +++--- 4 files changed, 20 insertions(+), 7 deletions(-) diff --git a/include/hw/vfio/vfio-device.h b/include/hw/vfio/vfio-device.h index 7e9aed6d3c..feda521514 100644 --- a/include/hw/vfio/vfio-device.h +++ b/include/hw/vfio/vfio-device.h @@ -148,6 +148,16 @@ bool vfio_device_irq_set_signaling(VFIODevice *vbasede= v, int index, int subindex =20 void vfio_device_reset_handler(void *opaque); bool vfio_device_is_mdev(VFIODevice *vbasedev); +/** + * vfio_device_dirty_pages_disabled: Check if device dirty tracking will be + * used for a VFIO device + * + * @vbasedev: The VFIODevice to transform + * + * Return: true if either @vbasedev doesn't support device dirty tracking = or + * is forcedly disabled from command line, otherwise false. + */ +bool vfio_device_dirty_pages_disabled(VFIODevice *vbasedev); bool vfio_device_hiod_create_and_realize(VFIODevice *vbasedev, const char *typename, Error **err= p); bool vfio_device_attach(char *name, VFIODevice *vbasedev, diff --git a/hw/vfio/container.c b/hw/vfio/container.c index 7706603c1c..8879da78c8 100644 --- a/hw/vfio/container.c +++ b/hw/vfio/container.c @@ -178,10 +178,7 @@ bool vfio_container_devices_dirty_tracking_is_supporte= d( VFIODevice *vbasedev; =20 QLIST_FOREACH(vbasedev, &bcontainer->device_list, container_next) { - if (vbasedev->device_dirty_page_tracking =3D=3D ON_OFF_AUTO_OFF) { - return false; - } - if (!vbasedev->dirty_pages_supported) { + if (vfio_device_dirty_pages_disabled(vbasedev)) { return false; } } diff --git a/hw/vfio/device.c b/hw/vfio/device.c index 64f8750389..837872387f 100644 --- a/hw/vfio/device.c +++ b/hw/vfio/device.c @@ -400,6 +400,12 @@ bool vfio_device_is_mdev(VFIODevice *vbasedev) return subsys && (strcmp(subsys, "/sys/bus/mdev") =3D=3D 0); } =20 +bool vfio_device_dirty_pages_disabled(VFIODevice *vbasedev) +{ + return (!vbasedev->dirty_pages_supported || + vbasedev->device_dirty_page_tracking =3D=3D ON_OFF_AUTO_OFF); +} + bool vfio_device_hiod_create_and_realize(VFIODevice *vbasedev, const char *typename, Error **err= p) { diff --git a/hw/vfio/migration.c b/hw/vfio/migration.c index 1106ca7857..1093857a34 100644 --- a/hw/vfio/migration.c +++ b/hw/vfio/migration.c @@ -1213,8 +1213,7 @@ bool vfio_migration_realize(VFIODevice *vbasedev, Err= or **errp) return !vfio_block_migration(vbasedev, err, errp); } =20 - if ((!vbasedev->dirty_pages_supported || - vbasedev->device_dirty_page_tracking =3D=3D ON_OFF_AUTO_OFF) && + if (vfio_device_dirty_pages_disabled(vbasedev) && !vbasedev->iommu_dirty_tracking) { if (vbasedev->enable_migration =3D=3D ON_OFF_AUTO_AUTO) { error_setg(&err, @@ -1232,7 +1231,8 @@ bool vfio_migration_realize(VFIODevice *vbasedev, Err= or **errp) goto out_deinit; } =20 - if (vfio_viommu_preset(vbasedev)) { + if (!vfio_device_dirty_pages_disabled(vbasedev) && + vfio_viommu_preset(vbasedev)) { error_setg(&err, "%s: Migration is currently not supported " "with vIOMMU enabled", vbasedev->name); goto add_blocker; --=20 2.47.1