From patchwork Fri Jan 19 13:44:38 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhang Chen X-Patchwork-Id: 10175349 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 8678D60386 for ; Fri, 19 Jan 2018 13:55:59 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 777F9204FD for ; Fri, 19 Jan 2018 13:55:59 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6AB1A26E54; Fri, 19 Jan 2018 13:55:59 +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=-6.8 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, 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 D0ED4204FD for ; Fri, 19 Jan 2018 13:55:58 +0000 (UTC) Received: from localhost ([::1]:50587 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ecX9C-0003ET-5K for patchwork-qemu-devel@patchwork.kernel.org; Fri, 19 Jan 2018 08:55:58 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46743) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ecX0C-0003s5-Fb for qemu-devel@nongnu.org; Fri, 19 Jan 2018 08:46:41 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ecX0B-0003Js-BF for qemu-devel@nongnu.org; Fri, 19 Jan 2018 08:46:40 -0500 Received: from mail-pg0-x242.google.com ([2607:f8b0:400e:c05::242]:34461) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ecX0B-0003Ja-61 for qemu-devel@nongnu.org; Fri, 19 Jan 2018 08:46:39 -0500 Received: by mail-pg0-x242.google.com with SMTP id r19so1478952pgn.1 for ; Fri, 19 Jan 2018 05:46:39 -0800 (PST) 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=uF3bxFIb4dK4MypnNIwsKgS8xIuTCoFdUWnL9+BgNGo=; b=LMtQMFCSCDLVEMc1py5MLoNeJn8Q5l/v8inhQpQ7bBTH+cG2b+6uQDAHmdsn8IHz4v pTvbZGwlMlQTvrpE8mopDm5ml/gRZ7IKJBktYyKGYoYv6s+lZQjJoy0Rdynz9/d8E0oR t30kPGcg/PMJK1TadSMgq05mUFzv7HP/rdLK97PhVRpyld/5ZIEFE2RP94i7/S4MWOCo C3dsPF2LQRYi1ORTlptPwbetpmOJj0fldwKnRWk01j4bBfDXDAFByHPZooNEX5FBOenx GP1ddFMjSqk6Vx4eb/hw+eQZLwXuF18CQKMk2aToE8hZUeSc4gUJ6+gnXoI9+O1llP5A U9vQ== 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=uF3bxFIb4dK4MypnNIwsKgS8xIuTCoFdUWnL9+BgNGo=; b=cm5Dem5vcB9zXofPQ+RnCBrIeOiNzSKL+ZC5qG1cXxSy2TRKVrZ5v/b5N72FxmrFoQ 2pSeBhodhmf5Nex0MYDJH33Lv+fIyKn+xvw7PW04XWIeNd6TdhjkC1539U4PrO4awJlt Gy9XEP9bgVXPHmC0ZHdyVv8MTWgsgKuc7hQnhawVHAI4ESrXCLYUuTFCZgaJrbEnjtcn Oyvv8iLowZVkwaOTVinK22SoR1GdlsX6TyxOsuERB+wHKHZPsosBmVlqXvejiVUMcv5N cyZ5rUN43RPnqRkQBPinx8m84tPFrEZrdWuoOOUMwSx92ZrRgXdUnSR+nKUhuiDtKp0O 4FCA== X-Gm-Message-State: AKwxytd+I99Om1SktgtFYMf/LXYXGn8IYpYz8VBFMOHOxA1XR6tmqO7x sF5G+jSee1M99zUo8YJiOsSgrDUm X-Google-Smtp-Source: ACJfBos24Irmb1O+fpayUIoUAW8C3/ZPhKzqvuF1+oc+YiPQBi0a/zJXPwVrTljVTnx7REETuRTc4Q== X-Received: by 10.99.177.4 with SMTP id r4mr16407539pgf.245.1516369597952; Fri, 19 Jan 2018 05:46:37 -0800 (PST) Received: from localhost.localdomain (120.236.201.35.bc.googleusercontent.com. [35.201.236.120]) by smtp.gmail.com with ESMTPSA id r88sm14251865pfb.17.2018.01.19.05.46.34 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 19 Jan 2018 05:46:37 -0800 (PST) From: Zhang Chen To: qemu-devel@nongnu.org Date: Fri, 19 Jan 2018 21:44:38 +0800 Message-Id: <1516369485-5374-10-git-send-email-zhangckid@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1516369485-5374-1-git-send-email-zhangckid@gmail.com> References: <1516369485-5374-1-git-send-email-zhangckid@gmail.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400e:c05::242 Subject: [Qemu-devel] [PATCH V4 09/16] 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 , Juan Quintela , Jason Wang , "Dr . David Alan Gilbert" , Markus Armbruster , 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 From: zhanghailiang 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 d916da0..faee086 100644 --- a/migration/ram.c +++ b/migration/ram.c @@ -2909,6 +2909,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; @@ -2921,6 +2955,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++; @@ -3096,6 +3131,10 @@ static int ram_load(QEMUFile *f, void *opaque, int version_id) 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 59c7e3e..eb56cc6 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) ""