From patchwork Mon Sep 3 04:38:50 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhang Chen X-Patchwork-Id: 10585417 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id A70D0112B for ; Mon, 3 Sep 2018 04:46:39 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 96265296D0 for ; Mon, 3 Sep 2018 04:46:39 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8A485296D4; Mon, 3 Sep 2018 04:46:39 +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 16B4F296D0 for ; Mon, 3 Sep 2018 04:46:39 +0000 (UTC) Received: from localhost ([::1]:43391 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fwgl4-0006dt-C8 for patchwork-qemu-devel@patchwork.kernel.org; Mon, 03 Sep 2018 00:46:38 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56277) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fwgfi-0008LX-2v for qemu-devel@nongnu.org; Mon, 03 Sep 2018 00:41:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fwgfh-0004pt-9o for qemu-devel@nongnu.org; Mon, 03 Sep 2018 00:41:06 -0400 Received: from mail-pf1-x42a.google.com ([2607:f8b0:4864:20::42a]:39030) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fwgfh-0004pd-4b for qemu-devel@nongnu.org; Mon, 03 Sep 2018 00:41:05 -0400 Received: by mail-pf1-x42a.google.com with SMTP id j8-v6so8107633pff.6 for ; Sun, 02 Sep 2018 21:41:05 -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=w+z2NMcbiosMUoJrtQY1sknLV6dwxqLnjEceWuQ/STA=; b=srJW4Tb4e/fQmu8TS0cct0LFJClLpZABZb5fdv8RgcSWiCh39UFm2zfTMb6M1OwfCL +rOvVH+8AXfnSyNOHuFQHZvQLBfFASDmedIUInkAAdlsUF1Nkug0m0HZCymQMrKMk1nD Lb+M2L1DN78r0ft2JM/b6gkLOkU8VeuJgllSoO/KTMtjVBuRROK+Q3Xy8QKo4oilSBPt kpMihQ4UXKfwXkGmWNsKvzgOLufOoktvmeJLMRwxMxy6AVu7Hjec2eqxKTfKZ++PEobp aGYpYFQfpnsKMvSaOphx2y5JF+7i3k344ezCEkAvLuWFEv+CWoiq0MFrNBdc+t9xJVnb ipIw== 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=w+z2NMcbiosMUoJrtQY1sknLV6dwxqLnjEceWuQ/STA=; b=YR/WFFUlKjP6Ao6HS6RqvdwVQCIpQDAdwke/uzjnhZrBvVqM2MsK2ICqn20iH5kAIf OKA8bSBAQF8cnUQbweA7DWJ5h4F5yVqBmuh332J47yrDrhWXYywAoLrftZtraOPlEJHh f5w+VUMhLHnuCQRNjW6EeZu3u9IifFYfSG4kYNIK/pQpuR+SWykzOeqhn+ugL4s51tOx C/U2V0EtOAXfDaRYoYZzuXGsEVAiA1RiWz3IM0+9DCvEeU368hrS3p1ZvBWYFeffcYFM B+mc/0tYK4+p7QBy2RzEcecde63Q+rd6VtQl8fQSH9gqZr/lZSS97JOjHuGVxC8ZtdoT WJMg== X-Gm-Message-State: APzg51Dwr/k2ujVVwVyjxz/ibWqCHBy1cJb5zemneIRzyyk1wEef0iGv 1w75pBIAJmJJfxru3jRItbgi+vc1 X-Google-Smtp-Source: ANB0VdYIF48EIMZORAUnTfjRVDINfbEZK+xkMnwgovuW64UBR+y8ZM9phT02ZiAS06KUbDK5vBWczw== X-Received: by 2002:a63:2605:: with SMTP id m5-v6mr18397561pgm.225.1535949664030; Sun, 02 Sep 2018 21:41:04 -0700 (PDT) Received: from localhost.localdomain (155.150.229.35.bc.googleusercontent.com. [35.229.150.155]) by smtp.gmail.com with ESMTPSA id g6-v6sm32738308pfb.11.2018.09.02.21.40.57 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 02 Sep 2018 21:41:03 -0700 (PDT) From: Zhang Chen To: qemu-devel@nongnu.org, Paolo Bonzini , Juan Quintela , "Dr . David Alan Gilbert" , Jason Wang , Eric Blake , Markus Armbruster Date: Mon, 3 Sep 2018 12:38:50 +0800 Message-Id: <20180903043900.28592-10-zhangckid@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180903043900.28592-1-zhangckid@gmail.com> References: <20180903043900.28592-1-zhangckid@gmail.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::42a Subject: [Qemu-devel] [PATCH V12 09/19] 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 , Zhang Chen 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 | 37 +++++++++++++++++++++++++++++++++++++ migration/trace-events | 2 ++ 2 files changed, 39 insertions(+) diff --git a/migration/ram.c b/migration/ram.c index df8202216f..a478d85740 100644 --- a/migration/ram.c +++ b/migration/ram.c @@ -3925,6 +3925,39 @@ 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); + + if (offset << TARGET_PAGE_BITS >= block->used_length) { + offset = 0; + block = QLIST_NEXT_RCU(block, next); + } else { + migration_bitmap_clear_dirty(ram_state, block, offset); + 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(); +} + static int ram_load(QEMUFile *f, void *opaque, int version_id) { int flags = 0, ret = 0, invalid_flags = 0; @@ -4101,6 +4134,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()) { + colo_flush_ram_cache(); + } return ret; } diff --git a/migration/trace-events b/migration/trace-events index fa0ff3f3bf..bd2d0cd25a 100644 --- a/migration/trace-events +++ b/migration/trace-events @@ -102,6 +102,8 @@ ram_dirty_bitmap_sync_start(void) "" ram_dirty_bitmap_sync_wait(void) "" ram_dirty_bitmap_sync_complete(void) "" ram_state_resume_prepare(uint64_t v) "%" PRId64 +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) ""