72 lines
2.6 KiB
Diff
72 lines
2.6 KiB
Diff
|
From 5a49c5bb690d55fc88b6fb12f059ae932de0a716 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Zhenzhong Duan <zhenzhong.duan@intel.com>
|
||
|
|
Date: Tue, 21 Nov 2023 16:44:04 +0800
|
||
|
|
Subject: [PATCH 025/101] vfio/iommufd: Relax assert check for iommufd backend
|
||
|
|
MIME-Version: 1.0
|
||
|
|
Content-Type: text/plain; charset=UTF-8
|
||
|
|
Content-Transfer-Encoding: 8bit
|
||
|
|
|
||
|
|
RH-Author: Eric Auger <eric.auger@redhat.com>
|
||
|
|
RH-MergeRequest: 211: IOMMUFD backend backport
|
||
|
|
RH-Jira: RHEL-19302 RHEL-21057
|
||
|
|
RH-Acked-by: Cédric Le Goater <clg@redhat.com>
|
||
|
|
RH-Acked-by: Sebastian Ott <sebott@redhat.com>
|
||
|
|
RH-Commit: [24/67] 2c9e41e9ca0b67ebf807d1643a98866a0cb75768 (eauger1/centos-qemu-kvm)
|
||
|
|
|
||
|
|
Currently iommufd doesn't support dirty page sync yet,
|
||
|
|
but it will not block us doing live migration if VFIO
|
||
|
|
migration is force enabled.
|
||
|
|
|
||
|
|
So in this case we allow set_dirty_page_tracking to be NULL.
|
||
|
|
Note we don't need same change for query_dirty_bitmap because
|
||
|
|
when dirty page sync isn't supported, query_dirty_bitmap will
|
||
|
|
never be called.
|
||
|
|
|
||
|
|
Suggested-by: Cédric Le Goater <clg@redhat.com>
|
||
|
|
Signed-off-by: Zhenzhong Duan <zhenzhong.duan@intel.com>
|
||
|
|
Reviewed-by: Cédric Le Goater <clg@redhat.com>
|
||
|
|
Reviewed-by: Eric Auger <eric.auger@redhat.com>
|
||
|
|
Tested-by: Eric Auger <eric.auger@redhat.com>
|
||
|
|
Tested-by: Nicolin Chen <nicolinc@nvidia.com>
|
||
|
|
Signed-off-by: Cédric Le Goater <clg@redhat.com>
|
||
|
|
(cherry picked from commit 36e84d0c17102fa1c887d8c650a13ec08fca0ec0)
|
||
|
|
Signed-off-by: Eric Auger <eric.auger@redhat.com>
|
||
|
|
---
|
||
|
|
hw/vfio/container-base.c | 4 ++++
|
||
|
|
hw/vfio/container.c | 4 ----
|
||
|
|
2 files changed, 4 insertions(+), 4 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/hw/vfio/container-base.c b/hw/vfio/container-base.c
|
||
|
|
index 71f7274973..eee2dcfe76 100644
|
||
|
|
--- a/hw/vfio/container-base.c
|
||
|
|
+++ b/hw/vfio/container-base.c
|
||
|
|
@@ -55,6 +55,10 @@ void vfio_container_del_section_window(VFIOContainerBase *bcontainer,
|
||
|
|
int vfio_container_set_dirty_page_tracking(VFIOContainerBase *bcontainer,
|
||
|
|
bool start)
|
||
|
|
{
|
||
|
|
+ if (!bcontainer->dirty_pages_supported) {
|
||
|
|
+ return 0;
|
||
|
|
+ }
|
||
|
|
+
|
||
|
|
g_assert(bcontainer->ops->set_dirty_page_tracking);
|
||
|
|
return bcontainer->ops->set_dirty_page_tracking(bcontainer, start);
|
||
|
|
}
|
||
|
|
diff --git a/hw/vfio/container.c b/hw/vfio/container.c
|
||
|
|
index 6bacf38222..ed2d721b2b 100644
|
||
|
|
--- a/hw/vfio/container.c
|
||
|
|
+++ b/hw/vfio/container.c
|
||
|
|
@@ -216,10 +216,6 @@ static int vfio_legacy_set_dirty_page_tracking(VFIOContainerBase *bcontainer,
|
||
|
|
.argsz = sizeof(dirty),
|
||
|
|
};
|
||
|
|
|
||
|
|
- if (!bcontainer->dirty_pages_supported) {
|
||
|
|
- return 0;
|
||
|
|
- }
|
||
|
|
-
|
||
|
|
if (start) {
|
||
|
|
dirty.flags = VFIO_IOMMU_DIRTY_PAGES_FLAG_START;
|
||
|
|
} else {
|
||
|
|
--
|
||
|
|
2.39.3
|
||
|
|
|