From patchwork Fri Dec 12 01:29:00 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Li, Liang Z" X-Patchwork-Id: 420329 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id BBB611400EA for ; Fri, 12 Dec 2014 12:39:22 +1100 (AEDT) Received: from localhost ([::1]:55013 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XzFCS-0008Qm-S4 for incoming@patchwork.ozlabs.org; Thu, 11 Dec 2014 20:39:20 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48215) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XzF9Y-0003aT-F6 for qemu-devel@nongnu.org; Thu, 11 Dec 2014 20:36:25 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XzF9T-0004qK-8Y for qemu-devel@nongnu.org; Thu, 11 Dec 2014 20:36:20 -0500 Received: from mga09.intel.com ([134.134.136.24]:11941) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XzF9S-0004lx-T8 for qemu-devel@nongnu.org; Thu, 11 Dec 2014 20:36:15 -0500 Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga102.jf.intel.com with ESMTP; 11 Dec 2014 17:34:48 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.07,561,1413270000"; d="scan'208";a="622529857" Received: from lil.sh.intel.com (HELO localhost) ([10.239.36.68]) by orsmga001.jf.intel.com with ESMTP; 11 Dec 2014 17:36:12 -0800 From: Liang Li To: qemu-devel@nongnu.org Date: Fri, 12 Dec 2014 09:29:00 +0800 Message-Id: <1418347746-15829-8-git-send-email-liang.z.li@intel.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1418347746-15829-1-git-send-email-liang.z.li@intel.com> References: <1418347746-15829-1-git-send-email-liang.z.li@intel.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 134.134.136.24 Cc: quintela@redhat.com, Liang Li , armbru@redhat.com, lcapitulino@redhat.com, yang.z.zhang@intel.com, dgilbert@redhat.com Subject: [Qemu-devel] [v3 07/13] migraion: Rewrite the function ram_save_page() 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 We rewrite this function to reuse the code in it Signed-off-by: Liang Li Signed-off-by: Yang Zhang --- arch_init.c | 107 ++++++++++++++++++++++++++++++++++-------------------------- 1 file changed, 61 insertions(+), 46 deletions(-) diff --git a/arch_init.c b/arch_init.c index 71cc756..0a575ed 100644 --- a/arch_init.c +++ b/arch_init.c @@ -596,6 +596,63 @@ static void migration_bitmap_sync_range(ram_addr_t start, ram_addr_t length) } } +static int save_zero_and_xbzrle_page(QEMUFile *f, RAMBlock* block, + ram_addr_t offset, bool last_stage, bool *send_async) +{ + int bytes_sent; + int cont; + ram_addr_t current_addr; + MemoryRegion *mr = block->mr; + uint8_t *p; + int ret; + + cont = (block == last_sent_block) ? RAM_SAVE_FLAG_CONTINUE : 0; + + p = memory_region_get_ram_ptr(mr) + offset; + + /* In doubt sent page as normal */ + bytes_sent = -1; + ret = ram_control_save_page(f, block->offset, + offset, TARGET_PAGE_SIZE, &bytes_sent); + + XBZRLE_cache_lock(); + + current_addr = block->offset + offset; + if (ret != RAM_SAVE_CONTROL_NOT_SUPP) { + if (ret != RAM_SAVE_CONTROL_DELAYED) { + if (bytes_sent > 0) { + acct_info.norm_pages++; + } else if (bytes_sent == 0) { + acct_info.dup_pages++; + } + } + } else if (is_zero_range(p, TARGET_PAGE_SIZE)) { + acct_info.dup_pages++; + bytes_sent = save_block_hdr(f, block, offset, cont, + RAM_SAVE_FLAG_COMPRESS); + qemu_put_byte(f, 0); + bytes_sent++; + /* Must let xbzrle know, otherwise a previous (now 0'd) cached + * page would be stale + */ + xbzrle_cache_zero_page(current_addr); + } else if (!ram_bulk_stage && migrate_use_xbzrle()) { + bytes_sent = save_xbzrle_page(f, &p, current_addr, block, + offset, cont, last_stage); + if (!last_stage) { + /* Can't send this cached data async, since the cache page + * might get updated before it gets to the wire + */ + if (send_async != NULL) { + *send_async = false; + } + } + } + + XBZRLE_cache_unlock(); + + return bytes_sent; +} /* Needs iothread lock! */ /* Fix me: there are too many global variables used in migration process. */ @@ -691,55 +748,15 @@ static int ram_save_page(QEMUFile *f, RAMBlock* block, ram_addr_t offset, { int bytes_sent; int cont; - ram_addr_t current_addr; MemoryRegion *mr = block->mr; uint8_t *p; - int ret; bool send_async = true; - cont = (block == last_sent_block) ? RAM_SAVE_FLAG_CONTINUE : 0; - - p = memory_region_get_ram_ptr(mr) + offset; - - /* In doubt sent page as normal */ - bytes_sent = -1; - ret = ram_control_save_page(f, block->offset, - offset, TARGET_PAGE_SIZE, &bytes_sent); - - XBZRLE_cache_lock(); - - current_addr = block->offset + offset; - if (ret != RAM_SAVE_CONTROL_NOT_SUPP) { - if (ret != RAM_SAVE_CONTROL_DELAYED) { - if (bytes_sent > 0) { - acct_info.norm_pages++; - } else if (bytes_sent == 0) { - acct_info.dup_pages++; - } - } - } else if (is_zero_range(p, TARGET_PAGE_SIZE)) { - acct_info.dup_pages++; - bytes_sent = save_block_hdr(f, block, offset, cont, - RAM_SAVE_FLAG_COMPRESS); - qemu_put_byte(f, 0); - bytes_sent++; - /* Must let xbzrle know, otherwise a previous (now 0'd) cached - * page would be stale - */ - xbzrle_cache_zero_page(current_addr); - } else if (!ram_bulk_stage && migrate_use_xbzrle()) { - bytes_sent = save_xbzrle_page(f, &p, current_addr, block, - offset, cont, last_stage); - if (!last_stage) { - /* Can't send this cached data async, since the cache page - * might get updated before it gets to the wire - */ - send_async = false; - } - } - - /* XBZRLE overflow or normal page */ + bytes_sent = save_zero_and_xbzrle_page(f, block, offset, + last_stage, &send_async); if (bytes_sent == -1) { + cont = (block == last_sent_block) ? RAM_SAVE_FLAG_CONTINUE : 0; + p = memory_region_get_ram_ptr(mr) + offset; bytes_sent = save_block_hdr(f, block, offset, cont, RAM_SAVE_FLAG_PAGE); if (send_async) { qemu_put_buffer_async(f, p, TARGET_PAGE_SIZE); @@ -750,8 +767,6 @@ static int ram_save_page(QEMUFile *f, RAMBlock* block, ram_addr_t offset, acct_info.norm_pages++; } - XBZRLE_cache_unlock(); - return bytes_sent; }