From patchwork Sun Jun 3 05:05: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: 10445125 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 B571160234 for ; Sun, 3 Jun 2018 05:12:04 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A56D028A0A for ; Sun, 3 Jun 2018 05:12:04 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9709C28AFB; Sun, 3 Jun 2018 05:12:04 +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 3223228A0A for ; Sun, 3 Jun 2018 05:12:04 +0000 (UTC) Received: from localhost ([::1]:33655 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fPLJD-0003WK-94 for patchwork-qemu-devel@patchwork.kernel.org; Sun, 03 Jun 2018 01:12:03 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57837) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fPLE6-0000B4-2m for qemu-devel@nongnu.org; Sun, 03 Jun 2018 01:06:47 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fPLE5-0000qO-1u for qemu-devel@nongnu.org; Sun, 03 Jun 2018 01:06:46 -0400 Received: from mail-pl0-x242.google.com ([2607:f8b0:400e:c01::242]:42083) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fPLE4-0000qC-RC for qemu-devel@nongnu.org; Sun, 03 Jun 2018 01:06:44 -0400 Received: by mail-pl0-x242.google.com with SMTP id w17-v6so1813277pll.9 for ; Sat, 02 Jun 2018 22:06:44 -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=OAkgs56gmRWjw6ceiScAyXi376oargTexBBJEahxuwM=; b=J7oUYnvZAJSIZP261HzeomaCb2w/83dDkPWa/ZpzRmf7L+JRjwfU0jYVuEBm6NW5dK BzlKjkXE98+6w9W5GCyr/fvjD95bbTpCGf96vqWki1CX3QvpVcryZQ5xtb6mmvxDL38q hPgSAxaLLCc1/BnpyoDjmsyoaJjJN/TCN5xjrctGlQUh3nsfSdIsI443BukKroAxwIYk hO5tHm4nfcExDys8a017b70Eh7lGrk91J7pdMSN3BlgtcZzRk00IC43xMU5w/yqG/GWo AUP7jiPwBLho08PS+OBqu11PubKxUJwx9JG2VFc2iJqHAxfeSR6hpNj+J7wqYwPagM3P m10w== 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=OAkgs56gmRWjw6ceiScAyXi376oargTexBBJEahxuwM=; b=LkZmJCmKA6/N+9BkSeoeIFNAulInQ4s+D68W44nObdyeY3KVFuvM9JqLZzzHxxVbpB JeVM1uw9lT4nI9ELbq+QrsmItkco23wa/fhJNSflNawDBFIiiWfNy3nbeFaNCr9tQjXq 5JQc3dMqiJsASCLsfApze4e/1to3cjxYI7CDtkbpjGI6N65aUVsA4ahb34ewGKftnzFW eBa0y/rRHHA2Yp5J+teZB/8G9iUVQl5VoxC6wzKkObv4XNaa6j1vj/U9qT348H44V1T9 GxoZOD38Gsf6Nec5R2WyFRnMrr7HS/9NEcvdqhdwmREu1zZCxIRgeySikpsy3Ycl2P0R 24vg== X-Gm-Message-State: ALKqPwdsA9V8iwhFjJPLlUL38Oc1TkNS5Z2SR84J+tz18EjXq/PS7vxl 586+dahb3MsM4FojFOlB4yjIxw== X-Google-Smtp-Source: ADUXVKJE64GmGlMl1VPES10tr0W2DqAHfAcb/bewQXh4OgACwD0Yxi+1IkwGV5pU12QeWXbzpHgSeQ== X-Received: by 2002:a17:902:8f8b:: with SMTP id z11-v6mr16943658plo.203.1528002403741; Sat, 02 Jun 2018 22:06:43 -0700 (PDT) Received: from localhost.localdomain (197.225.229.35.bc.googleusercontent.com. [35.229.225.197]) by smtp.gmail.com with ESMTPSA id 10-v6sm45841595pgb.40.2018.06.02.22.06.38 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 02 Jun 2018 22:06:42 -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: Sun, 3 Jun 2018 13:05:38 +0800 Message-Id: <20180603050546.6827-10-zhangckid@gmail.com> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180603050546.6827-1-zhangckid@gmail.com> References: <20180603050546.6827-1-zhangckid@gmail.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400e:c01::242 Subject: [Qemu-devel] [PATCH V8 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 , 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 dd86eeba87..927436bd12 100644 --- a/migration/ram.c +++ b/migration/ram.c @@ -3332,6 +3332,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; @@ -3504,6 +3537,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 20accb5b80..9cc80075ca 100644 --- a/migration/trace-events +++ b/migration/trace-events @@ -90,6 +90,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) ""