From nobody Sun Sep 28 17:40:19 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=1757471987; cv=none; d=zohomail.com; s=zohoarc; b=m+rtF73m3E7+KKHug1cVLCo1G+XAjCJhF6Az7ywsVXGoVmAjq0JhHQWdVVwRqXyX63Lm6oC3NK+slx3ZO6xlrW9ADDoEQ2+W452c0kyssQC2SgCr1Iab6uTGXLTRuAVLXiGdBaSa37vtC0L9/J6jBAUez4kp5BlPdcVS4ute9BE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1757471987; 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=aT1zRy9Tfyh9DmjKax35LCoRE4EN9fwkOxx8hsTZnBM=; b=fr1X5H2NmYjS/zSlfQFB7qNk//oDHD1oah2POyrpI6/8bWMekPslySvF1jb5IItaH5L0sP7EooRQFrRT+VFawdFW/C+4yavL7JHQEvB/SiHlmj3qi15S7V2gbtuFMJPqtgEGzelo+Y9rz4HeRbNEQ7Tzsn6tRhzZM6pGoX4B2tM= 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 1757471987176818.575367227245; Tue, 9 Sep 2025 19:39:47 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uwAib-00070g-RK; Tue, 09 Sep 2025 22:37:57 -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 1uwAiZ-0006zr-N4 for qemu-devel@nongnu.org; Tue, 09 Sep 2025 22:37:55 -0400 Received: from mgamail.intel.com ([192.198.163.13]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uwAiO-0005fl-Pc for qemu-devel@nongnu.org; Tue, 09 Sep 2025 22:37:55 -0400 Received: from fmviesa002.fm.intel.com ([10.60.135.142]) by fmvoesa107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 09 Sep 2025 19:37:34 -0700 Received: from unknown (HELO gnr-sp-2s-612.sh.intel.com) ([10.112.230.229]) by fmviesa002-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 09 Sep 2025 19:37:31 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1757471864; x=1789007864; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=IDytYjxDTRyFHmWdI60FpD+xs5DrtvuV9RPonrF1C40=; b=P1qni6c1J0HA+zTmVqgw3W/ZMADQIaZx5tiMjL+epPcpQI4epCdSTb7s a3aGIEielW4tjVQkvEgxxVKMHvGRhIDVFO59Vnd/sMV8PyCxk/WY1ifvm IWbIQ4o0ZXEpJ3GGRyO7InrHGDJxm0z3/9hU/N4/0naXEbwX9skRhg0+e Ho5RNXyjZgIiEkBadgu761/ijsFbAhrUyBADib9fSfPbGxXasf2qnoJgK 65SCYYu9fjrk8tTkbqui5o7C5wVmvrJnBNUj1IREjfqcM/NVpWjrgHACF HHul58p+m0ix3abbk7nMBGMFt51Zsj2LfFkaKhgjQHqikA6JPFOCPRL2B w==; X-CSE-ConnectionGUID: is8t5F9WTQ2GOt19ufdP8Q== X-CSE-MsgGUID: OJSPUJ4RQCmvzozuYMsYXg== X-IronPort-AV: E=McAfee;i="6800,10657,11548"; a="62402788" X-IronPort-AV: E=Sophos;i="6.18,253,1751266800"; d="scan'208";a="62402788" X-CSE-ConnectionGUID: emAKSSdbRiuTZK0Mr0FSkQ== X-CSE-MsgGUID: Pgv23ujORpGp4heygaemaw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.18,253,1751266800"; d="scan'208";a="196930557" 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 1/5] vfio/iommufd: Add framework code to support getting dirty bitmap before unmap Date: Tue, 9 Sep 2025 22:36:57 -0400 Message-ID: <20250910023701.244356-2-zhenzhong.duan@intel.com> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250910023701.244356-1-zhenzhong.duan@intel.com> References: <20250910023701.244356-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.13; 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_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_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: 1757471990384124100 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_one() 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 --- hw/vfio/iommufd.c | 56 +++++++++++++++++++++++++++++++++++++---------- 1 file changed, 45 insertions(+), 11 deletions(-) diff --git a/hw/vfio/iommufd.c b/hw/vfio/iommufd.c index 48c590b6a9..b5d6e54c45 100644 --- a/hw/vfio/iommufd.c +++ b/hw/vfio/iommufd.c @@ -58,33 +58,67 @@ static int iommufd_cdev_map_file(const VFIOContainerBas= e *bcontainer, iova, size, fd, start, readonly); } =20 -static int iommufd_cdev_unmap(const VFIOContainerBase *bcontainer, - hwaddr iova, ram_addr_t size, - IOMMUTLBEntry *iotlb, bool unmap_all) +static int iommufd_cdev_unmap_one(const VFIOContainerBase *bcontainer, + hwaddr iova, ram_addr_t size, + IOMMUTLBEntry *iotlb) { const VFIOIOMMUFDContainer *container =3D container_of(bcontainer, VFIOIOMMUFDContainer, bcontainer); + bool need_dirty_sync =3D false; + Error *local_err =3D NULL; + IOMMUFDBackend *be =3D container->be; + uint32_t ioas_id =3D container->ioas_id; + int ret; + + 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; + } =20 + 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; +} + +static int iommufd_cdev_unmap(const VFIOContainerBase *bcontainer, + hwaddr iova, ram_addr_t size, + IOMMUTLBEntry *iotlb, bool unmap_all) +{ /* unmap in halves */ if (unmap_all) { Int128 llsize =3D int128_rshift(int128_2_64(), 1); int ret; =20 - ret =3D iommufd_backend_unmap_dma(container->be, container->ioas_i= d, - 0, int128_get64(llsize)); + ret =3D iommufd_cdev_unmap_one(bcontainer, 0, int128_get64(llsize), + iotlb); =20 if (ret =3D=3D 0) { - ret =3D iommufd_backend_unmap_dma(container->be, container->io= as_id, - int128_get64(llsize), - int128_get64(llsize)); + ret =3D iommufd_cdev_unmap_one(bcontainer, int128_get64(llsize= ), + int128_get64(llsize), iotlb); } =20 return ret; } =20 - /* TODO: Handle dma_unmap_bitmap with iotlb args (migration) */ - return iommufd_backend_unmap_dma(container->be, - container->ioas_id, iova, size); + return iommufd_cdev_unmap_one(bcontainer, iova, size, iotlb); } =20 static bool iommufd_cdev_kvm_device_add(VFIODevice *vbasedev, Error **errp) --=20 2.47.1