From patchwork Tue Jun 8 19:16:49 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Williamson X-Patchwork-Id: 55016 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 DE0ACB7D1C for ; Wed, 9 Jun 2010 05:19:49 +1000 (EST) Received: from localhost ([127.0.0.1]:50708 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OM4Kw-0000Fv-O6 for incoming@patchwork.ozlabs.org; Tue, 08 Jun 2010 15:19:46 -0400 Received: from [140.186.70.92] (port=35648 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OM4IQ-0007u0-Vj for qemu-devel@nongnu.org; Tue, 08 Jun 2010 15:17:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OM4IL-0005wt-SN for qemu-devel@nongnu.org; Tue, 08 Jun 2010 15:17:10 -0400 Received: from qmta15.westchester.pa.mail.comcast.net ([76.96.59.228]:49072) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OM4IL-0005wk-Pt for qemu-devel@nongnu.org; Tue, 08 Jun 2010 15:17:05 -0400 Received: from omta09.westchester.pa.mail.comcast.net ([76.96.62.20]) by qmta15.westchester.pa.mail.comcast.net with comcast id TP2X1e0050SCNGk5FXH6Ur; Tue, 08 Jun 2010 19:17:06 +0000 Received: from localhost.localdomain ([75.71.122.219]) by omta09.westchester.pa.mail.comcast.net with comcast id TXH51e00A4k7Kz73VXH5J2; Tue, 08 Jun 2010 19:17:06 +0000 From: Alex Williamson To: qemu-devel@nongnu.org, anthony@codemonkey.ws Date: Tue, 08 Jun 2010 13:16:49 -0600 Message-ID: <20100608191649.4451.62289.stgit@localhost.localdomain> In-Reply-To: <20100608191447.4451.47795.stgit@localhost.localdomain> References: <20100608191447.4451.47795.stgit@localhost.localdomain> User-Agent: StGIT/0.14.3 MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. Cc: chrisw@redhat.com, alex.williamson@redhat.com, kvm@vger.kernel.org, quintela@redhat.com Subject: [Qemu-devel] [RFC PATCH 6/6] savevm: Use RAM blocks for basis of migration 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 don't want to assume a contiguous address space, so migrate based on RAM blocks instead of a fixed linear address map. Signed-off-by: Alex Williamson --- arch_init.c | 67 +++++++++++++++++++++++++++++++++++++---------------------- 1 files changed, 42 insertions(+), 25 deletions(-) diff --git a/arch_init.c b/arch_init.c index 8ba92ec..5780195 100644 --- a/arch_init.c +++ b/arch_init.c @@ -105,27 +105,26 @@ static int is_dup_page(uint8_t *page, uint8_t ch) 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(); + static RAMBlock *last_block = NULL; + static ram_addr_t last_offset = 0; + RAMBlock *block = last_block; + ram_addr_t offset = last_offset; + ram_addr_t current_addr; int bytes_sent = 0; - while (addr < total_ram) { + if (!block) + block = QLIST_FIRST(&ram.blocks); + + current_addr = block->offset + offset; + + do { if (cpu_physical_memory_get_dirty(current_addr, MIGRATION_DIRTY_FLAG)) { - RAMBlock *block; - ram_addr_t offset; uint8_t *p; cpu_physical_memory_reset_dirty(current_addr, current_addr + TARGET_PAGE_SIZE, MIGRATION_DIRTY_FLAG); - QLIST_FOREACH(block, &ram.blocks, next) { - if (current_addr - block->offset < block->length) - break; - } - offset = current_addr - block->offset; p = block->host + offset; if (is_dup_page(p, *p)) { @@ -142,9 +141,21 @@ static int ram_save_block(QEMUFile *f) break; } - addr += TARGET_PAGE_SIZE; - current_addr = (saved_addr + addr) % total_ram; - } + + offset += TARGET_PAGE_SIZE; + if (offset >= block->length) { + offset = 0; + block = QLIST_NEXT(block, next); + if (!block) + block = QLIST_FIRST(&ram.blocks); + } + + current_addr = block->offset + offset; + + } while (current_addr != last_block->offset + last_offset); + + last_block = block; + last_offset = offset; return bytes_sent; } @@ -153,13 +164,16 @@ static uint64_t bytes_transferred; static ram_addr_t ram_save_remaining(void) { - ram_addr_t addr; + RAMBlock *block; ram_addr_t count = 0; - uint64_t total_ram = ram_bytes_total(); - for (addr = 0; addr < total_ram; addr += TARGET_PAGE_SIZE) { - if (cpu_physical_memory_get_dirty(addr, MIGRATION_DIRTY_FLAG)) { - count++; + QLIST_FOREACH(block, &ram.blocks, next) { + ram_addr_t addr; + for (addr = block->offset; addr < block->offset + block->length; + addr += TARGET_PAGE_SIZE) { + if (cpu_physical_memory_get_dirty(addr, MIGRATION_DIRTY_FLAG)) { + count++; + } } } @@ -206,20 +220,23 @@ int ram_save_live(Monitor *mon, QEMUFile *f, int stage, void *opaque) if (stage == 1) { RAMBlock *block; - uint64_t total_ram = ram_bytes_total(); bytes_transferred = 0; /* Make sure all dirty bits are set */ - 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); + QLIST_FOREACH(block, &ram.blocks, next) { + for (addr = block->offset; addr < block->offset + block->length; + addr += TARGET_PAGE_SIZE) { + if (!cpu_physical_memory_get_dirty(addr, + MIGRATION_DIRTY_FLAG)) { + cpu_physical_memory_set_dirty(addr); + } } } /* Enable dirty memory tracking */ cpu_physical_memory_set_dirty_tracking(1); - qemu_put_be64(f, total_ram | RAM_SAVE_FLAG_MEM_SIZE); + qemu_put_be64(f, ram_bytes_total() | RAM_SAVE_FLAG_MEM_SIZE); QLIST_FOREACH(block, &ram.blocks, next) { qemu_put_buffer(f, (uint8_t *)block->name, sizeof(block->name));