[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 36/38] ram: split function that synchronizes a range
From: |
Juan Quintela |
Subject: |
[Qemu-devel] [PATCH 36/38] ram: split function that synchronizes a range |
Date: |
Tue, 17 Dec 2013 16:26:12 +0100 |
This function is the only bit where we care about speed.
Signed-off-by: Juan Quintela <address@hidden>
---
arch_init.c | 34 ++++++++++++++++++++--------------
1 file changed, 20 insertions(+), 14 deletions(-)
diff --git a/arch_init.c b/arch_init.c
index 0e8c8b5..2cd3d00 100644
--- a/arch_init.c
+++ b/arch_init.c
@@ -360,11 +360,10 @@ ram_addr_t
migration_bitmap_find_and_reset_dirty(MemoryRegion *mr,
return (next - base) << TARGET_PAGE_BITS;
}
-static inline bool migration_bitmap_set_dirty(MemoryRegion *mr,
- ram_addr_t offset)
+static inline bool migration_bitmap_set_dirty(ram_addr_t addr)
{
bool ret;
- int nr = (mr->ram_addr + offset) >> TARGET_PAGE_BITS;
+ int nr = addr >> TARGET_PAGE_BITS;
ret = test_and_set_bit(nr, migration_bitmap);
@@ -374,12 +373,28 @@ static inline bool
migration_bitmap_set_dirty(MemoryRegion *mr,
return ret;
}
+static void migration_bitmap_sync_range(ram_addr_t start, ram_addr_t length)
+{
+ ram_addr_t addr;
+
+ for (addr = 0; addr < length; addr += TARGET_PAGE_SIZE) {
+ if (cpu_physical_memory_get_dirty(start + addr,
+ TARGET_PAGE_SIZE,
+ DIRTY_MEMORY_MIGRATION)) {
+ cpu_physical_memory_reset_dirty(start + addr,
+ TARGET_PAGE_SIZE,
+ DIRTY_MEMORY_MIGRATION);
+ migration_bitmap_set_dirty(start + addr);
+ }
+ }
+}
+
+
/* Needs iothread lock! */
static void migration_bitmap_sync(void)
{
RAMBlock *block;
- ram_addr_t addr;
uint64_t num_dirty_pages_init = migration_dirty_pages;
MigrationState *s = migrate_get_current();
static int64_t start_time;
@@ -400,16 +415,7 @@ static void migration_bitmap_sync(void)
address_space_sync_dirty_bitmap(&address_space_memory);
QTAILQ_FOREACH(block, &ram_list.blocks, next) {
- for (addr = 0; addr < block->length; addr += TARGET_PAGE_SIZE) {
- if (cpu_physical_memory_get_dirty(block->mr->ram_addr + addr,
- TARGET_PAGE_SIZE,
- DIRTY_MEMORY_MIGRATION)) {
- cpu_physical_memory_reset_dirty(block->mr->ram_addr + addr,
- TARGET_PAGE_SIZE,
- DIRTY_MEMORY_MIGRATION);
- migration_bitmap_set_dirty(block->mr, addr);
- }
- }
+ migration_bitmap_sync_range(block->mr->ram_addr, block->length);
}
trace_migration_bitmap_sync_end(migration_dirty_pages
- num_dirty_pages_init);
--
1.8.3.1
- Re: [Qemu-devel] [PATCH 31/38] memory: unfold memory_region_test_and_clear(), (continued)
- [Qemu-devel] [PATCH 32/38] kvm: use directly cpu_physical_memory_* api for tracking dirty pages, Juan Quintela, 2013/12/17
- [Qemu-devel] [PATCH 33/38] kvm: refactor start address calculation, Juan Quintela, 2013/12/17
- [Qemu-devel] [PATCH 34/38] memory: move bitmap synchronization to its own function, Juan Quintela, 2013/12/17
- [Qemu-devel] [PATCH 35/38] memory: syncronize kvm bitmap using bitmaps operations, Juan Quintela, 2013/12/17
- [Qemu-devel] [PATCH 36/38] ram: split function that synchronizes a range,
Juan Quintela <=
- [Qemu-devel] [PATCH 37/38] migration: synchronize memory bitmap 64bits at a time, Juan Quintela, 2013/12/17
- [Qemu-devel] [PATCH 38/38] ram: align ram_addr_t's regions in multiples of 64, Juan Quintela, 2013/12/17