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: 10312573 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 390A160212 for ; Wed, 28 Mar 2018 09:11:01 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2D4A929B47 for ; Wed, 28 Mar 2018 09:11:01 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 21F1D29C2C; Wed, 28 Mar 2018 09:11:01 +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.7 required=2.0 tests=BAYES_00, DATE_IN_PAST_24_48, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id AED7E29C01 for ; Wed, 28 Mar 2018 09:11:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752234AbeC1JK6 (ORCPT ); Wed, 28 Mar 2018 05:10:58 -0400 Received: from mail-pl0-f68.google.com ([209.85.160.68]:45579 "EHLO mail-pl0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752169AbeC1JK4 (ORCPT ); Wed, 28 Mar 2018 05:10:56 -0400 Received: by mail-pl0-f68.google.com with SMTP id n15-v6so1193230plp.12 for ; Wed, 28 Mar 2018 02:10:55 -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=HUQPV9Ddut6MBN88EwZnkzQGGgJ5v7UJndH4P9g+FJup3+kC3yu/BAe1b712ok6m5/ EA65wV2BDlh+sojS50rltmFuIvZfe4CB4YoEP8F/m1JZiXVM1qAAEVbRxgOPJPGDoGiD K4NSxNdyFBC9Wo6cr39zK5YizS0mW7he9ZXgV+irJV/EOnVWLR9LyZoZ4NnZoR4YpORd lW2hQZeUQToBBvofLlESOGHlJeVa7y/1uXuTVS6oQ2GJgNIyyOC1NCXwX/Q3xBF6CQrO 7JP66V7B2Z+NzpWlf7t5Sqn56OKdpK//kLqviVNgyss5aAKFnHbbJMVY2ZPlNBRYf+7J gG6g== X-Gm-Message-State: AElRT7FSYfD7NIfXB2XbijrRKfqtLhtDKgMiROaJZlHcp0mhoOUDPr0D 77w+bHJyAUHmh0Ikk4UTRW7qug== 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 Cc: qemu-devel@nongnu.org, kvm@vger.kernel.org, dgilbert@redhat.com, peterx@redhat.com, jiang.biao2@zte.com.cn, wei.w.wang@intel.com, Xiao Guangrong Subject: [PATCH v2 10/10] migration: remove ram_save_compressed_page() 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> Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org 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);