mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

KVM: introduce dirty_pages and kvm_dirty_ring_enabled

Browse Source 
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>
Message-Id: <fee5fb2ab17ec2159405fc54a3cff8e02322f816.1624040308.git.huangy81@chinatelecom.cn>
Reviewed-by: Peter Xu <peterx@redhat.com>
Reviewed-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Juan Quintela <quintela@redhat.com>
This commit is contained in:
Hyman Huang(黄勇) 2021-06-29 16:01:18 +00:00 committed by Juan Quintela
parent b390afd8c5
commit 7786ae40ba
4 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
accel/kvm/kvm-all.c
View File

@ -469,6 +469,7 @@ int kvm_init_vcpu(CPUState *cpu, Error **errp)
cpu->kvm_fd = ret; cpu->kvm_fd = ret;
cpu->kvm_state = s; cpu->kvm_state = s;
cpu->vcpu_dirty = true; cpu->vcpu_dirty = true;
cpu->dirty_pages = 0;
mmap_size = kvm_ioctl(s, KVM_GET_VCPU_MMAP_SIZE, 0); mmap_size = kvm_ioctl(s, KVM_GET_VCPU_MMAP_SIZE, 0);
if (mmap_size < 0) { if (mmap_size < 0) {
@ -743,6 +744,7 @@ static uint32_t kvm_dirty_ring_reap_one(KVMState *s, CPUState *cpu)
count++; count++;
} }
cpu->kvm_fetch_index = fetch; cpu->kvm_fetch_index = fetch;
cpu->dirty_pages += count;
return count; return count;
} }
@ -2296,6 +2298,11 @@ bool kvm_vcpu_id_is_valid(int vcpu_id)
return vcpu_id >= 0 && vcpu_id < kvm_max_vcpu_id(s); 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) static int kvm_init(MachineState *ms)
{ {
MachineClass *mc = MACHINE_GET_CLASS(ms); MachineClass *mc = MACHINE_GET_CLASS(ms);

5
accel/stubs/kvm-stub.c
View File

@ -147,4 +147,9 @@ bool kvm_arm_supports_user_irq(void)
{ {
return false; return false;
} }
bool kvm_dirty_ring_enabled(void)
{
return false;
}
#endif #endif

1
include/hw/core/cpu.h
View File

@ -381,6 +381,7 @@ struct CPUState {
struct kvm_run *kvm_run; struct kvm_run *kvm_run;
struct kvm_dirty_gfn *kvm_dirty_gfns; struct kvm_dirty_gfn *kvm_dirty_gfns;
uint32_t kvm_fetch_index; uint32_t kvm_fetch_index;
uint64_t dirty_pages;
/* Used for events with 'vcpu' and *without* the 'disabled' properties */ /* Used for events with 'vcpu' and *without* the 'disabled' properties */
DECLARE_BITMAP(trace_dstate_delayed, CPU_TRACE_DSTATE_MAX_EVENTS); DECLARE_BITMAP(trace_dstate_delayed, CPU_TRACE_DSTATE_MAX_EVENTS);

1
include/sysemu/kvm.h
View File

@ -547,4 +547,5 @@ bool kvm_cpu_check_are_resettable(void);
bool kvm_arch_cpu_check_are_resettable(void); bool kvm_arch_cpu_check_are_resettable(void);
bool kvm_dirty_ring_enabled(void);
#endif #endif