OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

migration/dirtyrate: Add trace_calls to make it easier to debug

Browse Source 
Add trace_calls to make it easier to debug

Signed-off-by: Chuan Zheng <zhengchuan@huawei.com>
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Reviewed-by: David Edmondson <david.edmondson@oracle.com>
Message-Id: <1600237327-33618-13-git-send-email-zhengchuan@huawei.com>
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
This commit is contained in:
Chuan Zheng 2020-09-16 14:22:07 +08:00 committed by Dr. David Alan Gilbert
parent 4c437254b8
commit 3c0b5dffc1
2 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
migration/dirtyrate.c
View File

@ -22,6 +22,7 @@
#include "qapi/qapi-commands-migration.h" #include "qapi/qapi-commands-migration.h"
#include "migration.h" #include "migration.h"
#include "ram.h" #include "ram.h"
#include "trace.h"
#include "dirtyrate.h" #include "dirtyrate.h"
static int CalculatingState = DIRTY_RATE_STATUS_UNSTARTED; 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) static int dirtyrate_set_state(int *state, int old_state, int new_state)
{ {
assert(new_state < DIRTY_RATE_STATUS__MAX); assert(new_state < DIRTY_RATE_STATUS__MAX);
trace_dirtyrate_set_state(DirtyRateStatus_str(new_state));
if (qatomic_cmpxchg(state, old_state, new_state) == old_state) { if (qatomic_cmpxchg(state, old_state, new_state) == old_state) {
return 0; return 0;
} else { } else {
@ -76,6 +78,8 @@ static struct DirtyRateInfo *query_dirty_rate_info(void)
info->start_time = DirtyStat.start_time; info->start_time = DirtyStat.start_time;
info->calc_time = DirtyStat.calc_time; info->calc_time = DirtyStat.calc_time;
trace_query_dirty_rate_info(DirtyRateStatus_str(CalculatingState));
return info; return info;
} }
@ -123,6 +127,7 @@ static uint32_t get_ramblock_vfn_hash(struct RamblockDirtyInfo *info,
crc = crc32(0, (info->ramblock_addr + crc = crc32(0, (info->ramblock_addr +
vfn * TARGET_PAGE_SIZE), TARGET_PAGE_SIZE); vfn * TARGET_PAGE_SIZE), TARGET_PAGE_SIZE);
trace_get_ramblock_vfn_hash(info->idstr, vfn, crc);
return crc; return crc;
} }
@ -201,6 +206,8 @@ static bool skip_sample_ramblock(RAMBlock *block)
* Sample only blocks larger than MIN_RAMBLOCK_SIZE. * Sample only blocks larger than MIN_RAMBLOCK_SIZE.
*/ */
if (qemu_ram_get_used_length(block) < (MIN_RAMBLOCK_SIZE << 10)) { 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; return true;
} }
@ -260,6 +267,7 @@ static void calc_page_dirty_rate(struct RamblockDirtyInfo *info)
for (i = 0; i < info->sample_pages_count; i++) { for (i = 0; i < info->sample_pages_count; i++) {
crc = get_ramblock_vfn_hash(info, info->sample_page_vfn[i]); crc = get_ramblock_vfn_hash(info, info->sample_page_vfn[i]);
if (crc != info->hash_result[i]) { if (crc != info->hash_result[i]) {
trace_calc_page_dirty_rate(info->idstr, crc, info->hash_result[i]);
info->sample_dirty_count++; 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) || if (infos[i].ramblock_addr != qemu_ram_get_host_addr(block) ||
infos[i].ramblock_pages != infos[i].ramblock_pages !=
(qemu_ram_get_used_length(block) >> TARGET_PAGE_BITS)) { (qemu_ram_get_used_length(block) >> TARGET_PAGE_BITS)) {
trace_find_page_matched(block->idstr);
return NULL; return NULL;
} }

8
migration/trace-events
View File

@ -313,3 +313,11 @@ dirty_bitmap_load_bits_zeroes(void) ""
dirty_bitmap_load_header(uint32_t flags) "flags 0x%x" dirty_bitmap_load_header(uint32_t flags) "flags 0x%x"
dirty_bitmap_load_enter(void) "" dirty_bitmap_load_enter(void) ""
dirty_bitmap_load_success(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"