All of lore.kernel.org
 help / color / mirror / Atom feed
From: Chuan Zheng <zhengchuan@huawei.com>
To: <quintela@redhat.com>, <eblake@redhat.com>, <dgilbert@redhat.com>,
	<berrange@redhat.com>, <dme@dme.org>
Cc: alex.chen@huawei.com, ann.zhuangyanying@huawei.com,
	zhang.zhanghailiang@huawei.com, xiexiangyou@huawei.com,
	qemu-devel@nongnu.org
Subject: [PATCH v6 12/12] migration/dirtyrate: Add trace_calls to make it easier to debug
Date: Sat, 29 Aug 2020 10:52:57 +0800	[thread overview]
Message-ID: <1598669577-76914-13-git-send-email-zhengchuan@huawei.com> (raw)
In-Reply-To: <1598669577-76914-1-git-send-email-zhengchuan@huawei.com>

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>
---
 migration/dirtyrate.c  | 9 +++++++++
 migration/trace-events | 8 ++++++++
 2 files changed, 17 insertions(+)

diff --git a/migration/dirtyrate.c b/migration/dirtyrate.c
index fa1a12d..2a8f4ff 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 get_sample_page_period(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;
 }
 
@@ -228,6 +233,8 @@ static bool skip_sample_ramblock(RAMBlock *block)
      * want to sample.
      */
     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;
     }
 
@@ -274,6 +281,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++;
         }
     }
@@ -299,6 +307,7 @@ find_page_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 4ab0a50..8c2b58f 100644
--- a/migration/trace-events
+++ b/migration/trace-events
@@ -312,3 +312,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"
-- 
1.8.3.1



  parent reply	other threads:[~2020-08-29  2:47 UTC|newest]

Thread overview: 30+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-08-29  2:52 [PATCH v6 00/12] *** A Method for evaluating dirty page rate *** Chuan Zheng
2020-08-29  2:52 ` [PATCH v6 01/12] migration/dirtyrate: setup up query-dirtyrate framwork Chuan Zheng
2020-08-31  8:54   ` David Edmondson
2020-08-31 11:07     ` Zheng Chuan
2020-08-29  2:52 ` [PATCH v6 02/12] migration/dirtyrate: add DirtyRateStatus to denote calculation status Chuan Zheng
2020-08-29  2:52 ` [PATCH v6 03/12] migration/dirtyrate: Add RamblockDirtyInfo to store sampled page info Chuan Zheng
2020-08-31  9:06   ` David Edmondson
2020-08-31  9:07   ` David Edmondson
2020-08-29  2:52 ` [PATCH v6 04/12] migration/dirtyrate: Add dirtyrate statistics series functions Chuan Zheng
2020-08-29  2:52 ` [PATCH v6 05/12] migration/dirtyrate: move RAMBLOCK_FOREACH_MIGRATABLE into ram.h Chuan Zheng
2020-08-31  9:07   ` David Edmondson
2020-08-29  2:52 ` [PATCH v6 06/12] migration/dirtyrate: Record hash results for each sampled page Chuan Zheng
2020-08-31  9:08   ` David Edmondson
2020-08-29  2:52 ` [PATCH v6 07/12] migration/dirtyrate: Compare page hash results for recorded " Chuan Zheng
2020-08-31  9:10   ` David Edmondson
2020-08-31 11:10     ` Zheng Chuan
2020-08-29  2:52 ` [PATCH v6 08/12] migration/dirtyrate: skip sampling ramblock with size below MIN_RAMBLOCK_SIZE Chuan Zheng
2020-08-31  9:12   ` David Edmondson
2020-08-29  2:52 ` [PATCH v6 09/12] migration/dirtyrate: Implement set_sample_page_period() and get_sample_page_period() Chuan Zheng
2020-08-31  9:12   ` David Edmondson
2020-08-29  2:52 ` [PATCH v6 10/12] migration/dirtyrate: Implement calculate_dirtyrate() function Chuan Zheng
2020-08-31  9:13   ` David Edmondson
2020-08-31 11:24     ` Zheng Chuan
2020-08-31 12:01       ` David Edmondson
2020-08-29  2:52 ` [PATCH v6 11/12] migration/dirtyrate: Implement qmp_cal_dirty_rate()/qmp_get_dirty_rate() function Chuan Zheng
2020-08-29  2:52 ` Chuan Zheng [this message]
2020-08-31  9:14   ` [PATCH v6 12/12] migration/dirtyrate: Add trace_calls to make it easier to debug David Edmondson
2020-08-31  9:05 ` [PATCH v6 00/12] *** A Method for evaluating dirty page rate *** David Edmondson
2020-08-31  9:55   ` Zheng Chuan
2020-08-31 10:08     ` David Edmondson

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1598669577-76914-13-git-send-email-zhengchuan@huawei.com \
    --to=zhengchuan@huawei.com \
    --cc=alex.chen@huawei.com \
    --cc=ann.zhuangyanying@huawei.com \
    --cc=berrange@redhat.com \
    --cc=dgilbert@redhat.com \
    --cc=dme@dme.org \
    --cc=eblake@redhat.com \
    --cc=qemu-devel@nongnu.org \
    --cc=quintela@redhat.com \
    --cc=xiexiangyou@huawei.com \
    --cc=zhang.zhanghailiang@huawei.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.