|
 |
0a122b |
From 7471a0a26dde86aa466e2183c6e43df9c01250d6 Mon Sep 17 00:00:00 2001
|
|
|
0a122b |
From: Juan Quintela <quintela@redhat.com>
|
|
|
0a122b |
Date: Tue, 14 Jan 2014 15:07:51 +0100
|
|
|
0a122b |
Subject: [PATCH 40/40] migration: synchronize memory bitmap 64bits at a time
|
|
|
0a122b |
|
|
|
0a122b |
RH-Author: Juan Quintela <quintela@redhat.com>
|
|
|
0a122b |
Message-id: <1389712071-23303-41-git-send-email-quintela@redhat.com>
|
|
|
0a122b |
Patchwork-id: 56695
|
|
|
0a122b |
O-Subject: [RHEL7 qemu-kvm PATCH 40/40] migration: synchronize memory bitmap 64bits at a time
|
|
|
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 |
We use the old code if the bitmaps are not aligned
|
|
|
0a122b |
|
|
|
0a122b |
Signed-off-by: Juan Quintela <quintela@redhat.com>
|
|
|
0a122b |
Reviewed-by: Orit Wasserman <owasserm@redhat.com>
|
|
|
0a122b |
(cherry picked from commit aa8dc044772ba156cbcf2174b5673cfa11f566a7)
|
|
|
0a122b |
Signed-off-by: Juan Quintela <quintela@trasno.org>
|
|
|
0a122b |
---
|
|
|
0a122b |
arch_init.c | 38 +++++++++++++++++++++++++++++---------
|
|
|
0a122b |
1 file changed, 29 insertions(+), 9 deletions(-)
|
|
|
0a122b |
|
|
|
0a122b |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
0a122b |
---
|
|
|
0a122b |
arch_init.c | 38 +++++++++++++++++++++++++++++---------
|
|
|
0a122b |
1 files changed, 29 insertions(+), 9 deletions(-)
|
|
|
0a122b |
|
|
|
0a122b |
diff --git a/arch_init.c b/arch_init.c
|
|
|
0a122b |
index 23650e7..31aac84 100644
|
|
|
0a122b |
--- a/arch_init.c
|
|
|
0a122b |
+++ b/arch_init.c
|
|
|
0a122b |
@@ -50,6 +50,7 @@
|
|
|
0a122b |
#include "exec/cpu-all.h"
|
|
|
0a122b |
#include "exec/ram_addr.h"
|
|
|
0a122b |
#include "hw/acpi/acpi.h"
|
|
|
0a122b |
+#include "qemu/host-utils.h"
|
|
|
0a122b |
|
|
|
0a122b |
#ifdef DEBUG_ARCH_INIT
|
|
|
0a122b |
#define DPRINTF(fmt, ...) \
|
|
|
0a122b |
@@ -376,15 +377,34 @@ static inline bool migration_bitmap_set_dirty(ram_addr_t addr)
|
|
|
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 |
+ unsigned long page = BIT_WORD(start >> TARGET_PAGE_BITS);
|
|
|
0a122b |
+
|
|
|
0a122b |
+ /* start address is aligned at the start of a word? */
|
|
|
0a122b |
+ if (((page * BITS_PER_LONG) << TARGET_PAGE_BITS) == start) {
|
|
|
0a122b |
+ int k;
|
|
|
0a122b |
+ int nr = BITS_TO_LONGS(length >> TARGET_PAGE_BITS);
|
|
|
0a122b |
+ unsigned long *src = ram_list.dirty_memory[DIRTY_MEMORY_MIGRATION];
|
|
|
0a122b |
+
|
|
|
0a122b |
+ for (k = page; k < page + nr; k++) {
|
|
|
0a122b |
+ if (src[k]) {
|
|
|
0a122b |
+ unsigned long new_dirty;
|
|
|
0a122b |
+ new_dirty = ~migration_bitmap[k];
|
|
|
0a122b |
+ migration_bitmap[k] |= src[k];
|
|
|
0a122b |
+ new_dirty &= src[k];
|
|
|
0a122b |
+ migration_dirty_pages += ctpopl(new_dirty);
|
|
|
0a122b |
+ src[k] = 0;
|
|
|
0a122b |
+ }
|
|
|
0a122b |
+ }
|
|
|
0a122b |
+ } else {
|
|
|
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 |
1.7.1
|
|
|
0a122b |
|