From patchwork Tue Mar 27 09:10:43 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xiao Guangrong X-Patchwork-Id: 10312607 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id ABD4A60353 for ; Wed, 28 Mar 2018 09:21:29 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A861929C34 for ; Wed, 28 Mar 2018 09:21:29 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9D2E829CDD; Wed, 28 Mar 2018 09:21:29 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.4 required=2.0 tests=BAYES_00, DATE_IN_PAST_24_48, DKIM_ADSP_CUSTOM_MED,DKIM_SIGNED,FREEMAIL_FROM,RCVD_IN_DNSWL_HI, T_DKIM_INVALID autolearn=unavailable version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 42EF729C34 for ; Wed, 28 Mar 2018 09:21:29 +0000 (UTC) Received: from localhost ([::1]:38208 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1f17Gq-0001NM-EN for patchwork-qemu-devel@patchwork.kernel.org; Wed, 28 Mar 2018 05:21:28 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56781) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1f176f-00016a-Ch for qemu-devel@nongnu.org; Wed, 28 Mar 2018 05:11:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1f176e-0005Dv-CY for qemu-devel@nongnu.org; Wed, 28 Mar 2018 05:10:57 -0400 Received: from mail-pl0-x244.google.com ([2607:f8b0:400e:c01::244]:42123) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1f176e-0005Dc-5z for qemu-devel@nongnu.org; Wed, 28 Mar 2018 05:10:56 -0400 Received: by mail-pl0-x244.google.com with SMTP id g20-v6so1197323plo.9 for ; Wed, 28 Mar 2018 02:10:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=UxMSDyw24gAUGieRCnuofhQ6Hgyimbt8gF/MFUmaIiU=; b=vbFU56fc5y6zDso1MCfx8x4XcgE5I6UnnNm2fNYN4aUHfqT44AXvpSPZyA9Wu5XB4V BDwtbRKNWRxEoXFCUrIPUbqlC30VzrpzAvBU2D+nfuVXYO5KRmRyo53vEDq9/J+PFVWO ftUmXktzifgc/z3Z+UymCsDnXTtV80zvBCir3MNoON5DSc1KTuaELLXWDw/M5cr4DpM6 8h4UQEuvdcmb5F3oRlTpUN2HA710pLgDfQeYpvP5b8w4po+xCg07Vix2bYbClbixHBF8 +93gRexbT7trIJGShAlh64EtaD30qvwUTbOyMDkKNBXG8tQCaS8gs/68U0WswKJgwSEb Gj6w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=UxMSDyw24gAUGieRCnuofhQ6Hgyimbt8gF/MFUmaIiU=; b=sfbcLDLGkrZnkCruzHIbqCxit6S5fTWL/n4KMaGC29t/1EF5n1lU3U+oqy6oRcjzyv IGm7MA3d7x5lk8PrPwypEglY3Gi5VEWTqZzqhVT+ZL1GVug+5Y7guhQoMW+7RJDMlCmY 0scZ3KUrA0kXar6O7jDFVJMExZSPqXxiDrFoOfXaD49UWPiDs87HgMI+B6rHWu1hp9bt PPNcm8r735gQ020cEvU947cN4SEVFFRi0c+QDA2QPjybbp0PszxAKJ2rz8Ega43bTzsL I7VYvJhaRYNPISSgZjzrW6rP2Di8giN3P8e58H0r0HIhE1WzxReZGnl9n/w5aI+XEB5a CkNg== X-Gm-Message-State: AElRT7GtBznQ/Uep1NtEhERTudE2YujT43BMe/kAkfUGUThQ03rdnGNf 0mQo48gqEvMoOUD+xY2mLfU= X-Google-Smtp-Source: AIpwx48zmfdZXHSy+s/GOXWmMt6JbJ5TgJYNvwYPX2ogg94BEQdZTbEiSbMTCjU/8XcHIyxuiVUaQQ== X-Received: by 2002:a17:902:2c83:: with SMTP id n3-v6mr2978376plb.317.1522228255505; Wed, 28 Mar 2018 02:10:55 -0700 (PDT) Received: from localhost.localdomain ([203.205.141.38]) by smtp.gmail.com with ESMTPSA id q9sm5590648pgs.89.2018.03.28.02.10.52 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 28 Mar 2018 02:10:54 -0700 (PDT) From: guangrong.xiao@gmail.com X-Google-Original-From: xiaoguangrong@tencent.com To: pbonzini@redhat.com, mst@redhat.com, mtosatti@redhat.com Date: Tue, 27 Mar 2018 17:10:43 +0800 Message-Id: <20180327091043.30220-11-xiaoguangrong@tencent.com> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180327091043.30220-1-xiaoguangrong@tencent.com> References: <20180327091043.30220-1-xiaoguangrong@tencent.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400e:c01::244 Subject: [Qemu-devel] [PATCH v2 10/10] migration: remove ram_save_compressed_page() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kvm@vger.kernel.org, Xiao Guangrong , qemu-devel@nongnu.org, peterx@redhat.com, dgilbert@redhat.com, wei.w.wang@intel.com, jiang.biao2@zte.com.cn Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP From: Xiao Guangrong Now, we can reuse the path in ram_save_page() to post the page out as normal, then the only thing remained in ram_save_compressed_page() is compression that we can move it out to the caller Reviewed-by: Peter Xu Reviewed-by: Dr. David Alan Gilbert Signed-off-by: Xiao Guangrong --- migration/ram.c | 45 ++++++++------------------------------------- 1 file changed, 8 insertions(+), 37 deletions(-) diff --git a/migration/ram.c b/migration/ram.c index e71a9aee11..5187455a93 100644 --- a/migration/ram.c +++ b/migration/ram.c @@ -1186,41 +1186,6 @@ static int compress_page_with_multi_thread(RAMState *rs, RAMBlock *block, return pages; } -/** - * ram_save_compressed_page: compress the given page and send it to the stream - * - * Returns the number of pages written. - * - * @rs: current RAM state - * @block: block that contains the page we want to send - * @offset: offset inside the block for the page - * @last_stage: if we are at the completion stage - */ -static int ram_save_compressed_page(RAMState *rs, PageSearchStatus *pss, - bool last_stage) -{ - int pages = -1; - uint8_t *p; - RAMBlock *block = pss->block; - ram_addr_t offset = pss->page << TARGET_PAGE_BITS; - - p = block->host + offset; - - if (block != rs->last_sent_block) { - /* - * Make sure the first page is sent out before other pages. - * - * we post it as normal page as compression will take much - * CPU resource. - */ - pages = save_normal_page(rs, block, offset, p, true); - } else { - pages = compress_page_with_multi_thread(rs, block, offset); - } - - return pages; -} - /** * find_dirty_block: find the next dirty page and update any state * associated with the search process. @@ -1520,8 +1485,14 @@ static int ram_save_target_page(RAMState *rs, PageSearchStatus *pss, return res; } - if (save_page_use_compression(rs)) { - return ram_save_compressed_page(rs, pss, last_stage); + /* + * Make sure the first page is sent out before other pages. + * + * we post it as normal page as compression will take much + * CPU resource. + */ + if (block == rs->last_sent_block && save_page_use_compression(rs)) { + res = compress_page_with_multi_thread(rs, block, offset); } return ram_save_page(rs, pss, last_stage);