From patchwork Mon May 14 16:54:16 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhang Chen X-Patchwork-Id: 10398933 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 4678B6053A for ; Mon, 14 May 2018 17:04:00 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 34D65283D1 for ; Mon, 14 May 2018 17:04:00 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 339682843C; Mon, 14 May 2018 17:04:00 +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=-7.8 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI, T_DKIM_INVALID autolearn=ham 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 306F728420 for ; Mon, 14 May 2018 17:01:55 +0000 (UTC) Received: from localhost ([::1]:47300 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fIGrC-0006pM-CA for patchwork-qemu-devel@patchwork.kernel.org; Mon, 14 May 2018 13:01:54 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33482) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fIGku-00083s-Us for qemu-devel@nongnu.org; Mon, 14 May 2018 12:55:26 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fIGku-0005iW-2v for qemu-devel@nongnu.org; Mon, 14 May 2018 12:55:25 -0400 Received: from mail-pf0-x241.google.com ([2607:f8b0:400e:c00::241]:34628) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fIGkt-0005hl-GU for qemu-devel@nongnu.org; Mon, 14 May 2018 12:55:23 -0400 Received: by mail-pf0-x241.google.com with SMTP id a14-v6so6308984pfi.1 for ; Mon, 14 May 2018 09:55:23 -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=6fPviG/TdAWgY7B4YSvh1j6C30LwuMZ+AXnMP/6ZFpM=; b=co9CsyjaoYmr+pZUjdfs0btodDsNSgURVcgZfdxJjRrKElYrKcpm8jD7h6sqOSvUaP s3WfBPoDyk/YYNx0MF/H/SwLaOWgYMovJicrafofHG0CohpaoSFSth4d6YOeyfVJsjZi c0bRDuN7m3958WUQjoYmCXuPK+uZMAGAPGJ4nPUIR+elJifvQFFO/jdOVOstpfI09LIU HTnVktneL79LjqDANnnNGfvHvu5oUR1Zm5o8Gtl1+hQsEe7QfexyufFDSi01A7RUT+si ZORT7oSHDqtSFlId9pFBSxTIuf/iwyH3m+mJ05+4P9l2gMlW84fFVo4JmUSifB5N70nW MHyA== 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=6fPviG/TdAWgY7B4YSvh1j6C30LwuMZ+AXnMP/6ZFpM=; b=TeZ+beHnQ6lnfS1konyCPwAZwzO/q8BRqsvGl7l5xucsdjVcIfXYK6hh4UwKeqKjqx h4uRCatF4oJuhEWwZIa5cX0Mit4zNuO2TZUeTbdbe+EKTpKIJyWxro3janSaWqen8Doh IBhXEB7Y2/cu+eZaf9PmLeLIRcuZf6KtimkpqIp4sKrwEhCDj5ye/Vpl99J/huLBdQxA 0KncM+fHVVYrb64n5G0cqFPZgempfAvRVL0RAqfetjjetKoXbBFKaDRlj0c3n7SkBDhK E9DtQVJ9mKKfb8b/EwBax8Pn39BsDo6oiDg5qDY7d9bMkLBrKDAL0sraLKhLyGH+sYU2 uOgQ== X-Gm-Message-State: ALKqPwcDTrZ1JXIeu0XmwvwWEODWAs/9lu0GH7AEEfOA3a95d7hCcV0C AWjzE9zn3zkjvZ4ZDws/BxpctA== X-Google-Smtp-Source: AB8JxZqLkReBtzkJ/ovAN7sjZQP5XqW+sEAYvIto6bhQj1+ob8c3Q1ZCpNSae4g7c9WqbV/tXVO9NA== X-Received: by 2002:a63:9812:: with SMTP id q18-v6mr9001068pgd.170.1526316921897; Mon, 14 May 2018 09:55:21 -0700 (PDT) Received: from localhost.localdomain (109.227.199.104.bc.googleusercontent.com. [104.199.227.109]) by smtp.gmail.com with ESMTPSA id u69-v6sm631448pgb.42.2018.05.14.09.55.17 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 14 May 2018 09:55:20 -0700 (PDT) From: Zhang Chen To: qemu-devel@nongnu.org Date: Tue, 15 May 2018 00:54:16 +0800 Message-Id: <20180514165424.12884-10-zhangckid@gmail.com> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180514165424.12884-1-zhangckid@gmail.com> References: <20180514165424.12884-1-zhangckid@gmail.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400e:c00::241 Subject: [Qemu-devel] [PATCH V7 RESEND 09/17] COLO: Flush memory data from ram cache 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: zhanghailiang , Li Zhijian , Jason Wang , Markus Armbruster , "Dr . David Alan Gilbert" , Zhang Chen , Paolo Bonzini Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP During the time of VM's running, PVM may dirty some pages, we will transfer PVM's dirty pages to SVM and store them into SVM's RAM cache at next checkpoint time. So, the content of SVM's RAM cache will always be same with PVM's memory after checkpoint. Instead of flushing all content of PVM's RAM cache into SVM's MEMORY, we do this in a more efficient way: Only flush any page that dirtied by PVM since last checkpoint. In this way, we can ensure SVM's memory same with PVM's. Besides, we must ensure flush RAM cache before load device state. Signed-off-by: zhanghailiang Signed-off-by: Li Zhijian Reviewed-by: Dr. David Alan Gilbert --- migration/ram.c | 39 +++++++++++++++++++++++++++++++++++++++ migration/trace-events | 2 ++ 2 files changed, 41 insertions(+) diff --git a/migration/ram.c b/migration/ram.c index e35dfee06e..4235a8f24d 100644 --- a/migration/ram.c +++ b/migration/ram.c @@ -3031,6 +3031,40 @@ static bool postcopy_is_running(void) return ps >= POSTCOPY_INCOMING_LISTENING && ps < POSTCOPY_INCOMING_END; } +/* + * Flush content of RAM cache into SVM's memory. + * Only flush the pages that be dirtied by PVM or SVM or both. + */ +static void colo_flush_ram_cache(void) +{ + RAMBlock *block = NULL; + void *dst_host; + void *src_host; + unsigned long offset = 0; + + trace_colo_flush_ram_cache_begin(ram_state->migration_dirty_pages); + rcu_read_lock(); + block = QLIST_FIRST_RCU(&ram_list.blocks); + + while (block) { + offset = migration_bitmap_find_dirty(ram_state, block, offset); + migration_bitmap_clear_dirty(ram_state, block, offset); + + if (offset << TARGET_PAGE_BITS >= block->used_length) { + offset = 0; + block = QLIST_NEXT_RCU(block, next); + } else { + dst_host = block->host + (offset << TARGET_PAGE_BITS); + src_host = block->colo_cache + (offset << TARGET_PAGE_BITS); + memcpy(dst_host, src_host, TARGET_PAGE_SIZE); + } + } + + rcu_read_unlock(); + trace_colo_flush_ram_cache_end(); + assert(ram_state->migration_dirty_pages == 0); +} + static int ram_load(QEMUFile *f, void *opaque, int version_id) { int flags = 0, ret = 0, invalid_flags = 0; @@ -3043,6 +3077,7 @@ static int ram_load(QEMUFile *f, void *opaque, int version_id) bool postcopy_running = postcopy_is_running(); /* ADVISE is earlier, it shows the source has the postcopy capability on */ bool postcopy_advised = postcopy_is_advised(); + bool need_flush = false; seq_iter++; @@ -3218,6 +3253,10 @@ static int ram_load(QEMUFile *f, void *opaque, int version_id) ret |= wait_for_decompress_done(); rcu_read_unlock(); trace_ram_load_complete(ret, seq_iter); + + if (!ret && migration_incoming_in_colo_state() && need_flush) { + colo_flush_ram_cache(); + } return ret; } diff --git a/migration/trace-events b/migration/trace-events index 9295b4cf40..8e2f9749e0 100644 --- a/migration/trace-events +++ b/migration/trace-events @@ -78,6 +78,8 @@ ram_load_postcopy_loop(uint64_t addr, int flags) "@%" PRIx64 " %x" ram_postcopy_send_discard_bitmap(void) "" ram_save_page(const char *rbname, uint64_t offset, void *host) "%s: offset: 0x%" PRIx64 " host: %p" ram_save_queue_pages(const char *rbname, size_t start, size_t len) "%s: start: 0x%zx len: 0x%zx" +colo_flush_ram_cache_begin(uint64_t dirty_pages) "dirty_pages %" PRIu64 +colo_flush_ram_cache_end(void) "" # migration/migration.c await_return_path_close_on_source_close(void) ""