[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH RFC v3 06/11] KVM: Provide helper to get kvm dirty log
From: |
Peter Xu |
Subject: |
[PATCH RFC v3 06/11] KVM: Provide helper to get kvm dirty log |
Date: |
Sat, 23 May 2020 19:20:30 -0400 |
Provide a helper kvm_slot_get_dirty_log() to make the function
kvm_physical_sync_dirty_bitmap() clearer. We can even cache the as_id
into KVMSlot when it is created, so that we don't even need to pass it
down every time.
Since at it, remove return value of kvm_physical_sync_dirty_bitmap()
because it should never fail.
Signed-off-by: Peter Xu <address@hidden>
---
accel/kvm/kvm-all.c | 42 +++++++++++++++++++++-------------------
include/sysemu/kvm_int.h | 2 ++
2 files changed, 24 insertions(+), 20 deletions(-)
diff --git a/accel/kvm/kvm-all.c b/accel/kvm/kvm-all.c
index 5b626af2a7..5892e5db24 100644
--- a/accel/kvm/kvm-all.c
+++ b/accel/kvm/kvm-all.c
@@ -566,6 +566,21 @@ static void kvm_slot_init_dirty_bitmap(KVMSlot *mem)
mem->dirty_bmap = g_malloc0(bitmap_size);
}
+/* Sync dirty bitmap from kernel to KVMSlot.dirty_bmap */
+static void kvm_slot_get_dirty_log(KVMState *s, KVMSlot *slot)
+{
+ struct kvm_dirty_log d = {};
+ int ret;
+
+ d.dirty_bitmap = slot->dirty_bmap;
+ d.slot = slot->slot | (slot->as_id << 16);
+ ret = kvm_vm_ioctl(s, KVM_GET_DIRTY_LOG, &d);
+ if (ret) {
+ error_report_once("%s: KVM_GET_DIRTY_LOG failed with %d",
+ __func__, ret);
+ }
+}
+
/**
* kvm_physical_sync_dirty_bitmap - Sync dirty bitmap from kernel space
*
@@ -577,15 +592,13 @@ static void kvm_slot_init_dirty_bitmap(KVMSlot *mem)
* @kml: the KVM memory listener object
* @section: the memory section to sync the dirty bitmap with
*/
-static int kvm_physical_sync_dirty_bitmap(KVMMemoryListener *kml,
- MemoryRegionSection *section)
+static void kvm_physical_sync_dirty_bitmap(KVMMemoryListener *kml,
+ MemoryRegionSection *section)
{
KVMState *s = kvm_state;
- struct kvm_dirty_log d = {};
KVMSlot *mem;
hwaddr start_addr, size;
hwaddr slot_size, slot_offset = 0;
- int ret = 0;
size = kvm_align_section(section, &start_addr);
while (size) {
@@ -595,27 +608,19 @@ static int
kvm_physical_sync_dirty_bitmap(KVMMemoryListener *kml,
mem = kvm_lookup_matching_slot(kml, start_addr, slot_size);
if (!mem) {
/* We don't have a slot if we want to trap every access. */
- goto out;
+ return;
}
- d.dirty_bitmap = mem->dirty_bmap;
- d.slot = mem->slot | (kml->as_id << 16);
- if (kvm_vm_ioctl(s, KVM_GET_DIRTY_LOG, &d) == -1) {
- DPRINTF("ioctl failed %d\n", errno);
- ret = -1;
- goto out;
- }
+ kvm_slot_get_dirty_log(s, mem);
subsection.offset_within_region += slot_offset;
subsection.size = int128_make64(slot_size);
- kvm_get_dirty_pages_log_range(&subsection, d.dirty_bitmap);
+ kvm_get_dirty_pages_log_range(&subsection, mem->dirty_bmap);
slot_offset += slot_size;
start_addr += slot_size;
size -= slot_size;
}
-out:
- return ret;
}
/* Alignment requirement for KVM_CLEAR_DIRTY_LOG - 64 pages */
@@ -1123,6 +1128,7 @@ static void kvm_set_phys_mem(KVMMemoryListener *kml,
do {
slot_size = MIN(kvm_max_slot_size, size);
mem = kvm_alloc_slot(kml);
+ mem->as_id = kml->as_id;
mem->memory_size = slot_size;
mem->start_addr = start_addr;
mem->ram = ram;
@@ -1165,14 +1171,10 @@ static void kvm_log_sync(MemoryListener *listener,
MemoryRegionSection *section)
{
KVMMemoryListener *kml = container_of(listener, KVMMemoryListener,
listener);
- int r;
kvm_slots_lock();
- r = kvm_physical_sync_dirty_bitmap(kml, section);
+ kvm_physical_sync_dirty_bitmap(kml, section);
kvm_slots_unlock();
- if (r < 0) {
- abort();
- }
}
static void kvm_log_clear(MemoryListener *listener,
diff --git a/include/sysemu/kvm_int.h b/include/sysemu/kvm_int.h
index f143b28671..1202593c6f 100644
--- a/include/sysemu/kvm_int.h
+++ b/include/sysemu/kvm_int.h
@@ -23,6 +23,8 @@ typedef struct KVMSlot
int old_flags;
/* Dirty bitmap cache for the slot */
unsigned long *dirty_bmap;
+ /* Cache of the address space ID */
+ int as_id;
} KVMSlot;
typedef struct KVMMemoryListener {
--
2.26.2
- [PATCH RFC v3 01/11] linux-headers: Update, (continued)
[PATCH RFC v3 03/11] KVM: Fixup kvm_log_clear_one_slot() ioctl return check, Peter Xu, 2020/05/23
[PATCH RFC v3 02/11] memory: Introduce log_sync_global() to memory listener, Peter Xu, 2020/05/23
[PATCH RFC v3 04/11] KVM: Use a big lock to replace per-kml slots_lock, Peter Xu, 2020/05/23
[PATCH RFC v3 05/11] KVM: Create the KVMSlot dirty bitmap on flag changes, Peter Xu, 2020/05/23
[PATCH RFC v3 06/11] KVM: Provide helper to get kvm dirty log,
Peter Xu <=
[PATCH RFC v3 07/11] KVM: Provide helper to sync dirty bitmap from slot to ramblock, Peter Xu, 2020/05/23
[PATCH RFC v3 08/11] KVM: Simplify dirty log sync in kvm_set_phys_mem, Peter Xu, 2020/05/23
[PATCH RFC v3 09/11] KVM: Cache kvm slot dirty bitmap size, Peter Xu, 2020/05/23
[PATCH RFC v3 10/11] KVM: Add dirty-gfn-count property, Peter Xu, 2020/05/23
[PATCH RFC v3 11/11] KVM: Dirty ring support, Peter Xu, 2020/05/23
Re: [PATCH RFC v3 00/11] KVM: Dirty ring support (QEMU part), Peter Xu, 2020/05/24
Re: [PATCH RFC v3 00/11] KVM: Dirty ring support (QEMU part), Peter Xu, 2020/05/26