From: xuchuangxclwt <[email protected]> When the addresses processed are not aligned, a large number of clear_dirty ioctl occur (e.g. a 4MB misaligned memory can generate 2048 clear_dirty ioctls from two different memory_listener), which increases the time required for bitmap_sync and makes it more difficult for dirty pages to converge.
Attempt to merge those fragmented clear_dirty ioctls. Signed-off-by: Chuang Xu <[email protected]> --- accel/tcg/cputlb.c | 5 +++-- include/system/physmem.h | 7 ++++--- migration/ram.c | 26 ++++++++++++------------ system/memory.c | 2 +- system/physmem.c | 44 ++++++++++++++++++++++++---------------- 5 files changed, 48 insertions(+), 36 deletions(-) diff --git a/accel/tcg/cputlb.c b/accel/tcg/cputlb.c index fd1606c856..c8827c8b0d 100644 --- a/accel/tcg/cputlb.c +++ b/accel/tcg/cputlb.c @@ -857,8 +857,9 @@ void tlb_flush_page_bits_by_mmuidx_all_cpus_synced(CPUState *src_cpu, void tlb_protect_code(ram_addr_t ram_addr) { physical_memory_test_and_clear_dirty(ram_addr & TARGET_PAGE_MASK, - TARGET_PAGE_SIZE, - DIRTY_MEMORY_CODE); + TARGET_PAGE_SIZE, + DIRTY_MEMORY_CODE, + NULL); } /* update the TLB so that writes in physical page 'phys_addr' are no longer diff --git a/include/system/physmem.h b/include/system/physmem.h index 879f6eae38..8eeace9d1f 100644 --- a/include/system/physmem.h +++ b/include/system/physmem.h @@ -39,9 +39,10 @@ uint64_t physical_memory_set_dirty_lebitmap(unsigned long *bitmap, void physical_memory_dirty_bits_cleared(ram_addr_t start, ram_addr_t length); -bool physical_memory_test_and_clear_dirty(ram_addr_t start, - ram_addr_t length, - unsigned client); +uint64_t physical_memory_test_and_clear_dirty(ram_addr_t start, + ram_addr_t length, + unsigned client, + unsigned long *dest); DirtyBitmapSnapshot * physical_memory_snapshot_and_clear_dirty(MemoryRegion *mr, hwaddr offset, diff --git a/migration/ram.c b/migration/ram.c index 29f016cb25..2d5e979211 100644 --- a/migration/ram.c +++ b/migration/ram.c @@ -942,7 +942,6 @@ static uint64_t physical_memory_sync_dirty_bitmap(RAMBlock *rb, ram_addr_t start, ram_addr_t length) { - ram_addr_t addr; unsigned long word = BIT_WORD((start + rb->offset) >> TARGET_PAGE_BITS); uint64_t num_dirty = 0; unsigned long *dest = rb->bmap; @@ -995,18 +994,19 @@ static uint64_t physical_memory_sync_dirty_bitmap(RAMBlock *rb, } } else { ram_addr_t offset = rb->offset; - - for (addr = 0; addr < length; addr += TARGET_PAGE_SIZE) { - if (physical_memory_test_and_clear_dirty( - start + addr + offset, - TARGET_PAGE_SIZE, - DIRTY_MEMORY_MIGRATION)) { - long k = (start + addr) >> TARGET_PAGE_BITS; - if (!test_and_set_bit(k, dest)) { - num_dirty++; - } - } - } + unsigned long end, start_page; + uint64_t mr_offset, mr_size; + + num_dirty = physical_memory_test_and_clear_dirty( + start + offset, + length, + DIRTY_MEMORY_MIGRATION, + dest); + end = TARGET_PAGE_ALIGN(start + offset + length) >> TARGET_PAGE_BITS; + start_page = (start + offset) >> TARGET_PAGE_BITS; + mr_offset = (ram_addr_t)(start_page << TARGET_PAGE_BITS) - offset; + mr_size = (end - start_page) << TARGET_PAGE_BITS; + memory_region_clear_dirty_bitmap(rb->mr, mr_offset, mr_size); } return num_dirty; diff --git a/system/memory.c b/system/memory.c index 8b84661ae3..666364392d 100644 --- a/system/memory.c +++ b/system/memory.c @@ -2424,7 +2424,7 @@ void memory_region_reset_dirty(MemoryRegion *mr, hwaddr addr, { assert(mr->ram_block); physical_memory_test_and_clear_dirty( - memory_region_get_ram_addr(mr) + addr, size, client); + memory_region_get_ram_addr(mr) + addr, size, client, NULL); } int memory_region_get_fd(MemoryRegion *mr) diff --git a/system/physmem.c b/system/physmem.c index c9869e4049..d015eb2133 100644 --- a/system/physmem.c +++ b/system/physmem.c @@ -1090,18 +1090,19 @@ void physical_memory_set_dirty_range(ram_addr_t start, ram_addr_t length, } /* Note: start and end must be within the same ram block. */ -bool physical_memory_test_and_clear_dirty(ram_addr_t start, +uint64_t physical_memory_test_and_clear_dirty(ram_addr_t start, ram_addr_t length, - unsigned client) + unsigned client, + unsigned long *dest) { DirtyMemoryBlocks *blocks; unsigned long end, page, start_page; - bool dirty = false; + uint64_t num_dirty = 0; RAMBlock *ramblock; uint64_t mr_offset, mr_size; if (length == 0) { - return false; + return 0; } end = TARGET_PAGE_ALIGN(start + length) >> TARGET_PAGE_BITS; @@ -1118,31 +1119,40 @@ bool physical_memory_test_and_clear_dirty(ram_addr_t start, while (page < end) { unsigned long idx = page / DIRTY_MEMORY_BLOCK_SIZE; unsigned long offset = page % DIRTY_MEMORY_BLOCK_SIZE; - unsigned long num = MIN(end - page, - DIRTY_MEMORY_BLOCK_SIZE - offset); - dirty |= bitmap_test_and_clear_atomic(blocks->blocks[idx], - offset, num); - page += num; + if (bitmap_test_and_clear_atomic(blocks->blocks[idx], offset, 1)) { + if (dest) { + unsigned long k = page - (ramblock->offset >> TARGET_PAGE_BITS); + if (!test_and_set_bit(k, dest)) { + num_dirty++; + } + } else { + num_dirty++; + } + } + + page++; } - mr_offset = (ram_addr_t)(start_page << TARGET_PAGE_BITS) - ramblock->offset; - mr_size = (end - start_page) << TARGET_PAGE_BITS; - memory_region_clear_dirty_bitmap(ramblock->mr, mr_offset, mr_size); + if (!dest && num_dirty) { + mr_offset = (ram_addr_t)(start_page << TARGET_PAGE_BITS) - ramblock->offset; + mr_size = (end - start_page) << TARGET_PAGE_BITS; + memory_region_clear_dirty_bitmap(ramblock->mr, mr_offset, mr_size); + } } - if (dirty) { + if (num_dirty) { physical_memory_dirty_bits_cleared(start, length); } - return dirty; + return num_dirty; } static void physical_memory_clear_dirty_range(ram_addr_t addr, ram_addr_t length) { - physical_memory_test_and_clear_dirty(addr, length, DIRTY_MEMORY_MIGRATION); - physical_memory_test_and_clear_dirty(addr, length, DIRTY_MEMORY_VGA); - physical_memory_test_and_clear_dirty(addr, length, DIRTY_MEMORY_CODE); + physical_memory_test_and_clear_dirty(addr, length, DIRTY_MEMORY_MIGRATION, NULL); + physical_memory_test_and_clear_dirty(addr, length, DIRTY_MEMORY_VGA, NULL); + physical_memory_test_and_clear_dirty(addr, length, DIRTY_MEMORY_CODE, NULL); } DirtyBitmapSnapshot *physical_memory_snapshot_and_clear_dirty -- 2.39.3 (Apple Git-146)
