From nobody Mon Nov 17 08:01:10 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1603720017; cv=none; d=zohomail.com; s=zohoarc; b=i8XQZBid6INnaXAct8CNFrDIMHEs2SjwVcCYG/xy/FSHCarYWtLk4J6pMCFZaHJ64EbDD/2KTdEcYBeJVFbsA6QY6hQCTMnudwcCYjNeous4xtw4dMjeN7V2xaqaNSYxT9Zc9nEL8QUKqNyJqhXeNMgcUVRo3vPkDc2xTmvDhoQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1603720017; h=Content-Type:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=Boz8DlIu5jy8BmpjQAHFNOgIRoG3gHq92t0isoMZcmU=; b=H+ahbFN2Ax1ZDqOKeTkQ7DwOXGnbpYGP6De4CKoLd9TKxejXEJPA32TXQ7ZZD65qTeqzCDm8xLfiEtXetxh/WU/v6MytvdX5QiwVX3q/Sv5H3ZPqpjchGL+JWKAf4ao4NjhguotPgv+CfIzBHZn1AA55X4ktJ56E6H1MZCFqV7A= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 160372001759696.4686023495409; Mon, 26 Oct 2020 06:46:57 -0700 (PDT) Received: from localhost ([::1]:52648 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kX2ps-0000eX-CX for importer@patchew.org; Mon, 26 Oct 2020 09:46:56 -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 (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; 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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" 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) =20 #undef RAMBLOCK_FOREACH =20 +static int foreach_migratable_block(RAMBlockIterFunc func, void *opaque) +{ + RAMBlock *block; + int ret =3D 0; + + rcu_read_lock(); + RAMBLOCK_FOREACH_MIGRATABLE(block) { + ret =3D func(block, opaque); + if (ret) { + break; + } + } + rcu_read_unlock(); + return ret; +} + int foreach_not_ignored_block(RAMBlockIterFunc func, void *opaque) { RAMBlock *block; --=20 1.8.3.1 From nobody Mon Nov 17 08:01:10 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1603720094; cv=none; d=zohomail.com; s=zohoarc; b=JBPbXXA0zDyVHCf9uZEeRvBcAXjhB9Fg7rJqajRnheGQb+mT7M4MreVZgtDbspL/HSQsPbnFZS6Bqki2eGfEkh4N7d/RIhaw5MUIyvLvaxSNWS2lZxVMG5gT5WFGa9XnZAmnk52Nk0PEq0B7+CAnvbB7YkhEPAG59eOp4SxWTho= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1603720094; h=Content-Type:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=hztHsW/+eUo8CsSYs9l5YvrJ4F9keRO+sNTipLVVP8c=; b=E4FOrrvDFV9GWGHkMKLRB2FbHCv1ImGTTY6vb1WZh11F2sOwfFuNMiAwtPbi/y7ynuKCt7zP2hl7GdeiWWgPPPDIfhGHZLHniL8kw8zlAgKfrxS+C0p/ya7XvyNmLToVx8wrYzbjbqWMTnDE/n/SxEKTBp/DZRoJyvcbJ5eCHzg= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1603720094431206.0426600906742; Mon, 26 Oct 2020 06:48:14 -0700 (PDT) Received: from localhost ([::1]:54710 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kX2r7-0001Xs-5C for importer@patchew.org; Mon, 26 Oct 2020 09:48:13 -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 (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; 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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" 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" =20 /***********************************************************/ @@ -198,6 +200,77 @@ int foreach_not_ignored_block(RAMBlockIterFunc func, v= oid *opaque) return ret; } =20 +#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] =3D { 0 }; + + for (i =3D 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 =3D NULL; + size_t sha256_len; + size_t i, niov; + void *addr =3D NULL; + ram_addr_t remaining =3D 0; + size_t resultlen =3D 0; + struct iovec *iov_array =3D NULL; + + sha256_len =3D qcrypto_hash_digest_len(QCRYPTO_HASH_ALG_SHA256); + assert(sha256_len =3D=3D SHA256_DIGEST_LENGTH); + + niov =3D DIV_ROUND_UP(qemu_ram_get_used_length(block), SHA256_CHUNK_SI= ZE); + iov_array =3D g_malloc0_n(niov, sizeof(struct iovec)); + + addr =3D qemu_ram_get_host_addr(block); + remaining =3D qemu_ram_get_used_length(block); + for (i =3D 0; i < niov; i++) { + iov_array[i].iov_base =3D addr; + iov_array[i].iov_len =3D MIN(SHA256_CHUNK_SIZE, remaining); + addr +=3D SHA256_CHUNK_SIZE; + remaining -=3D 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 =3D opaque; + const char *idstr =3D 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 =20 +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); --=20 1.8.3.1 From nobody Mon Nov 17 08:01:10 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1603719902; cv=none; d=zohomail.com; s=zohoarc; b=Pl9WBAKdvRKSMZAwKn9BPbI5wosu0QOviSsX0qEtMdCLvdTGi6Ll8YNv2+sdKjMzywGLbujS4JuRQa6neYDe9gaz9/gbkvO9sRobpP67QyXKEDQ0fx5qcvqikmsu18HN0CZXftW1jM6uzbvcrHuD891Kgyg/yY74Q//0wZPwH8o= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1603719902; h=Content-Type:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=302yRo63Nwg8uWMWul6wWWr8cq4WD5vDGKWoUhuIdhY=; b=bJqInxypv0TZ85NQ9OlvteOH89wzVuJUxABiw4+0lTmu9KB/J0cpnrcxU7pxdN8mRa4mLfSOZ/HT5qTy7eoHotj/3f5cCTYyxZEPBaMhRAitY5dhGkhoVggUtmGO6aVjJRLfwrWQFJPNF9kTSquXyV//R8ygqI63FlvFpo3EyPE= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1603719902149264.57556506375124; Mon, 26 Oct 2020 06:45:02 -0700 (PDT) Received: from localhost ([::1]:45264 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kX2ny-0005vN-0R for importer@patchew.org; Mon, 26 Oct 2020 09:44:58 -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 (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; 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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" 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 =3D s->to_dst_file; s->to_dst_file =3D 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) } =20 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(); =20 return ret; --=20 1.8.3.1 From nobody Mon Nov 17 08:01:10 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1603719940; cv=none; d=zohomail.com; s=zohoarc; b=YyNrGjA1ecdVz0JKDGGPLsUBcfnWOwyWAX/2LWyZ7TAZ300+8FYeTBcaGqm6QlH1niE0Ms8D+HLGCX1MaI5oFuePGoCjctOtdp/t45A8DL3htWEJNF1nIxqG7WYF1NkCbOchcItsB9z3K/HFiauCcO41EdbEea5b6f3EEv+MtYg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1603719940; h=Content-Type:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=f7JdHkQTm/7330ScSpJyi5KR5H3D/CIUNPEgG8NX9Ww=; b=juEBPKqEOKXo5Qa5BCAasGMc9aDnYIVvDIEhDRVPrXBVHtt/kQ1qiCieWb4xqQk7yqLf1INi7/9fosf0T3dkixj0/mObtkpS3B9C2QAfrNZEmSuXafLkO3p9rd3LoTuKACC/LxgGunnI4R+KZEM2ofqU3Xo878y16v+WQTtmAHg= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1603719940011829.651173845507; Mon, 26 Oct 2020 06:45:40 -0700 (PDT) Received: from localhost ([::1]:48394 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kX2oc-0007Hk-54 for importer@patchew.org; Mon, 26 Oct 2020 09:45:38 -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 (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; 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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" 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 =3D s->to_dst_file; s->to_dst_file =3D 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) } =20 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 =20 cpu_synchronize_all_post_init(); =20 --=20 1.8.3.1