Skip to contentSkip to conversation

support dirty restraint on vCPU

PATCH Superseded [email protected] 2 participants 8 messages Nov 24, 2021 – Nov 26, 2021

v5 of 25 Superseded Latest is v25 →

lore
Share & tools
lore
#0 lore raw

v5 cover support dirty restraint on vCPU

From: Hyman Huang(黄勇) <[email protected]>

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.h

Please 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 limit on vCPU

 cpus-common.c                 |  41 ++++++
 include/exec/memory.h         |   5 +-
 include/hw/core/cpu.h         |   9 ++
 include/sysemu/cpu-throttle.h |  23 +++
 include/sysemu/dirtylimit.h   |  44 ++++++
 migration/dirtyrate.c         | 139 +++++++++++++++++--
 migration/dirtyrate.h         |   2 +
 qapi/migration.json           |  43 ++++++
 softmmu/cpu-throttle.c        | 316 ++++++++++++++++++++++++++++++++++++++++++
 softmmu/trace-events          |   5 +
 softmmu/vl.c                  |   1 +
 11 files changed, 617 insertions(+), 11 deletions(-)
 create mode 100644 include/sysemu/dirtylimit.h
Signature · 1 line
1.8.3.1
#1 lore raw

PATCH v5 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       | 139 ++++++++++++++++++++++++++++++++++++++++----
 migration/dirtyrate.h       |   2 +
 4 files changed, 179 insertions(+), 11 deletions(-)
 create mode 100644 include/sysemu/dirtylimit.h
include/exec/memory.h +4 -1
index 20f1b27..606bec8 100644
@@ -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 +129 -10

157 lines not on this page · raw message

migration/dirtyrate.h +2 -0
index 69d4c5b..e96acdc 100644
@@ -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
#2 lore raw

PATCH v5 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 |  23 +++
 softmmu/cpu-throttle.c        | 316 ++++++++++++++++++++++++++++++++++++++++++
 softmmu/trace-events          |   5 +
 3 files changed, 344 insertions(+)
include/sysemu/cpu-throttle.h +23 -0
index d65bdef..726c1ce 100644
@@ -65,4 +65,27 @@ bool cpu_throttle_active(void);
  */
 int cpu_throttle_get_percentage(void);
 
+/**
+ * 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_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 */
softmmu/cpu-throttle.c +316 -0

328 lines not on this page · raw message

softmmu/trace-events +5 -0
index 9c88887..a7c9c04 100644
@@ -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
#3 lore raw

Re: [PATCH v5 2/3] cpu-throttle: implement vCPU throttle

The use of atomics in this patch and the previous requires careful review by an expert on proper use of atomics.

#4 lore raw

PATCH v5 3/3 cpus-common: implement dirty 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 dirtyrate given by user.

Introduce qmp commands set-dirty-limit/cancel-dirty-limit to set/cancel dirty limit on vCPU.

---
 cpus-common.c         | 41 +++++++++++++++++++++++++++++++++++++++++
 include/hw/core/cpu.h |  9 +++++++++
 qapi/migration.json   | 43 +++++++++++++++++++++++++++++++++++++++++++
 softmmu/vl.c          |  1 +
 4 files changed, 94 insertions(+)
cpus-common.c +41 -0
index 6e73d3e..43b0078 100644
@@ -23,6 +23,11 @@
 #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 "qapi/error.h"
+#include "qapi/qapi-commands-migration.h"
 
 static QemuMutex qemu_cpu_list_lock;
 static QemuCond exclusive_cond;
@@ -352,3 +357,39 @@ void process_queued_cpu_work(CPUState *cpu)
     qemu_mutex_unlock(&cpu->work_mutex);
     qemu_cond_broadcast(&qemu_work_cond);
 }
+
+void qmp_set_dirty_limit(int64_t idx,
+                         uint64_t dirtyrate,
+                         Error **errp)
+{
+    if (!kvm_dirty_ring_enabled()) {
+        error_setg(errp, "dirty ring not enable, needed by dirty restraint!");
+        return;
+    }
+
+    dirtylimit_calc();
+    dirtylimit_vcpu(idx, dirtyrate);
+}
+
+void qmp_cancel_dirty_limit(int64_t idx,
+                            Error **errp)
+{
+    if (!kvm_dirty_ring_enabled()) {
+        error_setg(errp, "dirty ring not enable, needed by dirty restraint!");
+        return;
+    }
+
+    if (unlikely(!dirtylimit_cancel_vcpu(idx))) {
+        dirtylimit_calc_quit();
+    }
+}
+
+void dirtylimit_setup(int max_cpus)
+{
+    if (!kvm_dirty_ring_enabled()) {
+        return;
+    }
+
+    dirtylimit_calc_state_init(max_cpus);
+    dirtylimit_state_init(max_cpus);
+}
include/hw/core/cpu.h +9 -0
index e948e81..11df012 100644
@@ -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 */
qapi/migration.json +43 -0

49 lines not on this page · raw message

softmmu/vl.c +1 -0
index 620a1f1..0f83ce3 100644
@@ -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
#5 lore raw

Re: [PATCH v5 3/3] cpus-common: implement dirty limit on vCPU

Quoted 34 lines · [email protected] writes:

From: Hyman Huang(黄勇) <[email protected]>

Implement dirtyrate calculation periodically basing on dirty-ring and throttle vCPU until it reachs the quota dirtyrate given by user.

Introduce qmp commands set-dirty-limit/cancel-dirty-limit to set/cancel dirty limit on vCPU.

---
 cpus-common.c         | 41 +++++++++++++++++++++++++++++++++++++++++
 include/hw/core/cpu.h |  9 +++++++++
 qapi/migration.json   | 43 +++++++++++++++++++++++++++++++++++++++++++
 softmmu/vl.c          |  1 +
 4 files changed, 94 insertions(+)
cpus-common.c +5 -0
index 6e73d3e..43b0078 100644
@@ -23,6 +23,11 @@
 #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 "qapi/error.h"
+#include "qapi/qapi-commands-migration.h"
 
 static QemuMutex qemu_cpu_list_lock;
 static QemuCond exclusive_cond;

cpus-common.c void process_queued_cpu_work(CPUState *cpu) · line 366

Quoted 10 lines
cpus-common.c +7 -0
@@ -352,3 +357,39 @@ void process_queued_cpu_work(CPUState *cpu)
     qemu_mutex_unlock(&cpu->work_mutex);
     qemu_cond_broadcast(&qemu_work_cond);
 }
+
+void qmp_set_dirty_limit(int64_t idx,
+                         uint64_t dirtyrate,
+                         Error **errp)
+{
+    if (!kvm_dirty_ring_enabled()) {
+        error_setg(errp, "dirty ring not enable, needed by dirty restraint!");

"not enabled"

What is a "dirty restraint"?

Drop the exclamation point, please. See error.h:

* The resulting message should be a single phrase, with no newline or
* trailing punctuation.

What about "setting a dirty page limit requires ...".

Quoted 13 lines
cpus-common.c +13 -0
+        return;
+    }
+
+    dirtylimit_calc();
+    dirtylimit_vcpu(idx, dirtyrate);
+}
+
+void qmp_cancel_dirty_limit(int64_t idx,
+                            Error **errp)
+{
+    if (!kvm_dirty_ring_enabled()) {
+        error_setg(errp, "dirty ring not enable, needed by dirty restraint!");
+        return;

cpus-common.c void process_queued_cpu_work(CPUState *cpu) · line 389

Quoted 10 lines
cpus-common.c +10 -0
+    }
+
+    if (unlikely(!dirtylimit_cancel_vcpu(idx))) {
+        dirtylimit_calc_quit();
+    }
+}
+
+void dirtylimit_setup(int max_cpus)
+{
+    if (!kvm_dirty_ring_enabled()) {

This crashes unless the accelerator is kvm. Reproducer:

    $ qemu-system-x86_64 -display none -accel tcg
    Segmentation fault (core dumped)
Quoted 31 lines
cpus-common.c +6 -0
+        return;
+    }
+
+    dirtylimit_calc_state_init(max_cpus);
+    dirtylimit_state_init(max_cpus);
+}
include/hw/core/cpu.h +9 -0
index e948e81..11df012 100644
@@ -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 */
qapi/migration.json +0 -0
index bbfd48c..42b260e 100644

qapi/migration.json line 1855

Quoted 6 lines
qapi/migration.json +3 -0
@@ -1850,6 +1850,49 @@
 { 'command': 'query-dirty-rate', 'returns': 'DirtyRateInfo' }
 
 ##
+# @set-dirty-limit:
+#
+# Set the upper limit of dirty page rate for the interested vCPU.

"for a vCPU"

qapi/migration.json line 1861

Quoted 6 lines
qapi/migration.json +6 -0
+#
+# This command could be used to cap the vCPU memory load, which is also
+# refered as "dirty page rate". Users can use set-dirty-limit unconditionally,
+# but if one want to know which vCPU is in high memory load and which vCPU
+# should be limited, "calc-dirty-rate" with "dirty-ring" mode maybe an
+# availiable method.

I think you should mention that the command fails unless dirty ring is enabled, and a pointer to its documentation.

qapi/migration.json line 1863

Quoted 2 lines
qapi/migration.json +2 -0
+#
+# @idx: vCPU index to set dirtylimit.

Please rename to @cpu-index for consistency with query-cpus-fast. Same for cancel-dirty-limit below.

qapi/migration.json line 1865

Quoted 2 lines
qapi/migration.json +2 -0
+#
+# @dirtyrate: upper limit for the specified vCPU's dirty page rate (MB/s)

In QMP, we separate words with hyphens, like @dirty-rate. Please rename.

qapi/migration.json line 1867

Quoted 2 lines
qapi/migration.json +2 -0
+#
+# Since: 6.3

7.0

Quoted 4 lines
qapi/migration.json +4 -0
+#
+# Example:
+#   {"execute": "set-dirty-limit"}
+#    "arguments": { "idx": 0,

qapi/migration.json line 1881

Quoted 10 lines
qapi/migration.json +10 -0
+#                   "dirtyrate": 200 } }
+#
+##
+{ 'command': 'set-dirty-limit',
+  'data': { 'idx': 'int', 'dirtyrate': 'uint64' } }
+
+##
+# @cancel-dirty-limit:
+#
+# Cancel the dirtylimit for the vCPU which has been set with set-dirty-limit.

"the dirty page limit"

qapi/migration.json line 1885

Quoted 4 lines
qapi/migration.json +4 -0
+#
+# @idx: vCPU index to canceled the dirtylimit
+#
+# Since: 6.3

7.0

Quoted 24 lines
qapi/migration.json +10 -0
+#
+# Example:
+#   {"execute": "cancel-dirty-limit"}
+#    "arguments": { "idx": 0 } }
+#
+##
+{ 'command': 'cancel-dirty-limit',
+  'data': { 'idx': 'int' } }
+
+##
 # @snapshot-save:
 #
 # Save a VM snapshot
softmmu/vl.c +1 -0
index 620a1f1..0f83ce3 100644
@@ -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();
 }
#6 lore raw

Re: [PATCH v5 3/3] cpus-common: implement dirty limit on vCPU

Quoted 49 lines · Markus Armbruster
Quoted 34 lines · [email protected] writes:

From: Hyman Huang(黄勇) <[email protected]>

Implement dirtyrate calculation periodically basing on dirty-ring and throttle vCPU until it reachs the quota dirtyrate given by user.

Introduce qmp commands set-dirty-limit/cancel-dirty-limit to set/cancel dirty limit on vCPU.

---
  cpus-common.c         | 41 +++++++++++++++++++++++++++++++++++++++++
  include/hw/core/cpu.h |  9 +++++++++
  qapi/migration.json   | 43 +++++++++++++++++++++++++++++++++++++++++++
  softmmu/vl.c          |  1 +
  4 files changed, 94 insertions(+)
cpus-common.c +5 -0
index 6e73d3e..43b0078 100644
@@ -23,6 +23,11 @@
  #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 "qapi/error.h"
+#include "qapi/qapi-commands-migration.h"
 
  static QemuMutex qemu_cpu_list_lock;
  static QemuCond exclusive_cond;

cpus-common.c void process_queued_cpu_work(CPUState *cpu) · line 366

Quoted 10 lines
cpus-common.c +7 -0
@@ -352,3 +357,39 @@ void process_queued_cpu_work(CPUState *cpu)
      qemu_mutex_unlock(&cpu->work_mutex);
      qemu_cond_broadcast(&qemu_work_cond);
  }
+
+void qmp_set_dirty_limit(int64_t idx,
+                         uint64_t dirtyrate,
+                         Error **errp)
+{
+    if (!kvm_dirty_ring_enabled()) {
+        error_setg(errp, "dirty ring not enable, needed by dirty restraint!");

"not enabled"

Quoted 8 lines

What is a "dirty restraint"?

Drop the exclamation point, please. See error.h:

* The resulting message should be a single phrase, with no newline or
* trailing punctuation.

What about "setting a dirty page limit requires ...".

Ok, sound good

Quoted 27 lines
Quoted 14 lines
cpus-common.c +13 -0
+        return;
+    }
+
+    dirtylimit_calc();
+    dirtylimit_vcpu(idx, dirtyrate);
+}
+
+void qmp_cancel_dirty_limit(int64_t idx,
+                            Error **errp)
+{
+    if (!kvm_dirty_ring_enabled()) {
+        error_setg(errp, "dirty ring not enable, needed by dirty restraint!");
+        return;

cpus-common.c void process_queued_cpu_work(CPUState *cpu) · line 389

Quoted 10 lines
cpus-common.c +10 -0
+    }
+
+    if (unlikely(!dirtylimit_cancel_vcpu(idx))) {
+        dirtylimit_calc_quit();
+    }
+}
+
+void dirtylimit_setup(int max_cpus)
+{
+    if (!kvm_dirty_ring_enabled()) {

This crashes unless the accelerator is kvm. Reproducer:

Quoted 3 lines
     $ qemu-system-x86_64 -display none -accel tcg
     Segmentation fault (core dumped)

Thanks very much for finding this issue, i'll fix it next version

Quoted 40 lines
Quoted 31 lines
cpus-common.c +6 -0
+        return;
+    }
+
+    dirtylimit_calc_state_init(max_cpus);
+    dirtylimit_state_init(max_cpus);
+}
include/hw/core/cpu.h +9 -0
index e948e81..11df012 100644
@@ -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 */
qapi/migration.json +0 -0
index bbfd48c..42b260e 100644

qapi/migration.json line 1855

Quoted 6 lines
qapi/migration.json +3 -0
@@ -1850,6 +1850,49 @@
  { 'command': 'query-dirty-rate', 'returns': 'DirtyRateInfo' }
 
  ##
+# @set-dirty-limit:
+#
+# Set the upper limit of dirty page rate for the interested vCPU.

"for a vCPU"

Quoted 10 lines

qapi/migration.json line 1861

Quoted 6 lines
qapi/migration.json +6 -0
+#
+# This command could be used to cap the vCPU memory load, which is also
+# refered as "dirty page rate". Users can use set-dirty-limit unconditionally,
+# but if one want to know which vCPU is in high memory load and which vCPU
+# should be limited, "calc-dirty-rate" with "dirty-ring" mode maybe an
+# availiable method.

I think you should mention that the command fails unless dirty ring is enabled, and a pointer to its documentation.

Emm, it seems that there's no documentation about dirty ring in qemu, should i metion the commit b4420f19 "KVM: Dirty ring support" for dirty-ring?

Quoted 66 lines

qapi/migration.json line 1863

Quoted 2 lines
qapi/migration.json +2 -0
+#
+# @idx: vCPU index to set dirtylimit.

Please rename to @cpu-index for consistency with query-cpus-fast. Same for cancel-dirty-limit below.

qapi/migration.json line 1865

Quoted 2 lines
qapi/migration.json +2 -0
+#
+# @dirtyrate: upper limit for the specified vCPU's dirty page rate (MB/s)

In QMP, we separate words with hyphens, like @dirty-rate. Please rename.

qapi/migration.json line 1867

Quoted 2 lines
qapi/migration.json +2 -0
+#
+# Since: 6.3

7.0

Quoted 4 lines
qapi/migration.json +4 -0
+#
+# Example:
+#   {"execute": "set-dirty-limit"}
+#    "arguments": { "idx": 0,

qapi/migration.json line 1881

Quoted 10 lines
qapi/migration.json +10 -0
+#                   "dirtyrate": 200 } }
+#
+##
+{ 'command': 'set-dirty-limit',
+  'data': { 'idx': 'int', 'dirtyrate': 'uint64' } }
+
+##
+# @cancel-dirty-limit:
+#
+# Cancel the dirtylimit for the vCPU which has been set with set-dirty-limit.

"the dirty page limit"

qapi/migration.json line 1885

Quoted 4 lines
qapi/migration.json +4 -0
+#
+# @idx: vCPU index to canceled the dirtylimit
+#
+# Since: 6.3

7.0

Quoted 24 lines
qapi/migration.json +10 -0
+#
+# Example:
+#   {"execute": "cancel-dirty-limit"}
+#    "arguments": { "idx": 0 } }
+#
+##
+{ 'command': 'cancel-dirty-limit',
+  'data': { 'idx': 'int' } }
+
+##
  # @snapshot-save:
  #
  # Save a VM snapshot
softmmu/vl.c +1 -0
index 620a1f1..0f83ce3 100644
@@ -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 · 3 lines
Best regard

Hyman Huang(黄勇)
#7 lore raw

Re: [PATCH v5 3/3] cpus-common: implement dirty limit on vCPU

Quoted 13 lines · Hyman Huang
Quoted 12 lines · Markus Armbruster
Quoted 10 lines · [email protected] writes:

From: Hyman Huang(黄勇) <[email protected]>

Implement dirtyrate calculation periodically basing on dirty-ring and throttle vCPU until it reachs the quota dirtyrate given by user.

Introduce qmp commands set-dirty-limit/cancel-dirty-limit to set/cancel dirty limit on vCPU.

[...]

Quoted 22 lines
Quoted 12 lines

qapi/migration.json line 1854

Quoted 10 lines
qapi/migration.json +3 -0
index bbfd48c..42b260e 100644
@@ -1850,6 +1850,49 @@
  { 'command': 'query-dirty-rate', 'returns': 'DirtyRateInfo' }
    ##
+# @set-dirty-limit:
+#
+# Set the upper limit of dirty page rate for the interested vCPU.

"for a vCPU"

Quoted 10 lines

qapi/migration.json line 1861

Quoted 6 lines
qapi/migration.json +6 -0
+#
+# This command could be used to cap the vCPU memory load, which is also
+# refered as "dirty page rate". Users can use set-dirty-limit unconditionally,
+# but if one want to know which vCPU is in high memory load and which vCPU
+# should be limited, "calc-dirty-rate" with "dirty-ring" mode maybe an
+# availiable method.

I think you should mention that the command fails unless dirty ring is
enabled, and a pointer to its documentation.

Quoted 3 lines

Emm, it seems that there's no documentation about dirty ring in qemu, should i metion the commit b4420f19 "KVM: Dirty ring support" for dirty-ring?

I think the best you can do then is something like 'Property "dirty-ring-size" of accelerator object "kvm" must be set.'

[...]