[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 14/23] memory: manage coalesced mmio via a Memory
From: |
Avi Kivity |
Subject: |
[Qemu-devel] [PATCH v3 14/23] memory: manage coalesced mmio via a MemoryListener |
Date: |
Tue, 9 Oct 2012 18:32:39 +0200 |
Instead of calling a global function on coalesced mmio changes, which
routes the call to kvm if enabled, add coalesced mmio hooks to
MemoryListener and make kvm use that instead.
The motivation is support for multiple address spaces (which means we
we need to filter the call on the right address space) but the result
is cleaner as well.
Signed-off-by: Avi Kivity <address@hidden>
---
exec.c | 13 -------------
kvm-all.c | 20 ++++++++++----------
kvm-stub.c | 10 ----------
kvm.h | 2 --
memory.c | 17 +++++++++++++----
memory.h | 4 ++++
6 files changed, 27 insertions(+), 39 deletions(-)
diff --git a/exec.c b/exec.c
index a16c6b4..2ee0f89 100644
--- a/exec.c
+++ b/exec.c
@@ -2313,19 +2313,6 @@ void
cpu_register_physical_memory_log(MemoryRegionSection *section,
}
}
-
-void qemu_register_coalesced_mmio(target_phys_addr_t addr, ram_addr_t size)
-{
- if (kvm_enabled())
- kvm_coalesce_mmio_region(addr, size);
-}
-
-void qemu_unregister_coalesced_mmio(target_phys_addr_t addr, ram_addr_t size)
-{
- if (kvm_enabled())
- kvm_uncoalesce_mmio_region(addr, size);
-}
-
void qemu_flush_coalesced_mmio_buffer(void)
{
if (kvm_enabled())
diff --git a/kvm-all.c b/kvm-all.c
index 46cf7e9..0a3c4ae 100644
--- a/kvm-all.c
+++ b/kvm-all.c
@@ -454,9 +454,10 @@ static int
kvm_physical_sync_dirty_bitmap(MemoryRegionSection *section)
return ret;
}
-int kvm_coalesce_mmio_region(target_phys_addr_t start, ram_addr_t size)
+static void kvm_coalesce_mmio_region(MemoryListener *listener,
+ MemoryRegionSection *secion,
+ target_phys_addr_t start, ram_addr_t size)
{
- int ret = -ENOSYS;
KVMState *s = kvm_state;
if (s->coalesced_mmio) {
@@ -466,15 +467,14 @@ int kvm_coalesce_mmio_region(target_phys_addr_t start,
ram_addr_t size)
zone.size = size;
zone.pad = 0;
- ret = kvm_vm_ioctl(s, KVM_REGISTER_COALESCED_MMIO, &zone);
+ (void)kvm_vm_ioctl(s, KVM_REGISTER_COALESCED_MMIO, &zone);
}
-
- return ret;
}
-int kvm_uncoalesce_mmio_region(target_phys_addr_t start, ram_addr_t size)
+static void kvm_uncoalesce_mmio_region(MemoryListener *listener,
+ MemoryRegionSection *secion,
+ target_phys_addr_t start, ram_addr_t
size)
{
- int ret = -ENOSYS;
KVMState *s = kvm_state;
if (s->coalesced_mmio) {
@@ -484,10 +484,8 @@ int kvm_uncoalesce_mmio_region(target_phys_addr_t start,
ram_addr_t size)
zone.size = size;
zone.pad = 0;
- ret = kvm_vm_ioctl(s, KVM_UNREGISTER_COALESCED_MMIO, &zone);
+ (void)kvm_vm_ioctl(s, KVM_UNREGISTER_COALESCED_MMIO, &zone);
}
-
- return ret;
}
int kvm_check_extension(KVMState *s, unsigned int extension)
@@ -817,6 +815,8 @@ static void kvm_io_ioeventfd_del(MemoryListener *listener,
.log_global_stop = kvm_log_global_stop,
.eventfd_add = kvm_mem_ioeventfd_add,
.eventfd_del = kvm_mem_ioeventfd_del,
+ .coalesced_mmio_add = kvm_coalesce_mmio_region,
+ .coalesced_mmio_del = kvm_uncoalesce_mmio_region,
.priority = 10,
};
diff --git a/kvm-stub.c b/kvm-stub.c
index 3c52eb5..a3455e2 100644
--- a/kvm-stub.c
+++ b/kvm-stub.c
@@ -29,16 +29,6 @@ int kvm_init_vcpu(CPUArchState *env)
return -ENOSYS;
}
-int kvm_coalesce_mmio_region(target_phys_addr_t start, ram_addr_t size)
-{
- return -ENOSYS;
-}
-
-int kvm_uncoalesce_mmio_region(target_phys_addr_t start, ram_addr_t size)
-{
- return -ENOSYS;
-}
-
int kvm_init(void)
{
return -ENOSYS;
diff --git a/kvm.h b/kvm.h
index dea2998..eefcb49 100644
--- a/kvm.h
+++ b/kvm.h
@@ -129,8 +129,6 @@ void *kvm_vmalloc(ram_addr_t size);
void *kvm_arch_vmalloc(ram_addr_t size);
void kvm_setup_guest_memory(void *start, size_t size);
-int kvm_coalesce_mmio_region(target_phys_addr_t start, ram_addr_t size);
-int kvm_uncoalesce_mmio_region(target_phys_addr_t start, ram_addr_t size);
void kvm_flush_coalesced_mmio_buffer(void);
#endif
diff --git a/memory.c b/memory.c
index 269af3f..d829f67 100644
--- a/memory.c
+++ b/memory.c
@@ -1136,11 +1136,19 @@ static void
memory_region_update_coalesced_range_as(MemoryRegion *mr, AddressSpa
FlatRange *fr;
CoalescedMemoryRange *cmr;
AddrRange tmp;
+ MemoryRegionSection section;
FOR_EACH_FLAT_RANGE(fr, as->current_map) {
if (fr->mr == mr) {
- qemu_unregister_coalesced_mmio(int128_get64(fr->addr.start),
- int128_get64(fr->addr.size));
+ section = (MemoryRegionSection) {
+ .address_space = as->root,
+ .offset_within_address_space = int128_get64(fr->addr.start),
+ .size = int128_get64(fr->addr.size),
+ };
+
+ MEMORY_LISTENER_CALL(coalesced_mmio_del, Reverse, §ion,
+ int128_get64(fr->addr.start),
+ int128_get64(fr->addr.size));
QTAILQ_FOREACH(cmr, &mr->coalesced, link) {
tmp = addrrange_shift(cmr->addr,
int128_sub(fr->addr.start,
@@ -1149,8 +1157,9 @@ static void
memory_region_update_coalesced_range_as(MemoryRegion *mr, AddressSpa
continue;
}
tmp = addrrange_intersection(tmp, fr->addr);
- qemu_register_coalesced_mmio(int128_get64(tmp.start),
- int128_get64(tmp.size));
+ MEMORY_LISTENER_CALL(coalesced_mmio_add, Forward, §ion,
+ int128_get64(tmp.start),
+ int128_get64(tmp.size));
}
}
}
diff --git a/memory.h b/memory.h
index 46bc5e1..64d2b34 100644
--- a/memory.h
+++ b/memory.h
@@ -217,6 +217,10 @@ struct MemoryListener {
bool match_data, uint64_t data, EventNotifier *e);
void (*eventfd_del)(MemoryListener *listener, MemoryRegionSection *section,
bool match_data, uint64_t data, EventNotifier *e);
+ void (*coalesced_mmio_add)(MemoryListener *listener, MemoryRegionSection
*section,
+ target_phys_addr_t addr, target_phys_addr_t
len);
+ void (*coalesced_mmio_del)(MemoryListener *listener, MemoryRegionSection
*section,
+ target_phys_addr_t addr, target_phys_addr_t
len);
/* Lower = earlier (during add), later (during del) */
unsigned priority;
MemoryRegion *address_space_filter;
--
1.7.12
- [Qemu-devel] [PATCH v3 02/23] vhost: use MemoryListener filtering to only monitor RAM address space, (continued)
- [Qemu-devel] [PATCH v3 02/23] vhost: use MemoryListener filtering to only monitor RAM address space, Avi Kivity, 2012/10/09
- [Qemu-devel] [PATCH v3 03/23] kvm: use separate MemoryListeners for memory and I/O, Avi Kivity, 2012/10/09
- [Qemu-devel] [PATCH v3 04/23] xen_pt: use separate MemoryListeners for memory and I/O, Avi Kivity, 2012/10/09
- [Qemu-devel] [PATCH v3 08/23] memory: provide defaults for MemoryListener operations, Avi Kivity, 2012/10/09
- [Qemu-devel] [PATCH v3 09/23] memory: drop no-op MemoryListener callbacks, Avi Kivity, 2012/10/09
- [Qemu-devel] [PATCH v3 06/23] memory: export AddressSpace, Avi Kivity, 2012/10/09
- [Qemu-devel] [PATCH v3 17/23] memory: use AddressSpace for MemoryListener filtering, Avi Kivity, 2012/10/09
- [Qemu-devel] [PATCH v3 18/23] s390: avoid reaching into memory core internals, Avi Kivity, 2012/10/09
- [Qemu-devel] [PATCH v3 21/23] memory: add address_space_destroy(), Avi Kivity, 2012/10/09
- [Qemu-devel] [PATCH v3 22/23] pci: give each device its own address space, Avi Kivity, 2012/10/09
- [Qemu-devel] [PATCH v3 14/23] memory: manage coalesced mmio via a MemoryListener,
Avi Kivity <=
- [Qemu-devel] [PATCH v3 13/23] xen: drop no-op MemoryListener callbacks, Avi Kivity, 2012/10/09
- [Qemu-devel] [PATCH v3 07/23] memory: maintain a list of address spaces, Avi Kivity, 2012/10/09
- [Qemu-devel] [PATCH v3 15/23] memory: move address_space_memory and address_space_io out of memory core, Avi Kivity, 2012/10/09
- [Qemu-devel] [PATCH v3 23/23] pci: honor PCI_COMMAND_MASTER, Avi Kivity, 2012/10/09