From nobody Sat Apr 27 01:28:10 2024 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=1602927518; cv=none; d=zohomail.com; s=zohoarc; b=WJno4nUi091Mlc01I7j3RRqohuJRTjCGsDhlIH63PhfLXGCiDt+TRxVG8hasn8xSazDaIlXPKL1q0wZZVAZkVir3/3uDrtNFn99lmkQtEEKMMOw1ksbF6U6oD55Fxmlu4fu13qe9KxoSKQwfH+G1LDftMWwIo0vim6nb6I4I7Xg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1602927518; h=Content-Type:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=gyJct8+pQbFl1kjRa8ryhCm9B8SBiGTEQzDwaeZsUzU=; b=KbgTDg+i75qAeIgdur1JiVEcQ1P4Ovk/RbVpF89D0kV/5iJlZuDZg6h45d6Hl4xKt3r22+DiOKhphPAyTWFBLQf5UxmDoXWgshPMHSqwFntN5S1LI2wv+rTOWuKLKE7KjzDSZXlLWGTKTgdpqR0FpxNi4ylqjEY3FYTz6XQYyNg= 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 1602927518354555.6297313524088; Sat, 17 Oct 2020 02:38:38 -0700 (PDT) Received: from localhost ([::1]:59464 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kTifc-0003F3-73 for importer@patchew.org; Sat, 17 Oct 2020 05:38:36 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56962) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kTieQ-0002mW-9X for qemu-devel@nongnu.org; Sat, 17 Oct 2020 05:37:22 -0400 Received: from szxga07-in.huawei.com ([45.249.212.35]:43886 helo=huawei.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kTieN-0007uQ-JJ for qemu-devel@nongnu.org; Sat, 17 Oct 2020 05:37:21 -0400 Received: from DGGEMS414-HUB.china.huawei.com (unknown [172.30.72.60]) by Forcepoint Email with ESMTP id A64B74DD55C0DEC84F5E; Sat, 17 Oct 2020 17:37:01 +0800 (CST) Received: from huawei.com (10.175.124.27) by DGGEMS414-HUB.china.huawei.com (10.3.19.214) with Microsoft SMTP Server id 14.3.487.0; Sat, 17 Oct 2020 17:36:54 +0800 From: Bihong Yu To: , , , Subject: [PATCH v1] migration: using trace_ to replace DPRINTF Date: Sat, 17 Oct 2020 17:35:47 +0800 Message-ID: <1602927347-15669-1-git-send-email-yubihong@huawei.com> X-Mailer: git-send-email 1.8.3.1 MIME-Version: 1.0 X-Originating-IP: [10.175.124.27] 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.35; envelope-from=yubihong@huawei.com; helo=huawei.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/10/17 05:37:02 X-ACL-Warn: Detected OS = Linux 3.11 and newer [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_PASS=-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: alex.chen@huawei.com, zhang.zhanghailiang@huawei.com, qemu-devel@nongnu.org, xiexiangyou@huawei.com, david.edmondson@oracle.com, wanghao232@huawei.com, zhengchuan@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: Bihong Yu --- migration/block.c | 36 ++++++++++++++++++------------------ migration/page_cache.c | 13 +++---------- migration/trace-events | 13 +++++++++++++ 3 files changed, 34 insertions(+), 28 deletions(-) diff --git a/migration/block.c b/migration/block.c index 273392b..1c3e261 100644 --- a/migration/block.c +++ b/migration/block.c @@ -26,6 +26,7 @@ #include "qemu-file.h" #include "migration/vmstate.h" #include "sysemu/block-backend.h" +#include "trace.h" =20 #define BLK_MIG_BLOCK_SIZE (1 << 20) #define BDRV_SECTORS_PER_DIRTY_CHUNK (BLK_MIG_BLOCK_SIZE >> BDRV_SECTOR_BI= TS) @@ -434,10 +435,9 @@ static int init_blk_migration(QEMUFile *f) block_mig_state.total_sector_sum +=3D sectors; =20 if (bmds->shared_base) { - DPRINTF("Start migration for %s with shared base image\n", - bdrv_get_device_name(bs)); + trace_init_blk_migration_shared(bdrv_get_device_name(bs)); } else { - DPRINTF("Start full migration for %s\n", bdrv_get_device_name(= bs)); + trace_init_blk_migration_full(bdrv_get_device_name(bs)); } =20 QSIMPLEQ_INSERT_TAIL(&block_mig_state.bmds_list, bmds, entry); @@ -592,7 +592,7 @@ static int mig_save_device_dirty(QEMUFile *f, BlkMigDev= State *bmds, return (bmds->cur_dirty >=3D bmds->total_sectors); =20 error: - DPRINTF("Error reading sector %" PRId64 "\n", sector); + trace_mig_save_device_dirty(sector); g_free(blk->buf); g_free(blk); return ret; @@ -628,9 +628,9 @@ static int flush_blks(QEMUFile *f) BlkMigBlock *blk; int ret =3D 0; =20 - DPRINTF("%s Enter submitted %d read_done %d transferred %d\n", - __func__, block_mig_state.submitted, block_mig_state.read_done, - block_mig_state.transferred); + trace_flush_blks("Enter", block_mig_state.submitted, + block_mig_state.read_done, + block_mig_state.transferred); =20 blk_mig_lock(); while ((blk =3D QSIMPLEQ_FIRST(&block_mig_state.blk_list)) !=3D NULL) { @@ -656,9 +656,9 @@ static int flush_blks(QEMUFile *f) } blk_mig_unlock(); =20 - DPRINTF("%s Exit submitted %d read_done %d transferred %d\n", __func__, - block_mig_state.submitted, block_mig_state.read_done, - block_mig_state.transferred); + trace_flush_blks("Exit", block_mig_state.submitted, + block_mig_state.read_done, + block_mig_state.transferred); return ret; } =20 @@ -727,8 +727,8 @@ static int block_save_setup(QEMUFile *f, void *opaque) { int ret; =20 - DPRINTF("Enter save live setup submitted %d transferred %d\n", - block_mig_state.submitted, block_mig_state.transferred); + trace_block_save("setup", block_mig_state.submitted, + block_mig_state.transferred); =20 qemu_mutex_lock_iothread(); ret =3D init_blk_migration(f); @@ -759,8 +759,8 @@ static int block_save_iterate(QEMUFile *f, void *opaque) int64_t last_ftell =3D qemu_ftell(f); int64_t delta_ftell; =20 - DPRINTF("Enter save live iterate submitted %d transferred %d\n", - block_mig_state.submitted, block_mig_state.transferred); + trace_block_save("iterate", block_mig_state.submitted, + block_mig_state.transferred); =20 ret =3D flush_blks(f); if (ret) { @@ -825,8 +825,8 @@ static int block_save_complete(QEMUFile *f, void *opaqu= e) { int ret; =20 - DPRINTF("Enter save live complete submitted %d transferred %d\n", - block_mig_state.submitted, block_mig_state.transferred); + trace_block_save("complete", block_mig_state.submitted, + block_mig_state.transferred); =20 ret =3D flush_blks(f); if (ret) { @@ -851,7 +851,7 @@ static int block_save_complete(QEMUFile *f, void *opaqu= e) /* report completion */ qemu_put_be64(f, (100 << BDRV_SECTOR_BITS) | BLK_MIG_FLAG_PROGRESS); =20 - DPRINTF("Block migration completed\n"); + trace_block_save_complete(); =20 qemu_put_be64(f, BLK_MIG_FLAG_EOS); =20 @@ -884,7 +884,7 @@ static void block_save_pending(QEMUFile *f, void *opaqu= e, uint64_t max_size, pending =3D max_size + BLK_MIG_BLOCK_SIZE; } =20 - DPRINTF("Enter save live pending %" PRIu64 "\n", pending); + trace_block_save_pending(pending); /* We don't do postcopy */ *res_precopy_only +=3D pending; } diff --git a/migration/page_cache.c b/migration/page_cache.c index 775582f..d554efa 100644 --- a/migration/page_cache.c +++ b/migration/page_cache.c @@ -18,14 +18,7 @@ #include "qapi/error.h" #include "qemu/host-utils.h" #include "page_cache.h" - -#ifdef DEBUG_CACHE -#define DPRINTF(fmt, ...) \ - do { fprintf(stdout, "cache: " fmt, ## __VA_ARGS__); } while (0) -#else -#define DPRINTF(fmt, ...) \ - do { } while (0) -#endif +#include "trace.h" =20 /* the page in cache will not be replaced in two cycles */ #define CACHED_PAGE_LIFETIME 2 @@ -75,7 +68,7 @@ PageCache *cache_init(int64_t new_size, size_t page_size,= Error **errp) cache->num_items =3D 0; cache->max_num_items =3D num_pages; =20 - DPRINTF("Setting cache buckets to %" PRId64 "\n", cache->max_num_items= ); + trace_cache_init(cache->max_num_items); =20 /* We prefer not to abort if there is no memory */ cache->page_cache =3D g_try_malloc((cache->max_num_items) * @@ -169,7 +162,7 @@ int cache_insert(PageCache *cache, uint64_t addr, const= uint8_t *pdata, if (!it->it_data) { it->it_data =3D g_try_malloc(cache->page_size); if (!it->it_data) { - DPRINTF("Error allocating page\n"); + trace_cache_insert(); return -1; } cache->num_items++; diff --git a/migration/trace-events b/migration/trace-events index 338f38b..772bb81 100644 --- a/migration/trace-events +++ b/migration/trace-events @@ -325,3 +325,16 @@ get_ramblock_vfn_hash(const char *idstr, uint64_t vfn,= uint32_t crc) "ramblock n calc_page_dirty_rate(const char *idstr, uint32_t new_crc, uint32_t old_crc= ) "ramblock name: %s, new crc: %" PRIu32 ", old crc: %" PRIu32 skip_sample_ramblock(const char *idstr, uint64_t ramblock_size) "ramblock = name: %s, ramblock size: %" PRIu64 find_page_matched(const char *idstr) "ramblock %s addr or size changed" + +# block.c +init_blk_migration_shared(const char *blk_device_name) "Start migration fo= r %s with shared base image" +init_blk_migration_full(const char *blk_device_name) "Start full migration= for %s" +mig_save_device_dirty(int64_t sector) "Error reading sector %" PRId64 +flush_blks(const char *action, int submitted, int read_done, int transferr= ed) "%s submitted %d read_done %d transferred %d" +block_save(const char *mig_stage, int submitted, int transferred) "Enter s= ave live %s submitted %d transferred %d" +block_save_complete(void) "Block migration completed" +block_save_pending(uint64_t pending) "Enter save live pending %" PRIu64 + +# page_cache.c +cache_init(int64_t max_num_items) "Setting cache buckets to %" PRId64 +cache_insert(void) "Error allocating page" --=20 1.8.3.1