From patchwork Mon Oct 26 13:58:42 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zheng Chuan X-Patchwork-Id: 270424 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 04BD9C4363A for ; Mon, 26 Oct 2020 13:46:47 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 6DAE621BE5 for ; Mon, 26 Oct 2020 13:46:47 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 6DAE621BE5 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=huawei.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:52648 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kX2pi-0000eX-Jp for qemu-devel@archiver.kernel.org; Mon, 26 Oct 2020 09:46:46 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37578) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kX2mL-00042N-UU for qemu-devel@nongnu.org; Mon, 26 Oct 2020 09:43:17 -0400 Received: from szxga04-in.huawei.com ([45.249.212.190]:2365) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kX2mH-0000Jj-PJ for qemu-devel@nongnu.org; Mon, 26 Oct 2020 09:43:17 -0400 Received: from DGGEMS414-HUB.china.huawei.com (unknown [172.30.72.58]) by szxga04-in.huawei.com (SkyGuard) with ESMTP id 4CKbd22Qg1z15Lf2; Mon, 26 Oct 2020 21:43:02 +0800 (CST) Received: from huawei.com (10.175.101.6) by DGGEMS414-HUB.china.huawei.com (10.3.19.214) with Microsoft SMTP Server id 14.3.487.0; Mon, 26 Oct 2020 21:42:48 +0800 From: Chuan Zheng To: , Subject: [PATCH v1 1/4] migration/debug: Introduce foreach_migratable_block() Date: Mon, 26 Oct 2020 21:58:42 +0800 Message-ID: <1603720725-81206-2-git-send-email-zhengchuan@huawei.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1603720725-81206-1-git-send-email-zhengchuan@huawei.com> References: <1603720725-81206-1-git-send-email-zhengchuan@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.175.101.6] X-CFilter-Loop: Reflected Received-SPF: pass client-ip=45.249.212.190; envelope-from=zhengchuan@huawei.com; helo=szxga04-in.huawei.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/10/26 07:55:44 X-ACL-Warn: Detected OS = Linux 3.1-3.10 [fuzzy] X-Spam_score_int: -41 X-Spam_score: -4.2 X-Spam_bar: ---- X-Spam_report: (-4.2 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: yubihong@huawei.com, zhang.zhanghailiang@huawei.com, qemu-devel@nongnu.org, xiexiangyou@huawei.com, alex.chen@huawei.com, wanghao232@huawei.com Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Chuan Zheng --- migration/ram.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/migration/ram.c b/migration/ram.c index 433489d..aa39908 100644 --- a/migration/ram.c +++ b/migration/ram.c @@ -166,6 +166,22 @@ bool ramblock_is_ignored(RAMBlock *block) #undef RAMBLOCK_FOREACH +static int foreach_migratable_block(RAMBlockIterFunc func, void *opaque) +{ + RAMBlock *block; + int ret = 0; + + rcu_read_lock(); + RAMBLOCK_FOREACH_MIGRATABLE(block) { + ret = func(block, opaque); + if (ret) { + break; + } + } + rcu_read_unlock(); + return ret; +} + int foreach_not_ignored_block(RAMBlockIterFunc func, void *opaque) { RAMBlock *block; From patchwork Mon Oct 26 13:58:43 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zheng Chuan X-Patchwork-Id: 302031 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id ED5C3C4363A for ; Mon, 26 Oct 2020 13:48:10 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 5F6532242C for ; Mon, 26 Oct 2020 13:48:10 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 5F6532242C Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=huawei.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:54710 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kX2r3-0001Xs-I3 for qemu-devel@archiver.kernel.org; Mon, 26 Oct 2020 09:48:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37596) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kX2mM-00044u-Ql for qemu-devel@nongnu.org; Mon, 26 Oct 2020 09:43:18 -0400 Received: from szxga04-in.huawei.com ([45.249.212.190]:2364) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kX2mH-0000Jm-Li for qemu-devel@nongnu.org; Mon, 26 Oct 2020 09:43:18 -0400 Received: from DGGEMS414-HUB.china.huawei.com (unknown [172.30.72.58]) by szxga04-in.huawei.com (SkyGuard) with ESMTP id 4CKbd22lSZz15M5N; Mon, 26 Oct 2020 21:43:02 +0800 (CST) Received: from huawei.com (10.175.101.6) by DGGEMS414-HUB.china.huawei.com (10.3.19.214) with Microsoft SMTP Server id 14.3.487.0; Mon, 26 Oct 2020 21:42:49 +0800 From: Chuan Zheng To: , Subject: [PATCH v1 2/4] migration/debug: Implement migration memory consistency check Date: Mon, 26 Oct 2020 21:58:43 +0800 Message-ID: <1603720725-81206-3-git-send-email-zhengchuan@huawei.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1603720725-81206-1-git-send-email-zhengchuan@huawei.com> References: <1603720725-81206-1-git-send-email-zhengchuan@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.175.101.6] X-CFilter-Loop: Reflected Received-SPF: pass client-ip=45.249.212.190; envelope-from=zhengchuan@huawei.com; helo=szxga04-in.huawei.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/10/26 07:55:44 X-ACL-Warn: Detected OS = Linux 3.1-3.10 [fuzzy] X-Spam_score_int: -41 X-Spam_score: -4.2 X-Spam_bar: ---- X-Spam_report: (-4.2 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: yubihong@huawei.com, zhang.zhanghailiang@huawei.com, qemu-devel@nongnu.org, xiexiangyou@huawei.com, alex.chen@huawei.com, wanghao232@huawei.com Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Traverse all migratable ramblocks, calculate sha256 for memory consistency check Signed-off-by: Chuan Zheng --- migration/ram.c | 73 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ migration/ram.h | 7 ++++++ 2 files changed, 80 insertions(+) diff --git a/migration/ram.c b/migration/ram.c index aa39908..f04594e 100644 --- a/migration/ram.c +++ b/migration/ram.c @@ -55,6 +55,8 @@ #include "sysemu/cpu-throttle.h" #include "savevm.h" #include "qemu/iov.h" +#include "crypto/hash.h" +#include "qemu/typedefs.h" #include "multifd.h" /***********************************************************/ @@ -198,6 +200,77 @@ int foreach_not_ignored_block(RAMBlockIterFunc func, void *opaque) return ret; } +#define SHA256_DIGEST_LENGTH 32 +#define SHA256_CHUNK_SIZE 0x80000000 + +static void ram_debug_dump_sha256(uint8_t *md, const char *idstr, + const char *prefix) +{ + int i; + char buf[2 * SHA256_DIGEST_LENGTH + 1] = { 0 }; + + for (i = 0; i < SHA256_DIGEST_LENGTH; i++) { + sprintf(&buf[2 * i], "%02x", md[i]); + } + + fprintf(stderr, "CheckPoint: %s, Ramblock: %s, CheckValue: %s\n", + prefix, idstr, buf); +} + +static void ram_debug_calc_sha256(RAMBlock *block, const char *idstr, + const char *prefix) +{ + uint8_t *md = NULL; + size_t sha256_len; + size_t i, niov; + void *addr = NULL; + ram_addr_t remaining = 0; + size_t resultlen = 0; + struct iovec *iov_array = NULL; + + sha256_len = qcrypto_hash_digest_len(QCRYPTO_HASH_ALG_SHA256); + assert(sha256_len == SHA256_DIGEST_LENGTH); + + niov = DIV_ROUND_UP(qemu_ram_get_used_length(block), SHA256_CHUNK_SIZE); + iov_array = g_malloc0_n(niov, sizeof(struct iovec)); + + addr = qemu_ram_get_host_addr(block); + remaining = qemu_ram_get_used_length(block); + for (i = 0; i < niov; i++) { + iov_array[i].iov_base = addr; + iov_array[i].iov_len = MIN(SHA256_CHUNK_SIZE, remaining); + addr += SHA256_CHUNK_SIZE; + remaining -= SHA256_CHUNK_SIZE; + } + + if (qcrypto_hash_bytesv(QCRYPTO_HASH_ALG_SHA256, + iov_array, niov, + &md, &resultlen, NULL) || !md) { + fprintf(stderr, "Consistency check(%s) calc failed.\n", prefix); + goto out; + } + + ram_debug_dump_sha256(md, idstr, prefix); + +out: + g_free(iov_array); +} + +static int ram_debug_consistency(RAMBlock *block, void *opaque) +{ + const char *prefix = opaque; + const char *idstr = qemu_ram_get_idstr(block); + + ram_debug_calc_sha256(block, idstr, prefix); + + return 0; +} + +void migration_debug_ram_consistency(const char *prefix) +{ + foreach_migratable_block(ram_debug_consistency, (void *)prefix); +} + static void ramblock_recv_map_init(void) { RAMBlock *rb; diff --git a/migration/ram.h b/migration/ram.h index 011e854..d73de6e 100644 --- a/migration/ram.h +++ b/migration/ram.h @@ -47,6 +47,13 @@ bool ramblock_is_ignored(RAMBlock *block); INTERNAL_RAMBLOCK_FOREACH(block) \ if (!qemu_ram_is_migratable(block)) {} else +void migration_debug_ram_consistency(const char *prefix); + +#define MIGRATION_RAM_CONSISTENCY_CHECK() \ +do { \ + migration_debug_ram_consistency(__func__); \ +} while (0) + int xbzrle_cache_resize(int64_t new_size, Error **errp); uint64_t ram_bytes_remaining(void); uint64_t ram_bytes_total(void); From patchwork Mon Oct 26 13:58:44 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zheng Chuan X-Patchwork-Id: 270426 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3248AC55178 for ; Mon, 26 Oct 2020 13:44:56 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 7BFD121BE5 for ; Mon, 26 Oct 2020 13:44:55 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 7BFD121BE5 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=huawei.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:45264 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kX2nu-0005vN-Hv for qemu-devel@archiver.kernel.org; Mon, 26 Oct 2020 09:44:54 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37598) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kX2mN-00045n-6O for qemu-devel@nongnu.org; Mon, 26 Oct 2020 09:43:19 -0400 Received: from szxga04-in.huawei.com ([45.249.212.190]:2361) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kX2mH-0000Jl-Lg for qemu-devel@nongnu.org; Mon, 26 Oct 2020 09:43:18 -0400 Received: from DGGEMS414-HUB.china.huawei.com (unknown [172.30.72.58]) by szxga04-in.huawei.com (SkyGuard) with ESMTP id 4CKbd232rgz15MRD; Mon, 26 Oct 2020 21:43:02 +0800 (CST) Received: from huawei.com (10.175.101.6) by DGGEMS414-HUB.china.huawei.com (10.3.19.214) with Microsoft SMTP Server id 14.3.487.0; Mon, 26 Oct 2020 21:42:50 +0800 From: Chuan Zheng To: , Subject: [PATCH v1 3/4] migration/debug: add checkpoint for migration consistency check Date: Mon, 26 Oct 2020 21:58:44 +0800 Message-ID: <1603720725-81206-4-git-send-email-zhengchuan@huawei.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1603720725-81206-1-git-send-email-zhengchuan@huawei.com> References: <1603720725-81206-1-git-send-email-zhengchuan@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.175.101.6] X-CFilter-Loop: Reflected Received-SPF: pass client-ip=45.249.212.190; envelope-from=zhengchuan@huawei.com; helo=szxga04-in.huawei.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/10/26 07:55:44 X-ACL-Warn: Detected OS = Linux 3.1-3.10 [fuzzy] X-Spam_score_int: -41 X-Spam_score: -4.2 X-Spam_bar: ---- X-Spam_report: (-4.2 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: yubihong@huawei.com, zhang.zhanghailiang@huawei.com, qemu-devel@nongnu.org, xiexiangyou@huawei.com, alex.chen@huawei.com, wanghao232@huawei.com Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Chuan Zheng --- migration/migration.c | 1 + migration/savevm.c | 7 +++++++ 2 files changed, 8 insertions(+) diff --git a/migration/migration.c b/migration/migration.c index 0575ecb..f4434c4 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -1678,6 +1678,7 @@ static void migrate_fd_cleanup(MigrationState *s) tmp = s->to_dst_file; s->to_dst_file = NULL; qemu_mutex_unlock(&s->qemu_file_lock); + MIGRATION_RAM_CONSISTENCY_CHECK(); /* * Close the file handle without the lock to make sure the * critical section won't block for long. diff --git a/migration/savevm.c b/migration/savevm.c index ff33e21..5f989a8 100644 --- a/migration/savevm.c +++ b/migration/savevm.c @@ -2636,6 +2636,13 @@ int qemu_loadvm_state(QEMUFile *f) } qemu_loadvm_state_cleanup(); + /* + * cpu_synchronize_all_post_init->kvm_put_msrs will update the + * kvmclock share-mem. + * So this's the latest point at which the ram is the same as source + */ + MIGRATION_RAM_CONSISTENCY_CHECK(); + cpu_synchronize_all_post_init(); return ret; From patchwork Mon Oct 26 13:58:45 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zheng Chuan X-Patchwork-Id: 270425 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 15609C4363A for ; Mon, 26 Oct 2020 13:45:36 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id A544521BE5 for ; Mon, 26 Oct 2020 13:45:35 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org A544521BE5 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=huawei.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:48394 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kX2oY-0007Hk-Qa for qemu-devel@archiver.kernel.org; Mon, 26 Oct 2020 09:45:34 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37584) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kX2mM-00043T-9D for qemu-devel@nongnu.org; Mon, 26 Oct 2020 09:43:18 -0400 Received: from szxga04-in.huawei.com ([45.249.212.190]:2363) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kX2mH-0000Jk-UU for qemu-devel@nongnu.org; Mon, 26 Oct 2020 09:43:17 -0400 Received: from DGGEMS414-HUB.china.huawei.com (unknown [172.30.72.58]) by szxga04-in.huawei.com (SkyGuard) with ESMTP id 4CKbd22vZhz15MLP; Mon, 26 Oct 2020 21:43:02 +0800 (CST) Received: from huawei.com (10.175.101.6) by DGGEMS414-HUB.china.huawei.com (10.3.19.214) with Microsoft SMTP Server id 14.3.487.0; Mon, 26 Oct 2020 21:42:50 +0800 From: Chuan Zheng To: , Subject: [PATCH v1 4/4] migration/debug: add DEBUG_MIGRATION_CONSISTENCY_CHECK macros Date: Mon, 26 Oct 2020 21:58:45 +0800 Message-ID: <1603720725-81206-5-git-send-email-zhengchuan@huawei.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1603720725-81206-1-git-send-email-zhengchuan@huawei.com> References: <1603720725-81206-1-git-send-email-zhengchuan@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.175.101.6] X-CFilter-Loop: Reflected Received-SPF: pass client-ip=45.249.212.190; envelope-from=zhengchuan@huawei.com; helo=szxga04-in.huawei.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/10/26 07:55:44 X-ACL-Warn: Detected OS = Linux 3.1-3.10 [fuzzy] X-Spam_score_int: -41 X-Spam_score: -4.2 X-Spam_bar: ---- X-Spam_report: (-4.2 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: yubihong@huawei.com, zhang.zhanghailiang@huawei.com, qemu-devel@nongnu.org, xiexiangyou@huawei.com, alex.chen@huawei.com, wanghao232@huawei.com Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Chuan Zheng --- migration/migration.c | 2 ++ migration/savevm.c | 2 ++ 2 files changed, 4 insertions(+) diff --git a/migration/migration.c b/migration/migration.c index f4434c4..fe2bb3a 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -1678,7 +1678,9 @@ static void migrate_fd_cleanup(MigrationState *s) tmp = s->to_dst_file; s->to_dst_file = NULL; qemu_mutex_unlock(&s->qemu_file_lock); +#ifdef DEBUG_MIGRATION_CONSISTENCY_CHECK MIGRATION_RAM_CONSISTENCY_CHECK(); +#endif /* * Close the file handle without the lock to make sure the * critical section won't block for long. diff --git a/migration/savevm.c b/migration/savevm.c index 5f989a8..102cd0e 100644 --- a/migration/savevm.c +++ b/migration/savevm.c @@ -2636,12 +2636,14 @@ int qemu_loadvm_state(QEMUFile *f) } qemu_loadvm_state_cleanup(); +#ifdef DEBUG_MIGRATION_CONSISTENCY_CHECK /* * cpu_synchronize_all_post_init->kvm_put_msrs will update the * kvmclock share-mem. * So this's the latest point at which the ram is the same as source */ MIGRATION_RAM_CONSISTENCY_CHECK(); +#endif cpu_synchronize_all_post_init();