aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZenghui Yu <yuzenghui@huawei.com>2020-11-16 21:22:10 +0800
committerPaolo Bonzini <pbonzini@redhat.com>2020-11-16 13:22:25 -0500
commit1370d61ae3c9934861d2349349447605202f04e9 (patch)
treeb3806f1b4dd09986a734816267858bc6feb18d9b
parent42ccce19818e4e8fb55026f50b20d533cccc48f6 (diff)
downloadqemu-1370d61ae3c9934861d2349349447605202f04e9.zip
qemu-1370d61ae3c9934861d2349349447605202f04e9.tar.gz
qemu-1370d61ae3c9934861d2349349447605202f04e9.tar.bz2
memory: Skip dirty tracking for un-migratable memory regions
It makes no sense to track dirty pages for those un-migratable memory regions (e.g., Memory BAR region of the VFIO PCI device) and doing so will potentially lead to some unpleasant issues during migration [1]. Skip dirty tracking for those regions by evaluating if the region is migratable before setting dirty_log_mask (DIRTY_MEMORY_MIGRATION). [1] https://lists.gnu.org/archive/html/qemu-devel/2020-11/msg03757.html Signed-off-by: Zenghui Yu <yuzenghui@huawei.com> Message-Id: <20201116132210.1730-1-yuzenghui@huawei.com> Reviewed-by: Cornelia Huck <cohuck@redhat.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
-rw-r--r--softmmu/memory.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/softmmu/memory.c b/softmmu/memory.c
index 71951fe..aa393f1 100644
--- a/softmmu/memory.c
+++ b/softmmu/memory.c
@@ -1806,7 +1806,10 @@ bool memory_region_is_ram_device(MemoryRegion *mr)
uint8_t memory_region_get_dirty_log_mask(MemoryRegion *mr)
{
uint8_t mask = mr->dirty_log_mask;
- if (global_dirty_log && (mr->ram_block || memory_region_is_iommu(mr))) {
+ RAMBlock *rb = mr->ram_block;
+
+ if (global_dirty_log && ((rb && qemu_ram_is_migratable(rb)) ||
+ memory_region_is_iommu(mr))) {
mask |= (1 << DIRTY_MEMORY_MIGRATION);
}
return mask;