cryptospore / rpms / qemu-kvm

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