It is a workaround of current KVM's KVM_UNREGISTER_COALESCED_MMIO
interface. The kernel interface only allows to unregister an mmio
device with exactly the zone size when registered, or any smaller zone
that is included in the device mmio zone. It does not support the
userspace to specify a very large zone to remove all the small mmio
devices within the zone covered.
Logically speaking it would be nicer to fix this from KVM side, though
in all cases we still need to coop with old kernels so let's do this.
This patch has nothing to do with 3ac7d43a6fbb5d4a3 because this is
probably broken from the very beginning when the
KVM_UNREGISTER_COALESCED_MMIO interface is introduced in kernel.
However to make the backport to stables easier, I'm still using the
commit 3ac7d43a6fbb5d4a3 to track this problem because this will
depend on that otherwise even additions of mmio devices won't work.
Fixes: 3ac7d43a6fbb5d4a3
Signed-off-by: Peter Xu <pet...@redhat.com>
---
memory.c | 30 +++++++++++++++++++++++++++---
1 file changed, 27 insertions(+), 3 deletions(-)
diff --git a/memory.c b/memory.c
index 1a2b465a96..b24cdd13cf 100644
--- a/memory.c
+++ b/memory.c
@@ -864,6 +864,9 @@ static void address_space_update_ioeventfds(AddressSpace
*as)
static void flat_range_coalesced_io_del(FlatRange *fr, AddressSpace *as)
{
+ CoalescedMemoryRange *cmr;
+ AddrRange tmp;
+
if (QTAILQ_EMPTY(&fr->mr->coalesced)) {
return;
}
@@ -874,9 +877,30 @@ static void flat_range_coalesced_io_del(FlatRange *fr,
AddressSpace *as)
fr->coalesced_mmio_del_done = true;
- MEMORY_LISTENER_UPDATE_REGION(fr, as, Reverse, coalesced_io_del,
- int128_get64(fr->addr.start),
- int128_get64(fr->addr.size));
+ /*
+ * We split the big region into smaller ones to satisfy KVM's
+ * KVM_UNREGISTER_COALESCED_MMIO interface, where it does not
+ * allow to specify a large region to unregister all the devices
+ * under that zone instead it only accepts exact zones or even a
+ * smaller zone of previously registered mmio device. Logically
+ * speaking we should better fix KVM to allow the userspace to
+ * unregister multiple mmio devices within a large requested zone,
+ * but in all cases we'll still need to live with old kernels. So
+ * let's simply break the zones into exactly the small pieces when
+ * we do coalesced_io_add().
+ */
+ QTAILQ_FOREACH(cmr, &fr->mr->coalesced, link) {
+ tmp = addrrange_shift(cmr->addr,
+ int128_sub(fr->addr.start,
+ int128_make64(fr->offset_in_region)));
+ if (!addrrange_intersects(tmp, fr->addr)) {
+ continue;
+ }
+ tmp = addrrange_intersection(tmp, fr->addr);
+ MEMORY_LISTENER_UPDATE_REGION(fr, as, Reverse, coalesced_io_del,
+ int128_get64(tmp.start),
+ int128_get64(tmp.size));
+ }
}
static void flat_range_coalesced_io_add(FlatRange *fr, AddressSpace *as)
--
2.21.0
