|
 |
9ae3a8 |
From 14eb19d20c600001321edcc664614b9f5f2bb758 Mon Sep 17 00:00:00 2001
|
|
|
9ae3a8 |
From: Juan Quintela <quintela@redhat.com>
|
|
|
9ae3a8 |
Date: Tue, 14 Jan 2014 15:07:50 +0100
|
|
|
9ae3a8 |
Subject: [PATCH 39/40] ram: split function that synchronizes a range
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
RH-Author: Juan Quintela <quintela@redhat.com>
|
|
|
9ae3a8 |
Message-id: <1389712071-23303-40-git-send-email-quintela@redhat.com>
|
|
|
9ae3a8 |
Patchwork-id: 56694
|
|
|
9ae3a8 |
O-Subject: [RHEL7 qemu-kvm PATCH 39/40] ram: split function that synchronizes a range
|
|
|
9ae3a8 |
Bugzilla: 997559
|
|
|
9ae3a8 |
RH-Acked-by: Paolo Bonzini <pbonzini@redhat.com>
|
|
|
9ae3a8 |
RH-Acked-by: Orit Wasserman <owasserm@redhat.com>
|
|
|
9ae3a8 |
RH-Acked-by: Dr. David Alan Gilbert (git) <dgilbert@redhat.com>
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
This function is the only bit where we care about speed.
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Signed-off-by: Juan Quintela <quintela@redhat.com>
|
|
|
9ae3a8 |
Reviewed-by: Orit Wasserman <owasserm@redhat.com>
|
|
|
9ae3a8 |
(cherry picked from commit 791fa2a2451799232d6bc0c29c0fbb13b5293eeb)
|
|
|
9ae3a8 |
Signed-off-by: Juan Quintela <quintela@trasno.org>
|
|
|
9ae3a8 |
---
|
|
|
9ae3a8 |
arch_init.c | 34 ++++++++++++++++++++--------------
|
|
|
9ae3a8 |
1 file changed, 20 insertions(+), 14 deletions(-)
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
9ae3a8 |
---
|
|
|
9ae3a8 |
arch_init.c | 34 ++++++++++++++++++++--------------
|
|
|
9ae3a8 |
1 files changed, 20 insertions(+), 14 deletions(-)
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
diff --git a/arch_init.c b/arch_init.c
|
|
|
9ae3a8 |
index 41da357..23650e7 100644
|
|
|
9ae3a8 |
--- a/arch_init.c
|
|
|
9ae3a8 |
+++ b/arch_init.c
|
|
|
9ae3a8 |
@@ -360,11 +360,10 @@ ram_addr_t migration_bitmap_find_and_reset_dirty(MemoryRegion *mr,
|
|
|
9ae3a8 |
return (next - base) << TARGET_PAGE_BITS;
|
|
|
9ae3a8 |
}
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
-static inline bool migration_bitmap_set_dirty(MemoryRegion *mr,
|
|
|
9ae3a8 |
- ram_addr_t offset)
|
|
|
9ae3a8 |
+static inline bool migration_bitmap_set_dirty(ram_addr_t addr)
|
|
|
9ae3a8 |
{
|
|
|
9ae3a8 |
bool ret;
|
|
|
9ae3a8 |
- int nr = (mr->ram_addr + offset) >> TARGET_PAGE_BITS;
|
|
|
9ae3a8 |
+ int nr = addr >> TARGET_PAGE_BITS;
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
ret = test_and_set_bit(nr, migration_bitmap);
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
@@ -374,12 +373,28 @@ static inline bool migration_bitmap_set_dirty(MemoryRegion *mr,
|
|
|
9ae3a8 |
return ret;
|
|
|
9ae3a8 |
}
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
+static void migration_bitmap_sync_range(ram_addr_t start, ram_addr_t length)
|
|
|
9ae3a8 |
+{
|
|
|
9ae3a8 |
+ ram_addr_t addr;
|
|
|
9ae3a8 |
+
|
|
|
9ae3a8 |
+ for (addr = 0; addr < length; addr += TARGET_PAGE_SIZE) {
|
|
|
9ae3a8 |
+ if (cpu_physical_memory_get_dirty(start + addr,
|
|
|
9ae3a8 |
+ TARGET_PAGE_SIZE,
|
|
|
9ae3a8 |
+ DIRTY_MEMORY_MIGRATION)) {
|
|
|
9ae3a8 |
+ cpu_physical_memory_reset_dirty(start + addr,
|
|
|
9ae3a8 |
+ TARGET_PAGE_SIZE,
|
|
|
9ae3a8 |
+ DIRTY_MEMORY_MIGRATION);
|
|
|
9ae3a8 |
+ migration_bitmap_set_dirty(start + addr);
|
|
|
9ae3a8 |
+ }
|
|
|
9ae3a8 |
+ }
|
|
|
9ae3a8 |
+}
|
|
|
9ae3a8 |
+
|
|
|
9ae3a8 |
+
|
|
|
9ae3a8 |
/* Needs iothread lock! */
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
static void migration_bitmap_sync(void)
|
|
|
9ae3a8 |
{
|
|
|
9ae3a8 |
RAMBlock *block;
|
|
|
9ae3a8 |
- ram_addr_t addr;
|
|
|
9ae3a8 |
uint64_t num_dirty_pages_init = migration_dirty_pages;
|
|
|
9ae3a8 |
MigrationState *s = migrate_get_current();
|
|
|
9ae3a8 |
static int64_t start_time;
|
|
|
9ae3a8 |
@@ -400,16 +415,7 @@ static void migration_bitmap_sync(void)
|
|
|
9ae3a8 |
memory_global_sync_dirty_bitmap(get_system_memory());
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
QTAILQ_FOREACH(block, &ram_list.blocks, next) {
|
|
|
9ae3a8 |
- for (addr = 0; addr < block->length; addr += TARGET_PAGE_SIZE) {
|
|
|
9ae3a8 |
- if (cpu_physical_memory_get_dirty(block->mr->ram_addr + addr,
|
|
|
9ae3a8 |
- TARGET_PAGE_SIZE,
|
|
|
9ae3a8 |
- DIRTY_MEMORY_MIGRATION)) {
|
|
|
9ae3a8 |
- cpu_physical_memory_reset_dirty(block->mr->ram_addr + addr,
|
|
|
9ae3a8 |
- TARGET_PAGE_SIZE,
|
|
|
9ae3a8 |
- DIRTY_MEMORY_MIGRATION);
|
|
|
9ae3a8 |
- migration_bitmap_set_dirty(block->mr, addr);
|
|
|
9ae3a8 |
- }
|
|
|
9ae3a8 |
- }
|
|
|
9ae3a8 |
+ migration_bitmap_sync_range(block->mr->ram_addr, block->length);
|
|
|
9ae3a8 |
}
|
|
|
9ae3a8 |
trace_migration_bitmap_sync_end(migration_dirty_pages
|
|
|
9ae3a8 |
- num_dirty_pages_init);
|
|
|
9ae3a8 |
--
|
|
|
9ae3a8 |
1.7.1
|
|
|
9ae3a8 |
|