From efc13b6f479ccbf81a1d1cdeb46028458740315d Mon Sep 17 00:00:00 2001 From: Alex Williamson Date: Tue, 6 Jul 2010 22:27:45 -0300 Subject: [PATCH 02/24] Remove uses of ram.last_offset (aka last_ram_offset) RH-Author: Alex Williamson Message-id: <20100706222745.1033.28800.stgit@localhost.localdomain> Patchwork-id: 10505 O-Subject: [RHEL6.0 qemu-kvm PATCH 02/17] Remove uses of ram.last_offset (aka last_ram_offset) Bugzilla: 596328 RH-Acked-by: Juan Quintela RH-Acked-by: Amit Shah RH-Acked-by: Jes Sorensen Bugzilla: 596328 Upstream commit: d17b5288d91c935cc8795fa0620721da0a3865e1 We currently need this either to allocate the next ram_addr_t for a new block, or for total memory to be migrated. Both of which we can calculate without need of this to keep us in a contiguous address space. Signed-off-by: Alex Williamson Signed-off-by: Anthony Liguori --- cpu-all.h | 1 - exec.c | 19 ++++++++++++++----- vl.c | 23 ++++++++++++++++------- 3 files changed, 30 insertions(+), 13 deletions(-) Signed-off-by: Eduardo Habkost --- cpu-all.h | 1 - exec.c | 19 ++++++++++++++----- vl.c | 23 ++++++++++++++++------- 3 files changed, 30 insertions(+), 13 deletions(-) diff --git a/cpu-all.h b/cpu-all.h index caf8d1c..aee2032 100644 --- a/cpu-all.h +++ b/cpu-all.h @@ -858,7 +858,6 @@ typedef struct RAMBlock { typedef struct RAMList { uint8_t *phys_dirty; - ram_addr_t last_offset; QLIST_HEAD(ram, RAMBlock) blocks; } RAMList; extern RAMList ram_list; diff --git a/exec.c b/exec.c index 5c68ad2..099d2ea 100644 --- a/exec.c +++ b/exec.c @@ -2638,6 +2638,17 @@ extern const char *mem_path; #define PREFERRED_RAM_ALIGN (2*1024*1024) #endif +static ram_addr_t find_ram_offset(ram_addr_t size) +{ + RAMBlock *block; + ram_addr_t last = 0; + + QLIST_FOREACH(block, &ram_list.blocks, next) + last = MAX(last, block->offset + block->length); + + return last; +} + ram_addr_t qemu_ram_alloc(ram_addr_t size) { RAMBlock *new_block; @@ -2667,18 +2678,16 @@ ram_addr_t qemu_ram_alloc(ram_addr_t size) madvise(new_block->host, size, MADV_HUGEPAGE); #endif } - new_block->offset = ram_list.last_offset; + new_block->offset = find_ram_offset(size); new_block->length = size; QLIST_INSERT_HEAD(&ram_list.blocks, new_block, next); ram_list.phys_dirty = qemu_realloc(ram_list.phys_dirty, - (ram_list.last_offset + size) >> TARGET_PAGE_BITS); - memset(ram_list.phys_dirty + (ram_list.last_offset >> TARGET_PAGE_BITS), + (new_block->offset + size) >> TARGET_PAGE_BITS); + memset(ram_list.phys_dirty + (new_block->offset >> TARGET_PAGE_BITS), 0xff, size >> TARGET_PAGE_BITS); - ram_list.last_offset += size; - if (kvm_enabled()) kvm_setup_guest_memory(new_block->host, size); diff --git a/vl.c b/vl.c index d81b3ea..0ea505e 100644 --- a/vl.c +++ b/vl.c @@ -3050,9 +3050,10 @@ static int ram_save_block(QEMUFile *f) static ram_addr_t current_addr = 0; ram_addr_t saved_addr = current_addr; ram_addr_t addr = 0; + uint64_t total_ram = ram_bytes_total(); int found = 0; - while (addr < ram_list.last_offset) { + while (addr < total_ram) { if (kvm_enabled() && current_addr == 0) { int r; r = kvm_update_dirty_pages_log(); @@ -3083,7 +3084,7 @@ static int ram_save_block(QEMUFile *f) break; } addr += TARGET_PAGE_SIZE; - current_addr = (saved_addr + addr) % ram_list.last_offset; + current_addr = (saved_addr + addr) % total_ram; } return found; @@ -3095,8 +3096,9 @@ static ram_addr_t ram_save_remaining(void) { ram_addr_t addr; ram_addr_t count = 0; + uint64_t total_ram = ram_bytes_total(); - for (addr = 0; addr < ram_list.last_offset; addr += TARGET_PAGE_SIZE) { + for (addr = 0; addr < total_ram; addr += TARGET_PAGE_SIZE) { if (cpu_physical_memory_get_dirty(addr, MIGRATION_DIRTY_FLAG)) count++; } @@ -3116,7 +3118,13 @@ uint64_t ram_bytes_transferred(void) uint64_t ram_bytes_total(void) { - return ram_list.last_offset; + RAMBlock *block; + uint64_t total = 0; + + QLIST_FOREACH(block, &ram_list.blocks, next) + total += block->length; + + return total; } static int ram_save_live(Monitor *mon, QEMUFile *f, int stage, void *opaque) @@ -3137,10 +3145,11 @@ static int ram_save_live(Monitor *mon, QEMUFile *f, int stage, void *opaque) } if (stage == 1) { + uint64_t total_ram = ram_bytes_total(); bytes_transferred = 0; /* Make sure all dirty bits are set */ - for (addr = 0; addr < ram_list.last_offset; addr += TARGET_PAGE_SIZE) { + for (addr = 0; addr < total_ram; addr += TARGET_PAGE_SIZE) { if (!cpu_physical_memory_get_dirty(addr, MIGRATION_DIRTY_FLAG)) cpu_physical_memory_set_dirty(addr); } @@ -3148,7 +3157,7 @@ static int ram_save_live(Monitor *mon, QEMUFile *f, int stage, void *opaque) /* Enable dirty memory tracking */ cpu_physical_memory_set_dirty_tracking(1); - qemu_put_be64(f, ram_list.last_offset | RAM_SAVE_FLAG_MEM_SIZE); + qemu_put_be64(f, total_ram | RAM_SAVE_FLAG_MEM_SIZE); } bytes_transferred_last = bytes_transferred; @@ -3202,7 +3211,7 @@ static int ram_load(QEMUFile *f, void *opaque, int version_id) addr &= TARGET_PAGE_MASK; if (flags & RAM_SAVE_FLAG_MEM_SIZE) { - if (addr != ram_list.last_offset) + if (addr != ram_bytes_total()) return -EINVAL; } -- 1.7.0.3