[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 2/6] KVM: introduce dirty_pages and kvm_dirty_ring_enabled
From: |
huangy81 |
Subject: |
[PATCH v2 2/6] KVM: introduce dirty_pages and kvm_dirty_ring_enabled |
Date: |
Mon, 7 Jun 2021 03:45:30 +0800 |
From: Hyman Huang(黄勇) <huangy81@chinatelecom.cn>
dirty_pages is used to calculate dirtyrate via dirty ring, when
enabled, kvm-reaper will increase the dirty pages after gfns
being dirtied.
kvm_dirty_ring_enabled shows if kvm-reaper is working. dirtyrate
thread could use it to check if measurement can base on dirty
ring feature.
Signed-off-by: Hyman Huang(黄勇) <huangy81@chinatelecom.cn>
---
accel/kvm/kvm-all.c | 7 +++++++
include/hw/core/cpu.h | 1 +
include/sysemu/kvm.h | 1 +
3 files changed, 9 insertions(+)
diff --git a/accel/kvm/kvm-all.c b/accel/kvm/kvm-all.c
index c7ec538850..bc012f0bee 100644
--- a/accel/kvm/kvm-all.c
+++ b/accel/kvm/kvm-all.c
@@ -469,6 +469,7 @@ int kvm_init_vcpu(CPUState *cpu, Error **errp)
cpu->kvm_fd = ret;
cpu->kvm_state = s;
cpu->vcpu_dirty = true;
+ cpu->dirty_pages = 0;
mmap_size = kvm_ioctl(s, KVM_GET_VCPU_MMAP_SIZE, 0);
if (mmap_size < 0) {
@@ -743,6 +744,7 @@ static uint32_t kvm_dirty_ring_reap_one(KVMState *s,
CPUState *cpu)
count++;
}
cpu->kvm_fetch_index = fetch;
+ cpu->dirty_pages += count;
return count;
}
@@ -2293,6 +2295,11 @@ bool kvm_vcpu_id_is_valid(int vcpu_id)
return vcpu_id >= 0 && vcpu_id < kvm_max_vcpu_id(s);
}
+bool kvm_dirty_ring_enabled(void)
+{
+ return kvm_state->kvm_dirty_ring_size ? true : false;
+}
+
static int kvm_init(MachineState *ms)
{
MachineClass *mc = MACHINE_GET_CLASS(ms);
diff --git a/include/hw/core/cpu.h b/include/hw/core/cpu.h
index 4e0ea68efc..80fcb1d563 100644
--- a/include/hw/core/cpu.h
+++ b/include/hw/core/cpu.h
@@ -374,6 +374,7 @@ struct CPUState {
struct kvm_run *kvm_run;
struct kvm_dirty_gfn *kvm_dirty_gfns;
uint32_t kvm_fetch_index;
+ uint64_t dirty_pages;
/* Used for events with 'vcpu' and *without* the 'disabled' properties */
DECLARE_BITMAP(trace_dstate_delayed, CPU_TRACE_DSTATE_MAX_EVENTS);
diff --git a/include/sysemu/kvm.h b/include/sysemu/kvm.h
index a1ab1ee12d..7b22aeb6ae 100644
--- a/include/sysemu/kvm.h
+++ b/include/sysemu/kvm.h
@@ -547,4 +547,5 @@ bool kvm_cpu_check_are_resettable(void);
bool kvm_arch_cpu_check_are_resettable(void);
+bool kvm_dirty_ring_enabled(void);
#endif
--
2.18.2
- [PATCH v2 0/6] support dirtyrate at the granualrity of vcpu, huangy81, 2021/06/06
- [PATCH v2 1/6] hmp: Add "calc_dirty_rate" and "info dirty_rate" cmds, huangy81, 2021/06/06
- [PATCH v2 2/6] KVM: introduce dirty_pages and kvm_dirty_ring_enabled,
huangy81 <=
- [PATCH v2 3/6] migration/dirtyrate: add per-vcpu option for calc-dirty-rate, huangy81, 2021/06/06
- [PATCH v2 4/6] migration/dirtyrate: adjust struct DirtyRateStat, huangy81, 2021/06/06
- [PATCH v2 5/6] memory: make global_dirty_log a bitmask, huangy81, 2021/06/06
- [PATCH v2 6/6] migration/dirtyrate: implement dirty-ring dirtyrate calculation, huangy81, 2021/06/06