diff --git a/migration-dirtyrate-Add-trace_calls-to-make-it-easie.patch b/migration-dirtyrate-Add-trace_calls-to-make-it-easie.patch new file mode 100644 index 0000000..79d825c --- /dev/null +++ b/migration-dirtyrate-Add-trace_calls-to-make-it-easie.patch @@ -0,0 +1,99 @@ +From 8a36332d38c0c0ba6b7d8c096367a4ec7c94e522 Mon Sep 17 00:00:00 2001 +From: Chuan Zheng +Date: Wed, 16 Sep 2020 14:22:07 +0800 +Subject: [PATCH] migration/dirtyrate: Add trace_calls to make it easier to + debug + +Add trace_calls to make it easier to debug + +Signed-off-by: Chuan Zheng +Reviewed-by: Dr. David Alan Gilbert +Reviewed-by: David Edmondson +Message-Id: <1600237327-33618-13-git-send-email-zhengchuan@huawei.com> +Signed-off-by: Dr. David Alan Gilbert +--- + migration/dirtyrate.c | 9 +++++++++ + migration/trace-events | 8 ++++++++ + 2 files changed, 17 insertions(+) + +diff --git a/migration/dirtyrate.c b/migration/dirtyrate.c +index 9d9155f8ab..80936a4ca6 100644 +--- a/migration/dirtyrate.c ++++ b/migration/dirtyrate.c +@@ -22,6 +22,7 @@ + #include "qapi/qapi-commands-migration.h" + #include "migration.h" + #include "ram.h" ++#include "trace.h" + #include "dirtyrate.h" + + static int CalculatingState = DIRTY_RATE_STATUS_UNSTARTED; +@@ -54,6 +55,7 @@ static bool is_sample_period_valid(int64_t sec) + static int dirtyrate_set_state(int *state, int old_state, int new_state) + { + assert(new_state < DIRTY_RATE_STATUS__MAX); ++ trace_dirtyrate_set_state(DirtyRateStatus_str(new_state)); + if (atomic_cmpxchg(state, old_state, new_state) == old_state) { + return 0; + } else { +@@ -76,6 +78,8 @@ static struct DirtyRateInfo *query_dirty_rate_info(void) + info->start_time = DirtyStat.start_time; + info->calc_time = DirtyStat.calc_time; + ++ trace_query_dirty_rate_info(DirtyRateStatus_str(CalculatingState)); ++ + return info; + } + +@@ -123,6 +127,7 @@ static uint32_t get_ramblock_vfn_hash(struct RamblockDirtyInfo *info, + crc = crc32(0, (info->ramblock_addr + + vfn * TARGET_PAGE_SIZE), TARGET_PAGE_SIZE); + ++ trace_get_ramblock_vfn_hash(info->idstr, vfn, crc); + return crc; + } + +@@ -201,6 +206,8 @@ static bool skip_sample_ramblock(RAMBlock *block) + * Sample only blocks larger than MIN_RAMBLOCK_SIZE. + */ + if (qemu_ram_get_used_length(block) < (MIN_RAMBLOCK_SIZE << 10)) { ++ trace_skip_sample_ramblock(block->idstr, ++ qemu_ram_get_used_length(block)); + return true; + } + +@@ -260,6 +267,7 @@ static void calc_page_dirty_rate(struct RamblockDirtyInfo *info) + for (i = 0; i < info->sample_pages_count; i++) { + crc = get_ramblock_vfn_hash(info, info->sample_page_vfn[i]); + if (crc != info->hash_result[i]) { ++ trace_calc_page_dirty_rate(info->idstr, crc, info->hash_result[i]); + info->sample_dirty_count++; + } + } +@@ -285,6 +293,7 @@ find_block_matched(RAMBlock *block, int count, + if (infos[i].ramblock_addr != qemu_ram_get_host_addr(block) || + infos[i].ramblock_pages != + (qemu_ram_get_used_length(block) >> TARGET_PAGE_BITS)) { ++ trace_find_page_matched(block->idstr); + return NULL; + } + +diff --git a/migration/trace-events b/migration/trace-events +index d8e54c367a..69620c43c2 100644 +--- a/migration/trace-events ++++ b/migration/trace-events +@@ -296,3 +296,11 @@ dirty_bitmap_load_bits_zeroes(void) "" + dirty_bitmap_load_header(uint32_t flags) "flags 0x%x" + dirty_bitmap_load_enter(void) "" + dirty_bitmap_load_success(void) "" ++ ++# dirtyrate.c ++dirtyrate_set_state(const char *new_state) "new state %s" ++query_dirty_rate_info(const char *new_state) "current state %s" ++get_ramblock_vfn_hash(const char *idstr, uint64_t vfn, uint32_t crc) "ramblock name: %s, vfn: %"PRIu64 ", crc: %" PRIu32 ++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" +-- +2.27.0 +