From nobody Tue Feb 10 04:09:08 2026 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=1622481296; cv=none; d=zohomail.com; s=zohoarc; b=EvZTQr8lMMRpi58BQZwXIZQiSDqprV7feOo/KrmZH7pzskohmrEMUTV99MtuqmKvfNbX7Fe5NnNv7S8JLIvSmyls+7ihIcJaLl8E6kSkjv9yLn9F9VcetDC9or5fZU+AjNvicMqba24CSTtwNwVSI2UdB3/IM7Tv6KoBgtvVWIM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1622481296; h=Content-Type:Content-Transfer-Encoding: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=Rq+ssmYJgD1KrPVlszT0KyJEpjWUdw4bmwWabvnnEwc=; b=L6jR0cZuk6FCSHW+/dLO6id/aurtnYC8p6UIKoGzMkt7PU/5pbZS6eqDIC/4PlKPnoPahDG/MxDwg3RzyZKKIRrFOAfSm+CVBOs+BfejKYJ/71YmjkM2AaRcjqsW+Wcf7dqWKMaR8vot5G9yhBMRLOk1wTEE7waS4tgwBUPSziI= 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 1622481296905940.2546861987396; Mon, 31 May 2021 10:14:56 -0700 (PDT) Received: from localhost ([::1]:51226 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lnlV8-0003lY-Sy for importer@patchew.org; Mon, 31 May 2021 13:14:54 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55900) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lnlN5-0001bp-Js for qemu-devel@nongnu.org; Mon, 31 May 2021 13:06:36 -0400 Received: from prt-mail.chinatelecom.cn ([42.123.76.219]:51924 helo=chinatelecom.cn) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lnlN0-0005rU-22 for qemu-devel@nongnu.org; Mon, 31 May 2021 13:06:35 -0400 Received: from clientip-202.80.192.39?logid-8790cfef0ba147a299cbd8acf210f1a0 (unknown [172.18.0.218]) by chinatelecom.cn (HERMES) with SMTP id 5A2E42800B2; Tue, 1 Jun 2021 01:06:29 +0800 (CST) Received: from ([172.18.0.218]) by app0025 with ESMTP id 8790cfef0ba147a299cbd8acf210f1a0 for qemu-devel@nongnu.org; Tue Jun 1 01:06:27 2021 HMM_SOURCE_IP: 172.18.0.218:42706.1466219582 HMM_ATTACHE_NUM: 0000 HMM_SOURCE_TYPE: SMTP X-189-SAVE-TO-SEND: +huangy81@chinatelecom.cn X-Transaction-ID: 8790cfef0ba147a299cbd8acf210f1a0 X-filter-score: filter<0> X-Real-From: huangy81@chinatelecom.cn X-Receive-IP: 172.18.0.218 X-MEDUSA-Status: 0 From: huangy81@chinatelecom.cn To: Subject: [PATCH v1 6/6] migration/dirtyrate: implement dirty-ring dirtyrate calculation Date: Tue, 1 Jun 2021 01:06:29 +0800 Message-Id: <27607e12038273706273203b2146c5d4a40ac487.1622479162.git.huangy81@chinatelecom.cn> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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=42.123.76.219; envelope-from=huangy81@chinatelecom.cn; helo=chinatelecom.cn X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, 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: kvm@vger.kernel.org, Juan Quintela , Hyman , "Dr. David Alan Gilbert" , Peter Xu , Paolo Bonzini Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" From: Hyman Huang(=E9=BB=84=E5=8B=87) use dirty ring feature to implement dirtyrate calculation. to enable it, set vcpu option as true in qmp calc-dirty-rate. Signed-off-by: Hyman Huang(=E9=BB=84=E5=8B=87) --- migration/dirtyrate.c | 146 ++++++++++++++++++++++++++++++++++++++--- migration/trace-events | 1 + 2 files changed, 139 insertions(+), 8 deletions(-) diff --git a/migration/dirtyrate.c b/migration/dirtyrate.c index da6500c8ec..028c11d117 100644 --- a/migration/dirtyrate.c +++ b/migration/dirtyrate.c @@ -16,14 +16,22 @@ #include "cpu.h" #include "exec/ramblock.h" #include "qemu/rcu_queue.h" +#include "qemu/main-loop.h" #include "sysemu/kvm.h" #include "qapi/qapi-commands-migration.h" #include "ram.h" #include "trace.h" #include "dirtyrate.h" =20 +typedef enum { + CALC_NONE =3D 0, + CALC_DIRTY_RING, + CALC_SAMPLE_PAGES, +} CalcMethod; + static int CalculatingState =3D DIRTY_RATE_STATUS_UNSTARTED; static struct DirtyRateStat DirtyStat; +static CalcMethod last_method =3D CALC_NONE; =20 static int64_t set_sample_page_period(int64_t msec, int64_t initial_time) { @@ -64,6 +72,7 @@ static struct DirtyRateInfo *query_dirty_rate_info(void) { int64_t dirty_rate =3D DirtyStat.dirty_rate; struct DirtyRateInfo *info =3D g_malloc0(sizeof(DirtyRateInfo)); + DirtyRateVcpuList *head =3D NULL, **tail =3D &head; =20 if (qatomic_read(&CalculatingState) =3D=3D DIRTY_RATE_STATUS_MEASURED)= { info->has_dirty_rate =3D true; @@ -73,6 +82,22 @@ static struct DirtyRateInfo *query_dirty_rate_info(void) info->status =3D CalculatingState; info->start_time =3D DirtyStat.start_time; info->calc_time =3D DirtyStat.calc_time; + info->has_vcpu =3D true; + + if (last_method =3D=3D CALC_DIRTY_RING) { + int i =3D 0; + info->vcpu =3D true; + info->has_vcpu_dirty_rate =3D true; + for (i =3D 0; i < DirtyStat.method.vcpu.nvcpu; i++) { + DirtyRateVcpu *rate =3D g_malloc0(sizeof(DirtyRateVcpu)); + rate->id =3D DirtyStat.method.vcpu.rates[i].id; + rate->dirty_rate =3D DirtyStat.method.vcpu.rates[i].dirty_rate; + QAPI_LIST_APPEND(tail, rate); + } + info->vcpu_dirty_rate =3D head; + } else { + info->vcpu =3D false; + } =20 trace_query_dirty_rate_info(DirtyRateStatus_str(CalculatingState)); =20 @@ -87,13 +112,29 @@ static void init_dirtyrate_stat(int64_t start_time, DirtyStat.start_time =3D start_time; DirtyStat.calc_time =3D calc_time; =20 - if (config.vcpu) { - DirtyStat.method.vcpu.nvcpu =3D -1; - DirtyStat.method.vcpu.rates =3D NULL; - } else { - DirtyStat.method.vm.total_dirty_samples =3D 0; - DirtyStat.method.vm.total_sample_count =3D 0; - DirtyStat.method.vm.total_block_mem_MB =3D 0; + switch (last_method) { + case CALC_NONE: + case CALC_SAMPLE_PAGES: + if (config.vcpu) { + DirtyStat.method.vcpu.nvcpu =3D -1; + DirtyStat.method.vcpu.rates =3D NULL; + } else { + DirtyStat.method.vm.total_dirty_samples =3D 0; + DirtyStat.method.vm.total_sample_count =3D 0; + DirtyStat.method.vm.total_block_mem_MB =3D 0; + } + break; + case CALC_DIRTY_RING: + if (!config.vcpu) { + g_free(DirtyStat.method.vcpu.rates); + DirtyStat.method.vcpu.rates =3D NULL; + DirtyStat.method.vm.total_dirty_samples =3D 0; + DirtyStat.method.vm.total_sample_count =3D 0; + DirtyStat.method.vm.total_block_mem_MB =3D 0; + } + break; + default: + break; } } =20 @@ -331,7 +372,84 @@ static bool compare_page_hash_info(struct RamblockDirt= yInfo *info, return true; } =20 -static void calculate_dirtyrate(struct DirtyRateConfig config) +static void stat_dirtypages(CPUState *cpu, bool start) +{ + cpu->stat_dirty_pages =3D start; +} + +static void start_kvm_dirty_log(void) +{ + qemu_mutex_lock_iothread(); + memory_global_dirty_log_start(); + qemu_mutex_unlock_iothread(); +} + +static void stop_kvm_dirty_log(void) +{ + qemu_mutex_lock_iothread(); + memory_global_dirty_log_stop(); + qemu_mutex_unlock_iothread(); +} + +static int64_t do_calculate_dirtyrate_vcpu(CPUState *cpu) +{ + uint64_t memory_size_MB; + int64_t time_s; + + memory_size_MB =3D (cpu->dirty_pages * TARGET_PAGE_SIZE) >> 20; + time_s =3D DirtyStat.calc_time; + + return memory_size_MB / time_s; +} + +static void calculate_dirtyrate_vcpu(struct DirtyRateConfig config) +{ + CPUState *cpu; + int64_t msec =3D 0; + int64_t start_time; + uint64_t dirtyrate =3D 0; + uint64_t dirtyrate_sum =3D 0; + int nvcpu, i =3D 0; + + CPU_FOREACH(cpu) { + stat_dirtypages(cpu, true); + nvcpu++; + } + + DirtyStat.method.vcpu.nvcpu =3D nvcpu; + + if (last_method !=3D CALC_DIRTY_RING) { + DirtyStat.method.vcpu.rates =3D + g_malloc0(sizeof(DirtyRateVcpu) * nvcpu); + } + + start_time =3D qemu_clock_get_ms(QEMU_CLOCK_REALTIME); + DirtyStat.start_time =3D start_time / 1000; + + start_kvm_dirty_log(); + + msec =3D config.sample_period_seconds * 1000; + msec =3D set_sample_page_period(msec, start_time); + DirtyStat.calc_time =3D msec / 1000; + + CPU_FOREACH(cpu) { + stat_dirtypages(cpu, false); + } + + stop_kvm_dirty_log(); + + CPU_FOREACH(cpu) { + dirtyrate =3D do_calculate_dirtyrate_vcpu(cpu); + DirtyStat.method.vcpu.rates[i].id =3D cpu->cpu_index; + DirtyStat.method.vcpu.rates[i].dirty_rate =3D dirtyrate; + dirtyrate_sum +=3D dirtyrate; + i++; + } + + DirtyStat.dirty_rate =3D dirtyrate_sum / nvcpu; +} + +static void calculate_dirtyrate_sample_vm(struct DirtyRateConfig config) { struct RamblockDirtyInfo *block_dinfo =3D NULL; int block_count =3D 0; @@ -364,6 +482,18 @@ out: rcu_unregister_thread(); } =20 +static void calculate_dirtyrate(struct DirtyRateConfig config) +{ + if (config.vcpu) { + calculate_dirtyrate_vcpu(config); + last_method =3D CALC_DIRTY_RING; + } else { + calculate_dirtyrate_sample_vm(config); + last_method =3D CALC_SAMPLE_PAGES; + } + trace_calculate_dirtyrate(DirtyStat.dirty_rate); +} + void *get_dirtyrate_thread(void *arg) { struct DirtyRateConfig config =3D *(struct DirtyRateConfig *)arg; diff --git a/migration/trace-events b/migration/trace-events index 668c562fed..5a80b39a62 100644 --- a/migration/trace-events +++ b/migration/trace-events @@ -330,6 +330,7 @@ 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" +calculate_dirtyrate(int64_t dirtyrate) "dirty rate: %" PRIi64 =20 # block.c migration_block_init_shared(const char *blk_device_name) "Start migration = for %s with shared base image" --=20 2.24.3