support dirty restraint on vCPU
v8 cover support dirty restraint on vCPU
From: Hyman Huang(黄勇) <[email protected]>
v8:
- rebase on master
- polish the error message and remove the "unlikely" compilation syntax according to the advice given by Markus.
- keep the dirty tracking enabled during "dirtylimit-calc" lifecycle so that the overhead can be reduced according to the advice given by Peter.
- merge the "set/cancel" qmp commands into one named "vcpu-dirty-limit" and introduce qmp command "query-vcpu-dirty-limit" to query dirty limit information about virtual CPU, according to the advice given by Peter.
- check if vcpu index is valid and handle the unplug case before enabling, disabling dirty limit for virtual CPU.
- introduce hmp commands so developers can play with them easier, use "vcpu_dirty_limit" to enable dirty limit and "info vcpu_dirty_limit" to query.
The patch [2/3] has not been touched so far. Any corrections and suggetions are welcome.
Please review, thanks!
v7:
- rebase on master
- polish the comments and error message according to the advices given by Markus
- introduce dirtylimit_enabled function to pre-check if dirty page limit is enabled before canceling.
v6:
- rebase on master
- fix dirtylimit setup crash found by Markus
- polish the comments according to the advice given by Markus
- adjust the qemu qmp command tag to 7.0
v5:
- rebase on master
- adjust the throttle algorithm by removing the tuning in RESTRAINT_RATIO case so that dirty page rate could reachs the quota more quickly.
- fix percentage update in throttle iteration.
v4:
- rebase on master
- modify the following points according to the advice given by Markus
1. move the defination into migration.json
2. polish the comments of set-dirty-limit
3. do the syntax check and change dirty rate to dirty page rate
Thanks for the carefule reviews made by Markus.
Please review, thanks!
v3:
- rebase on master
- modify the following points according to the advice given by Markus
1. remove the DirtyRateQuotaVcpu and use its field as option directly
2. add comments to show details of what dirtylimit setup do
3. explain how to use dirtylimit in combination with existing qmp commands "calc-dirty-rate" and "query-dirty-rate" in documentation.
Thanks for the carefule reviews made by Markus.
Please review, thanks!
Hyman
v2:
- rebase on master
- modify the following points according to the advices given by Juan
1. rename dirtyrestraint to dirtylimit
2. implement the full lifecyle function of dirtylimit_calc, include dirtylimit_calc and dirtylimit_calc_quit
3. introduce 'quit' field in dirtylimit_calc_state to implement the dirtylimit_calc_quit
4. remove the ready_cond and ready_mtx since it may not be suitable
5. put the 'record_dirtypage' function code at the beggining of the file
6. remove the unnecesary return;
- other modifications has been made after code review
1. introduce 'bmap' and 'nr' field in dirtylimit_state to record the number of running thread forked by dirtylimit
2. stop the dirtyrate calculation thread if all the dirtylimit thread are stopped
3. do some renaming works
dirtyrate calulation thread -> dirtylimit-calc
dirtylimit thread -> dirtylimit-{cpu_index}
function name do_dirtyrestraint -> dirtylimit_check
qmp command dirty-restraint -> set-drity-limit
qmp command dirty-restraint-cancel -> cancel-dirty-limit
header file dirtyrestraint.h -> dirtylimit.hPlease review, thanks !
thanks for the accurate and timely advices given by Juan. we really appreciate it if corrections and suggetions about this patchset are proposed.
Best Regards !
Hyman
v1:
this patchset introduce a mechanism to impose dirty restraint on vCPU, aiming to keep the vCPU running in a certain dirtyrate given by user. dirty restraint on vCPU maybe an alternative method to implement convergence logic for live migration, which could improve guest memory performance during migration compared with traditional method in theory.
For the current live migration implementation, the convergence logic throttles all vCPUs of the VM, which has some side effects. -'read processes' on vCPU will be unnecessarily penalized
- throttle increase percentage step by step, which seems struggling to find the optimal throttle percentage when dirtyrate is high.
- hard to predict the remaining time of migration if the throttling percentage reachs 99%
to a certain extent, the dirty restraint machnism can fix these effects by throttling at vCPU granularity during migration.
the implementation is rather straightforward, we calculate vCPU dirtyrate via the Dirty Ring mechanism periodically as the commit 0e21bf246 "implement dirty-ring dirtyrate calculation" does, for vCPU that be specified to impose dirty restraint, we throttle it periodically as the auto-converge does, once after throttling, we compare the quota dirtyrate with current dirtyrate, if current dirtyrate is not under the quota, increase the throttling percentage until current dirtyrate is under the quota.
this patchset is the basis of implmenting a new auto-converge method for live migration, we introduce two qmp commands for impose/cancel the dirty restraint on specified vCPU, so it also can be an independent api to supply the upper app such as libvirt, which can use it to implement the convergence logic during live migration, supplemented with the qmp 'calc-dirty-rate' command or whatever.
we post this patchset for RFC and any corrections and suggetions about the implementation, api, throttleing algorithm or whatever are very appreciated!
Please review, thanks !
Best Regards !
Hyman Huang (3):
migration/dirtyrate: implement vCPU dirtyrate calculation periodically
cpu-throttle: implement vCPU throttle
cpus-common: implement dirty page limit on vCPU
cpus-common.c | 149 ++++++++++++++++++ hmp-commands-info.hx | 13 ++ hmp-commands.hx | 16 ++ include/exec/memory.h | 5 +- include/hw/core/cpu.h | 9 ++ include/monitor/hmp.h | 2 + include/sysemu/cpu-throttle.h | 45 ++++++ include/sysemu/dirtylimit.h | 44 ++++++ meson | 2 +- migration/dirtyrate.c | 142 +++++++++++++++-- migration/dirtyrate.h | 2 + qapi/migration.json | 70 +++++++++ softmmu/cpu-throttle.c | 355 ++++++++++++++++++++++++++++++++++++++++++ softmmu/trace-events | 5 + softmmu/vl.c | 1 + 15 files changed, 848 insertions(+), 12 deletions(-) create mode 100644 include/sysemu/dirtylimit.h
Signature · 1 line
1.8.3.1
PATCH v8 1/3 migration/dirtyrate: implement vCPU dirtyrate calculation periodically
From: Hyman Huang(黄勇) <[email protected]>
Introduce the third method GLOBAL_DIRTY_LIMIT of dirty tracking for calculate dirtyrate periodly for dirty restraint.
Implement thread for calculate dirtyrate periodly, which will be used for dirty restraint.
Add dirtylimit.h to introduce the util function for dirty limit implementation.
--- include/exec/memory.h | 5 +- include/sysemu/dirtylimit.h | 44 ++++++++++++++ migration/dirtyrate.c | 142 ++++++++++++++++++++++++++++++++++++++++---- migration/dirtyrate.h | 2 + 4 files changed, 182 insertions(+), 11 deletions(-) create mode 100644 include/sysemu/dirtylimit.h
include/exec/memory.h +4 -1
@@ -69,7 +69,10 @@ static inline void fuzz_dma_read_cb(size_t addr,/* Dirty tracking enabled because measuring dirty rate */ #define GLOBAL_DIRTY_DIRTY_RATE (1U << 1) -#define GLOBAL_DIRTY_MASK (0x3) +/* Dirty tracking enabled because dirty limit */ +#define GLOBAL_DIRTY_LIMIT (1U << 2) + +#define GLOBAL_DIRTY_MASK (0x7)extern unsigned int global_dirty_tracking;
include/sysemu/dirtylimit.h new file +44 -0
44 lines not on this page · raw message
migration/dirtyrate.c +132 -10
160 lines not on this page · raw message
migration/dirtyrate.h +2 -0
@@ -70,6 +70,8 @@ typedef struct VcpuStat {DirtyRateVcpu *rates;/* array of dirty rate for each vcpu */ } VcpuStat; +typedef struct VcpuStat DirtyRatesData ; +/* * Store calculation statistics for each measure. */
Signature · 1 line
1.8.3.1
PATCH v8 2/3 cpu-throttle: implement vCPU throttle
In reply to [email protected]From: Hyman Huang(黄勇) <[email protected]>
Impose dirty restraint on vCPU by kicking it and sleep as the auto-converge does during migration, but just kick the specified vCPU instead, not all vCPUs of vm.
Start a thread to track the dirtylimit status and adjust the throttle pencentage dynamically depend on current and quota dirtyrate.
Introduce the util function in the header for dirtylimit implementation.
--- include/sysemu/cpu-throttle.h | 45 ++++++ qapi/migration.json | 22 +++ softmmu/cpu-throttle.c | 355 ++++++++++++++++++++++++++++++++++++++++++ softmmu/trace-events | 5 + 4 files changed, 427 insertions(+)
include/sysemu/cpu-throttle.h +45 -0
@@ -65,4 +65,49 @@ bool cpu_throttle_active(void);*/ int cpu_throttle_get_percentage (void ); +/** +* dirtylimit_enabled +* +* Returns: %true if dirty page limit for vCPU is enabled, %false otherwise. +*/ +bool dirtylimit_enabled (int cpu_index); + +/** +* dirtylimit_is_vcpu_index_valid +* +* Returns: %true if cpu index valid, %false otherwise. +*/ +bool dirtylimit_is_vcpu_index_valid (int cpu_index); + +/** +* dirtylimit_state_init: +* +* initialize golobal state for dirtylimit +*/ +void dirtylimit_state_init (int max_cpus); + +/** +* dirtylimit_vcpu: +* +* impose dirtylimit on vcpu util reaching the quota dirtyrate +*/ +void dirtylimit_vcpu (int cpu_index, +uint64_t quota); + +/** +* dirtylimit_query_vcpu: +* +* Returns: dirty page limit information of specified virtual CPU. +*/ +struct DirtyLimitInfo *dirtylimit_query_vcpu (int cpu_index); + +/** +* dirtylimit_cancel_vcpu: +* +* cancel dirtylimit for the specified vcpu +* +* Returns: the number of running threads for dirtylimit +*/ +int dirtylimit_cancel_vcpu (int cpu_index); +#endif /* SYSEMU_CPU_THROTTLE_H */
qapi/migration.json +22 -0
@@ -1850,6 +1850,28 @@ { 'command': 'query-dirty-rate', 'returns': 'DirtyRateInfo' } ## +# @DirtyLimitInfo: +# +# Dirty page rate limit information of virtual CPU. +# +# @cpu-index: index of virtual CPU. +# +# @enable: true to enable, false to disable. +# +# @limit-rate: upper limit of dirty page rate for virtual CPU. +# +# @current-rate: current dirty page rate for virtual CPU. +# +# Since: 7.0 +# +## +{ 'struct': 'DirtyLimitInfo', + 'data': { 'cpu-index': 'int', + 'enable': 'bool', + 'limit-rate': 'int64', + 'current-rate': 'int64' } } + +## # @snapshot-save: # # Save a VM snapshot
softmmu/cpu-throttle.c +355 -0
367 lines not on this page · raw message
softmmu/trace-events +5 -0
@@ -31,3 +31,8 @@ runstate_set(int current_state, const char *current_state_str, int new_state, co system_wakeup_request(int reason) "reason=%d" qemu_system_shutdown_request(int reason) "reason=%d" qemu_system_powerdown_request(void) "" + +#cpu-throttle.c +dirtylimit_state_init(int max_cpus) "dirtylimit state init: max cpus %d" +dirtylimit_impose(int cpu_index, uint64_t quota, uint64_t current, int pct) "CPU[%d] impose dirtylimit: quota %" PRIu64 ", current %" PRIu64 ", percentage %d" +dirtylimit_vcpu(int cpu_index, uint64_t quota) "CPU[%d] set quota dirtylimit %"PRIu64
Signature · 1 line
1.8.3.1
PATCH v8 3/3 cpus-common: implement dirty page limit on vCPU
In reply to [email protected]From: Hyman Huang(黄勇) <[email protected]>
Implement dirtyrate calculation periodically basing on dirty-ring and throttle vCPU until it reachs the quota dirty page rate given by user.
Introduce qmp commands "vcpu-dirty-limit", "query-vcpu-dirty-limit" to enable, disable, query dirty page limit for virtual CPU.
Meanwhile, introduce corresponding hmp commands "vcpu_dirty_limit", "info vcpu_dirty_limit" so developers can play with them easier.
--- cpus-common.c | 149 ++++++++++++++++++++++++++++++++++++++++++++++++++ hmp-commands-info.hx | 13 +++++ hmp-commands.hx | 16 ++++++ include/hw/core/cpu.h | 9 +++ include/monitor/hmp.h | 2 + qapi/migration.json | 48 ++++++++++++++++ softmmu/vl.c | 1 + 7 files changed, 238 insertions(+)
cpus-common.c +149 -0
@@ -23,6 +23,14 @@#include "hw/core/cpu.h" #include "sysemu/cpus.h" #include "qemu/lockable.h" +#include "sysemu/dirtylimit.h" +#include "sysemu/cpu-throttle.h" +#include "sysemu/kvm.h" +#include "monitor/hmp.h" +#include "monitor/monitor.h" +#include "qapi/qmp/qdict.h" +#include "qapi/error.h" +#include "qapi/qapi-commands-migration.h" static QemuMutex qemu_cpu_list_lock;static QemuCond exclusive_cond;
@@ -352,3 +360,144 @@ void process_queued_cpu_work(CPUState *cpu)qemu_mutex_unlock (&cpu->work_mutex);qemu_cond_broadcast (&qemu_work_cond); } + +void qmp_vcpu_dirty_limit (int64_t cpu_index, +bool enable, +uint64_t dirty_rate, +Error **errp) +{ +if (!kvm_enabled () || !kvm_dirty_ring_enabled ()) { +error_setg (errp,"dirty page limit feature requires KVM with" +" accelerator property 'dirty-ring-size' set'" ); +return ; + } + +if (!dirtylimit_is_vcpu_index_valid (cpu_index)) { +error_setg (errp,"cpu index out of range" ); +return ; + } + +if (enable) { +dirtylimit_calc (); +dirtylimit_vcpu (cpu_index, dirty_rate); + }else { +if (!dirtylimit_enabled (cpu_index)) { +error_setg (errp,"dirty page limit for CPU %ld not set" , + cpu_index); +return ; + } + +if (!dirtylimit_cancel_vcpu (cpu_index)) { +dirtylimit_calc_quit (); + } + } +} + +void hmp_vcpu_dirty_limit (Monitor *mon,const QDict *qdict) +{ +int64_t cpu_index =qdict_get_try_int (qdict,"cpu_index" ,-1 ); +int64_t dirty_rate =qdict_get_try_int (qdict,"dirty_rate" ,-1 ); +bool enable =qdict_get_bool (qdict,"enable" ); +Error *err =NULL ; + +if (enable && dirty_rate <0 ) { +monitor_printf (mon,"Enabling dirty limit requires dirty_rate set!\n" ); +return ; + } + +if (!dirtylimit_is_vcpu_index_valid (cpu_index)) { +monitor_printf (mon,"Incorrect cpu index specified!\n" ); +return ; + } + +qmp_vcpu_dirty_limit (cpu_index, enable, dirty_rate, &err); + +if (err) { +hmp_handle_error (mon, err); +return ; + } + +monitor_printf (mon,"Enabling dirty page rate limit with %" PRIi64 +" MB/s\n" , dirty_rate); + +monitor_printf (mon,"[Please use 'info vcpu_dirty_limit' to query " +"dirty limit for virtual CPU]\n" ); +} + +struct DirtyLimitInfoList *qmp_query_vcpu_dirty_limit (bool has_cpu_index, +int64_t cpu_index, +Error **errp) +{ +DirtyLimitInfo *info =NULL ; +DirtyLimitInfoList *head =NULL , **tail = &head; + +if (has_cpu_index && + (!dirtylimit_is_vcpu_index_valid (cpu_index))) { +error_setg (errp,"cpu index out of range" ); +return NULL ; + } + +if (has_cpu_index) { + info =dirtylimit_query_vcpu (cpu_index); +QAPI_LIST_APPEND (tail, info); + }else { +CPUState *cpu; +CPU_FOREACH (cpu) { +if (!cpu->unplug) { + info =dirtylimit_query_vcpu (cpu->cpu_index); +QAPI_LIST_APPEND (tail, info); + } + } + } + +return head; +} + +void hmp_info_vcpu_dirty_limit (Monitor *mon,const QDict *qdict) +{ +DirtyLimitInfoList *limit, *head, *info =NULL ; +int64_t cpu_index =qdict_get_try_int (qdict,"cpu_index" ,-1 ); +Error *err =NULL ; + +if (cpu_index >=0 && + !dirtylimit_is_vcpu_index_valid (cpu_index)) { +monitor_printf (mon,"cpu index out of range\n" ); +return ; + } + +if (cpu_index <0 ) { + info =qmp_query_vcpu_dirty_limit (false,-1 , &err); + }else { + info =qmp_query_vcpu_dirty_limit (true, cpu_index, &err); + } + +if (err) { +hmp_handle_error (mon, err); +return ; + } + + head = info; +for (limit = head; limit !=NULL ; limit = limit->next) { +monitor_printf (mon,"vcpu[%" PRIi64"], Enable: %s" , + limit->value->cpu_index, + limit->value->enable ?"true" :"false" ); +if (limit->value->enable) { +monitor_printf (mon,", limit rate %" PRIi64" (MB/s)," +" current rate %" PRIi64" (MB/s)\n" , + limit->value->limit_rate, + limit->value->current_rate); + }else { +monitor_printf (mon,"\n" ); + } + } +} + +void dirtylimit_setup (int max_cpus) +{ +if (!kvm_enabled () || !kvm_dirty_ring_enabled ()) { +return ; + } + +dirtylimit_calc_state_init (max_cpus); +dirtylimit_state_init (max_cpus); +}
hmp-commands-info.hx +13 -0
@@ -863,6 +863,19 @@ SRST Display the vcpu dirty rate information. ERST + { + .name = "vcpu_dirty_limit", + .args_type = "cpu_index:l?", + .params = "cpu_index", + .help = "show dirty page limit information", + .cmd = hmp_info_vcpu_dirty_limit, + }, + +SRST + ``info vcpu_dirty_limit`` + Display the vcpu dirty page limit information. +ERST + #if defined(TARGET_I386) { .name = "sgx",
hmp-commands.hx +16 -0
@@ -1744,3 +1744,19 @@ ERST "\n\t\t\t -b to specify dirty bitmap as method of calculation)", .cmd = hmp_calc_dirty_rate, }, + +SRST +``vcpu_dirty_limit`` + Start dirty page rate limit on a virtual CPU, the information about all the + virtual CPU dirty limit status can be observed with ``info vcpu_dirty_limit`` + command. +ERST + + { + .name = "vcpu_dirty_limit", + .args_type = "cpu_index:l,enable:b,dirty_rate:l?", + .params = "cpu_index on|off [dirty_rate]", + .help = "enable, disable dirty page rate limit on a virtual CPU" + "(dirty_rate should be specified dirty_rate if enable)", + .cmd = hmp_vcpu_dirty_limit, + },
include/hw/core/cpu.h +9 -0
@@ -881,6 +881,15 @@ void end_exclusive(void);*/ void qemu_init_vcpu (CPUState *cpu); +/** +* dirtylimit_setup: +* +* Initializes the global state of dirtylimit calculation and +* dirtylimit itself. This is prepared for vCPU dirtylimit which +* could be triggered during vm lifecycle. +*/ +void dirtylimit_setup (int max_cpus); +#define SSTEP_ENABLE 0x1/* Enable simulated HW single stepping */ #define SSTEP_NOIRQ 0x2/* Do not use IRQ while single stepping */ #define SSTEP_NOTIMER 0x4/* Do not Timers while single stepping */
include/monitor/hmp.h +2 -0
@@ -131,6 +131,8 @@ void hmp_replay_delete_break(Monitor *mon, const QDict *qdict);void hmp_replay_seek (Monitor *mon,const QDict *qdict);void hmp_info_dirty_rate (Monitor *mon,const QDict *qdict);void hmp_calc_dirty_rate (Monitor *mon,const QDict *qdict); +void hmp_info_vcpu_dirty_limit (Monitor *mon,const QDict *qdict); +void hmp_vcpu_dirty_limit (Monitor *mon,const QDict *qdict);void hmp_human_readable_text_helper (Monitor *mon,HumanReadableText *(*qmp_handler)(Error **));
qapi/migration.json +48 -0
54 lines not on this page · raw message
softmmu/vl.c +1 -0
@@ -3777,5 +3777,6 @@ void qemu_init(int argc, char **argv, char **envp)qemu_init_displays ();accel_setup_post (current_machine);os_setup_post (); +dirtylimit_setup (current_machine->smp.max_cpus);resume_mux_open (); }
Signature · 1 line
1.8.3.1