From patchwork Tue Oct 30 08:32:40 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Isaku Yamahata X-Patchwork-Id: 195412 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 05DE42C009B for ; Tue, 30 Oct 2012 21:26:25 +1100 (EST) Received: from localhost ([::1]:47790 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TT7HH-00068c-Q3 for incoming@patchwork.ozlabs.org; Tue, 30 Oct 2012 04:34:27 -0400 Received: from eggs.gnu.org ([208.118.235.92]:60735) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TT7GH-0004it-RK for qemu-devel@nongnu.org; Tue, 30 Oct 2012 04:33:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TT7GB-0000XU-Q1 for qemu-devel@nongnu.org; Tue, 30 Oct 2012 04:33:25 -0400 Received: from mail.valinux.co.jp ([210.128.90.3]:44725) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TT7GB-0000Wn-Bi for qemu-devel@nongnu.org; Tue, 30 Oct 2012 04:33:19 -0400 Received: from ps.local.valinux.co.jp (vagw.valinux.co.jp [210.128.90.14]) by mail.valinux.co.jp (Postfix) with SMTP id 819C2181B8; Tue, 30 Oct 2012 17:33:12 +0900 (JST) Received: (nullmailer pid 29408 invoked by uid 1000); Tue, 30 Oct 2012 08:33:11 -0000 From: Isaku Yamahata To: qemu-devel@nongnu.org, kvm@vger.kernel.org Date: Tue, 30 Oct 2012 17:32:40 +0900 Message-Id: <458a8667e007fb87f84000b22891ace8d45fcc3d.1351582535.git.yamahata@valinux.co.jp> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: References: In-Reply-To: References: X-Virus-Scanned: clamav-milter 0.95.2 at va-mail.local.valinux.co.jp X-Virus-Status: Clean X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) X-Received-From: 210.128.90.3 Cc: benoit.hudzia@gmail.com, aarcange@redhat.com, aliguori@us.ibm.com, quintela@redhat.com, stefanha@gmail.com, t.hirofuchi@aist.go.jp, dlaor@redhat.com, satoshi.itoh@aist.go.jp, mdroth@linux.vnet.ibm.com, yoshikawa.takuya@oss.ntt.co.jp, owasserm@redhat.com, Umesh Deshpande , avi@redhat.com, pbonzini@redhat.com, chegu_vinod@hp.com Subject: [Qemu-devel] [PATCH v3 04/35] add a version number to ram_list X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Umesh Deshpande From: Umesh Deshpande This will be used to detect if last_block might have become invalid across different calls to ram_save_live. Signed-off-by: Paolo Bonzini Signed-off-by: Umesh Deshpande --- arch_init.c | 7 ++++++- cpu-all.h | 1 + exec.c | 5 ++++- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/arch_init.c b/arch_init.c index d6162af..eb36a6a 100644 --- a/arch_init.c +++ b/arch_init.c @@ -336,6 +336,7 @@ static RAMBlock *last_block; static ram_addr_t last_offset; static unsigned long *migration_bitmap; static uint64_t migration_dirty_pages; +static uint32_t last_version; static inline bool migration_bitmap_test_and_reset_dirty(MemoryRegion *mr, ram_addr_t offset) @@ -406,7 +407,6 @@ static void migration_bitmap_sync(void) } } - /* * ram_save_block: Writes a page of memory to the stream f * @@ -558,6 +558,7 @@ static void reset_ram_globals(void) { last_block = NULL; last_offset = 0; + last_version = ram_list.version; sort_ram_list(); } @@ -613,6 +614,10 @@ static int ram_save_iterate(QEMUFile *f, void *opaque) uint64_t expected_downtime; MigrationState *s = migrate_get_current(); + if (ram_list.version != last_version) { + reset_ram_globals(); + } + bytes_transferred_last = bytes_transferred; bwidth = qemu_get_clock_ns(rt_clock); diff --git a/cpu-all.h b/cpu-all.h index ecbba12..84aea8b 100644 --- a/cpu-all.h +++ b/cpu-all.h @@ -500,6 +500,7 @@ typedef struct RAMBlock { typedef struct RAMList { uint8_t *phys_dirty; + uint32_t version; QLIST_HEAD(, RAMBlock) blocks_mru; QLIST_HEAD(, RAMBlock) blocks; } RAMList; diff --git a/exec.c b/exec.c index 489d924..f5a8aca 100644 --- a/exec.c +++ b/exec.c @@ -645,7 +645,6 @@ bool tcg_enabled(void) void cpu_exec_init_all(void) { #if !defined(CONFIG_USER_ONLY) - qemu_mutex_init(&ram_list.mutex); memory_map_init(); io_mem_init(); #endif @@ -2570,6 +2569,8 @@ ram_addr_t qemu_ram_alloc_from_ptr(ram_addr_t size, void *host, QLIST_INSERT_HEAD(&ram_list.blocks, new_block, next); QLIST_INSERT_HEAD(&ram_list.blocks_mru, new_block, next_mru); + ram_list.version++; + ram_list.phys_dirty = g_realloc(ram_list.phys_dirty, last_ram_offset() >> TARGET_PAGE_BITS); memset(ram_list.phys_dirty + (new_block->offset >> TARGET_PAGE_BITS), @@ -2598,6 +2599,7 @@ void qemu_ram_free_from_ptr(ram_addr_t addr) if (addr == block->offset) { QLIST_REMOVE(block, next); QLIST_REMOVE(block, next_mru); + ram_list.version++; g_free(block); return; } @@ -2612,6 +2614,7 @@ void qemu_ram_free(ram_addr_t addr) if (addr == block->offset) { QLIST_REMOVE(block, next); QLIST_REMOVE(block, next_mru); + ram_list.version++; if (block->flags & RAM_PREALLOC_MASK) { ; } else if (mem_path) {