From nobody Sun Dec 14 02:14:14 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=1754626194; cv=none; d=zohomail.com; s=zohoarc; b=aT7PuIlQPK+/2P3t1c1LYN/q6mHsQOQpfGXwxYafnDZ7tPQeBh5kTHJwmZYVJgSI5APMFge17B99t6wkLKzZI6mvAyjiUlClZTm2107vUjLLNPin2nIKMhSEdRzwwrp/FcEjbbZh4SUWCJ4FBfO91kC7lUm+3NU/eh5mYy15yoE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1754626194; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=Z3ECnT+kh0zGB+A4+7sZktVJcbnWIrk145ounjM3iXI=; b=m1pjVk9gQ37ouTAY7L+94a3Gsu6P+amphWVL5pcCScByavrwEdoQOPM09A4h40nd+6gc3rMUsaWH9Xnoo4RyHFArYm0BJk/bwDrmsSsJkT10ZytAkSZiRDMrpRiNy6tVeuVle+g3tSy4847l37RSje86qU6UYj3T4Z6mP56IzvY= 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 1754626194495808.0538818535341; Thu, 7 Aug 2025 21:09:54 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ukEQH-0004u1-Qm; Fri, 08 Aug 2025 00:09:41 -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 1ukEQD-0004eP-1i for qemu-devel@nongnu.org; Fri, 08 Aug 2025 00:09:37 -0400 Received: from mgamail.intel.com ([192.198.163.9]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ukEQB-0001Bo-0P for qemu-devel@nongnu.org; Fri, 08 Aug 2025 00:09:36 -0400 Received: from orviesa007.jf.intel.com ([10.64.159.147]) by fmvoesa103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 07 Aug 2025 21:09:31 -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; 07 Aug 2025 21:09:30 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1754626175; x=1786162175; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=xSUtEfTsL+H3cTGiHvaDa44K2TBtSyViTSdD4eoF76E=; b=KoJ8lZYRnm7pUx3S7vTrsCsZNzMiRZydvnqeRekgS4huQTZFGQeL3no3 cTJUjVy7/oTjIap8IVH0oYu1TIJnuigtfy8Ge9MQwbvsqp43IOPqMENDN Dol76VQcK//yovxiC8eO5OorqoAfF1Fevujqld96OuC0KTbLsk7gvw0aO hQVLY42CjVTbJ28kO3FdHM8RYMl78DHPKLgHsVjbtMH4cPJQRU0aCu8M3 KsUfDh6/U019jZ4VbEKPummD9JYaAUOLdMK8Om15e6sihqghsNuhNZLC3 3y6yZ/bhE56TDXD9+Py+/U4jZK7NOPOY7BStqiiOcXGv6lnBG8gE2kRoH A==; X-CSE-ConnectionGUID: rGVvXrUcR7KLJlZWRP0AXQ== X-CSE-MsgGUID: LHVIo4XyRbChtBxkvQMPoQ== X-IronPort-AV: E=McAfee;i="6800,10657,11514"; a="67669043" X-IronPort-AV: E=Sophos;i="6.17,274,1747724400"; d="scan'208";a="67669043" X-CSE-ConnectionGUID: W9wHz2WiTKS1DpHVlG01gg== X-CSE-MsgGUID: O7MZKLNeTeeI/A/+lQAorg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.17,274,1747724400"; d="scan'208";a="165253556" From: Zhenzhong Duan To: qemu-devel@nongnu.org Cc: alex.williamson@redhat.com, clg@redhat.com, eric.auger@redhat.com, mst@redhat.com, jasowang@redhat.com, joao.m.martins@oracle.com, Zhenzhong Duan Subject: [PATCH] vfio: Allow live migration with VFIO devices which use iommu dirty tracking Date: Fri, 8 Aug 2025 00:09:14 -0400 Message-ID: <20250808040914.19837-1-zhenzhong.duan@intel.com> X-Mailer: git-send-email 2.47.1 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.9; 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: 1754626196394124100 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. Signed-off-by: Zhenzhong Duan --- include/hw/vfio/vfio-device.h | 10 ++++++++++ hw/vfio/container-base.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 6e4d5ccdac..0c663a49d5 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-base.c b/hw/vfio/container-base.c index 56304978e1..39c88812f8 100644 --- a/hw/vfio/container-base.c +++ b/hw/vfio/container-base.c @@ -177,10 +177,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 08f12ac31f..7a5f249826 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 4c06e3db93..810a5cb157 100644 --- a/hw/vfio/migration.c +++ b/hw/vfio/migration.c @@ -1183,8 +1183,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, @@ -1202,7 +1201,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