From patchwork Tue Mar 13 07:57:39 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xiao Guangrong X-Patchwork-Id: 885026 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="vPjimVCT"; dkim-atps=neutral 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 400nTg0LNbz9sSf for ; Tue, 13 Mar 2018 19:05:27 +1100 (AEDT) Received: from localhost ([::1]:37468 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1evew0-0008UK-UP for incoming@patchwork.ozlabs.org; Tue, 13 Mar 2018 04:05:24 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43055) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1evep8-000348-N6 for qemu-devel@nongnu.org; Tue, 13 Mar 2018 03:58:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1evep7-0007pq-8D for qemu-devel@nongnu.org; Tue, 13 Mar 2018 03:58:18 -0400 Received: from mail-pf0-x243.google.com ([2607:f8b0:400e:c00::243]:42258) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1evep7-0007p5-2c for qemu-devel@nongnu.org; Tue, 13 Mar 2018 03:58:17 -0400 Received: by mail-pf0-x243.google.com with SMTP id a16so5531824pfn.9 for ; Tue, 13 Mar 2018 00:58:16 -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=CSKV4ZsjZA8tRrRtQklVjRu5ljpTR9hU0naEcvkbxu8=; b=vPjimVCT/qraJAgjygypUUfvV/cqe88sKlNsm07kVf02QGFAP6/ZIHKl3zOmmz9uRm NCjkwGLQDYIZ0csg5FVtTXJwtt92tsmOiyKEjRzbhFDmqHm8YPA/7Od2uuWUZhcsj7NN af4wswjAfoBGndRM22KsUpDJYR0/Z2QU7xilOdwt+kvilVTnbb1SYsiBwx7+niS3tsaV UbZ5mfTihcxnG0JUgixPmjWL2Adsr8RvLdt/gRm/ErvicEDFeBnnaTfmNB4WDIUmgbI8 qWnieFzpBnaaDOGF8tBbkLUcysrtE0lYxOGFhiK5nSXpQqiXwitBf4KdvAjME59V9gf/ 42eg== 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=CSKV4ZsjZA8tRrRtQklVjRu5ljpTR9hU0naEcvkbxu8=; b=tckEYEP3u+ar1VLR4+xrpCQ0j8UO1zBYczNJgsivXNjIXF0bYugViuGToXxKj7+C+p Y34Uork6FwQvWG5EY7ig/FJX5/a7kH1unoceSukNMkjcA7QnkI2IRqF0hMkZHd+abDjh KXDbVx4Nlt9j95DuwBETBTTfHLsV7Te6aR+COQasyKG71PJ1EedAk7kbG27uf+tDs/sY fQAoNPN+x44iVHjly8pL/pkCTH32+jnwcjxffkH3NfvITLirj0EWnL4EDQNqunB1l3Yh SlqO5nDIO+GFhfuLD2fXk5FkrTXY/JxHg8oh2sRq86zrkyFjTdhgICj9Wo7s3MI+FOIW fXmg== X-Gm-Message-State: AElRT7GjJDKEMvCIaO2oqS7kwKcsIW9AKNhOmPb8hkiFrDv/vdn6ae0a asDFMZ+SIL2WUhFDmxhIBwY= X-Google-Smtp-Source: AG47ELtqSFbLKqHbc55tTWz2UzabCSOIVPx8llKX9L8P5IA6kN7JjEluN9lw15D2SaZ2NMsKExSkOg== X-Received: by 10.98.254.6 with SMTP id z6mr10747909pfh.155.1520927896160; Tue, 13 Mar 2018 00:58:16 -0700 (PDT) Received: from localhost.localdomain ([203.205.141.35]) by smtp.gmail.com with ESMTPSA id x4sm16756537pgv.72.2018.03.13.00.58.13 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 13 Mar 2018 00:58:15 -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, 13 Mar 2018 15:57:39 +0800 Message-Id: <20180313075739.11194-9-xiaoguangrong@tencent.com> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180313075739.11194-1-xiaoguangrong@tencent.com> References: <20180313075739.11194-1-xiaoguangrong@tencent.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400e:c00::243 Subject: [Qemu-devel] [PATCH 8/8] 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: Xiao Guangrong , qemu-devel@nongnu.org, kvm@vger.kernel.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" 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 Signed-off-by: Xiao Guangrong Reviewed-by: Dr. David Alan Gilbert Reviewed-by: Peter Xu --- migration/ram.c | 45 ++++++++------------------------------------- 1 file changed, 8 insertions(+), 37 deletions(-) diff --git a/migration/ram.c b/migration/ram.c index f778627992..8f4f8aca86 100644 --- a/migration/ram.c +++ b/migration/ram.c @@ -1162,41 +1162,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. @@ -1501,8 +1466,14 @@ static int ram_save_target_page(RAMState *rs, PageSearchStatus *pss, goto page_saved; } - if (save_page_use_compression(rs)) { - res = 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); } else { res = ram_save_page(rs, pss, last_stage); }