From patchwork Tue Mar 12 15:51:58 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Lieven X-Patchwork-Id: 227061 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 34D502C0080 for ; Wed, 13 Mar 2013 02:53:14 +1100 (EST) Received: from localhost ([::1]:55614 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UFRVo-0005YP-DD for incoming@patchwork.ozlabs.org; Tue, 12 Mar 2013 11:53:12 -0400 Received: from eggs.gnu.org ([208.118.235.92]:57599) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UFRVO-0005Tl-4x for qemu-devel@nongnu.org; Tue, 12 Mar 2013 11:52:53 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UFRUb-00039B-JC for qemu-devel@nongnu.org; Tue, 12 Mar 2013 11:52:46 -0400 Received: from ssl.dlhnet.de ([91.198.192.8]:46044 helo=ssl.dlh.net) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UFRUb-00038k-AW for qemu-devel@nongnu.org; Tue, 12 Mar 2013 11:51:57 -0400 Received: from localhost (localhost [127.0.0.1]) by ssl.dlh.net (Postfix) with ESMTP id CA32D14540E; Tue, 12 Mar 2013 16:51:56 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at ssl.dlh.net Received: from ssl.dlh.net ([127.0.0.1]) by localhost (ssl.dlh.net [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Tjw5I8fvmbiu; Tue, 12 Mar 2013 16:51:56 +0100 (CET) Received: from [172.21.12.60] (unknown [82.141.1.226]) by ssl.dlh.net (Postfix) with ESMTPSA id 71F7513F711; Tue, 12 Mar 2013 16:51:56 +0100 (CET) Message-ID: <513F4F1E.2060400@dlhnet.de> Date: Tue, 12 Mar 2013 16:51:58 +0100 From: Peter Lieven User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/20130221 Thunderbird/17.0.3 MIME-Version: 1.0 To: "qemu-devel@nongnu.org" X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 91.198.192.8 Cc: Kevin Wolf , Paolo Bonzini , Orit Wasserman , Stefan Hajnoczi Subject: [Qemu-devel] [RFC][PATCH 6/9] migration: use XBZRLE only after bulk stage 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 at the beginning of migration all pages are marked dirty and in the first round a bulk migration of all pages is performed. currently all these pages are copied to the page cache regardless if there are frequently updated or not. this doesn't make sense since most of these pages are never transferred again. this patch changes the XBZRLE transfer to only be used after the bulk stage has been completed. that means a page is added to the page cache the second time it is transferred and XBZRLE can benefit from the third time of transfer. since the page cache is likely smaller than the number of pages its also likely that in the second round the page is missing in the cache due to collisions in the bulk phase. on the other hand a lot of unneccssary mallocs, memdups and frees are saved. Signed-off-by: Peter Lieven --- arch_init.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch_init.c b/arch_init.c index 3d09327..04c82e4 100644 --- a/arch_init.c +++ b/arch_init.c @@ -451,7 +451,7 @@ static int ram_save_block(QEMUFile *f, bool last_stage) RAM_SAVE_FLAG_COMPRESS); qemu_put_byte(f, *p); bytes_sent += 1; - } else if (migrate_use_xbzrle()) { + } else if (!ram_bulk_stage && migrate_use_xbzrle()) { current_addr = block->offset + offset; bytes_sent = save_xbzrle_page(f, p, current_addr, block, offset, cont, last_stage);