From patchwork Fri Jul 2 17:11:57 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Williamson X-Patchwork-Id: 57726 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 35F791007D2 for ; Sat, 3 Jul 2010 04:12:00 +1000 (EST) Received: from localhost ([127.0.0.1]:57014 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OUjrA-00066P-Lo for incoming@patchwork.ozlabs.org; Fri, 02 Jul 2010 13:16:52 -0400 Received: from [140.186.70.92] (port=42664 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OUjmT-0002uU-RV for qemu-devel@nongnu.org; Fri, 02 Jul 2010 13:12:03 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OUjmS-0007DM-Cb for qemu-devel@nongnu.org; Fri, 02 Jul 2010 13:12:01 -0400 Received: from mx1.redhat.com ([209.132.183.28]:12583) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OUjmS-0007D7-5g for qemu-devel@nongnu.org; Fri, 02 Jul 2010 13:12:00 -0400 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o62HBwtD032728 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Fri, 2 Jul 2010 13:11:58 -0400 Received: from localhost.localdomain (ovpn01.gateway.prod.ext.phx2.redhat.com [10.5.9.1]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o62HBvpi021434; Fri, 2 Jul 2010 13:11:57 -0400 From: Alex Williamson To: qemu-devel@nongnu.org Date: Fri, 02 Jul 2010 11:11:57 -0600 Message-ID: <20100702171157.30243.99408.stgit@localhost.localdomain> In-Reply-To: <20100702171054.30243.19599.stgit@localhost.localdomain> References: <20100702171054.30243.19599.stgit@localhost.localdomain> User-Agent: StGIT/0.14.3 MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.67 on 10.5.11.12 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. Cc: alex.williamson@redhat.com Subject: [Qemu-devel] [PATCH v3 01/16] Remove uses of ram.last_offset (aka last_ram_offset) X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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 --- arch_init.c | 23 ++++++++++++++++------- cpu-all.h | 1 - exec.c | 19 ++++++++++++++----- 3 files changed, 30 insertions(+), 13 deletions(-) diff --git a/arch_init.c b/arch_init.c index eb5b67c..109dcef 100644 --- a/arch_init.c +++ b/arch_init.c @@ -108,9 +108,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 bytes_sent = 0; - while (addr < ram_list.last_offset) { + while (addr < total_ram) { if (cpu_physical_memory_get_dirty(current_addr, MIGRATION_DIRTY_FLAG)) { uint8_t *p; @@ -133,7 +134,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 bytes_sent; @@ -145,8 +146,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++; } @@ -167,7 +169,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; } int ram_save_live(Monitor *mon, QEMUFile *f, int stage, void *opaque) @@ -188,10 +196,11 @@ 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); } @@ -200,7 +209,7 @@ 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; @@ -259,7 +268,7 @@ 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; } } diff --git a/cpu-all.h b/cpu-all.h index e31c2de..dbb2139 100644 --- a/cpu-all.h +++ b/cpu-all.h @@ -870,7 +870,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 137175c..a6b3f21 100644 --- a/exec.c +++ b/exec.c @@ -2767,6 +2767,17 @@ static void *file_ram_alloc(ram_addr_t memory, const char *path) } #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; @@ -2800,18 +2811,16 @@ ram_addr_t qemu_ram_alloc(ram_addr_t size) madvise(new_block->host, size, MADV_MERGEABLE); #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);