motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-17 15:12:07 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

kvm: clear dirty bitmaps from all overlapping memslots

Browse source 
Currently MemoryRegionSection has 1:1 mapping to KVMSlot.
However next patch will allow splitting MemoryRegionSection into
several KVMSlot-s, make sure that kvm_physical_log_slot_clear()
is able to handle such 1:N mapping.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Igor Mammedov <imammedo@redhat.com>
Reviewed-by: Peter Xu <peterx@redhat.com>
Message-Id: <20190924144751.24149-3-imammedo@redhat.com>
Acked-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
This commit is contained in:
Paolo Bonzini 2019-09-24 10:47:49 -04:00 • committed by Christian Borntraeger
parent 4222147dfb
commit 84516e5b8d
1 changed files with 22 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

36
accel/kvm/kvm-all.c
View file

@ -589,8 +589,8 @@ static int kvm_log_clear_one_slot(KVMSlot *mem, int as_id, uint64_t start,
* satisfy the KVM interface requirement. Firstly, do the start * satisfy the KVM interface requirement. Firstly, do the start
* page alignment on 64 host pages * page alignment on 64 host pages
*/ */
bmap_start = (start - mem->start_addr) & KVM_CLEAR_LOG_MASK; bmap_start = start & KVM_CLEAR_LOG_MASK;
start_delta = start - mem->start_addr - bmap_start; start_delta = start - bmap_start;
bmap_start /= psize; bmap_start /= psize;
/* /*
@ -694,8 +694,8 @@ static int kvm_physical_log_clear(KVMMemoryListener *kml,
MemoryRegionSection *section) MemoryRegionSection *section)
{ {
KVMState *s = kvm_state; KVMState *s = kvm_state;
uint64_t start, size; uint64_t start, size, offset, count;
KVMSlot *mem = NULL; KVMSlot *mem;
int ret, i; int ret, i;
if (!s->manual_dirty_log_protect) { if (!s->manual_dirty_log_protect) {
@ -713,22 +713,30 @@ static int kvm_physical_log_clear(KVMMemoryListener *kml,
kvm_slots_lock(kml); kvm_slots_lock(kml);
/* Find any possible slot that covers the section */
for (i = 0; i < s->nr_slots; i++) { for (i = 0; i < s->nr_slots; i++) {
mem = &kml->slots[i]; mem = &kml->slots[i];
if (mem->start_addr <= start && /* Discard slots that are empty or do not overlap the section */
start + size <= mem->start_addr + mem->memory_size) { if (!mem->memory_size ||
mem->start_addr > start + size - 1 ||
start > mem->start_addr + mem->memory_size - 1) {
continue;
}
if (start >= mem->start_addr) {
/* The slot starts before section or is aligned to it. */
offset = start - mem->start_addr;
count = MIN(mem->memory_size - offset, size);
} else {
/* The slot starts after section. */
offset = 0;
count = MIN(mem->memory_size, size - (mem->start_addr - start));
}
ret = kvm_log_clear_one_slot(mem, kml->as_id, offset, count);
if (ret < 0) {
break; break;
} }
} }
/*
* We should always find one memslot until this point, otherwise
* there could be something wrong from the upper layer
*/
assert(mem && i != s->nr_slots);
ret = kvm_log_clear_one_slot(mem, kml->as_id, start, size);
kvm_slots_unlock(kml); kvm_slots_unlock(kml);
return ret; return ret;