migration: Put the detection logic before auto-converge checking

This commit is prepared for the implementation of dirty-limit
convergence algo.

The detection logic of throttling condition can apply to both
auto-converge and dirty-limit algo, putting it's position
before the checking logic for auto-converge feature.

Signed-off-by: Hyman Huang(黄勇) <yong.huang@smartx.com>
Reviewed-by: Juan Quintela <quintela@redhat.com>
Message-ID: <168733225273.5845.15871826788879741674-6@git.sr.ht>
Signed-off-by: Juan Quintela <quintela@redhat.com>
This commit is contained in:
Hyman Huang(黄勇) 2023-06-15 21:29:44 +08:00 committed by Juan Quintela
parent bb9993c672
commit 310ad5625e

View File

@ -999,17 +999,18 @@ static void migration_trigger_throttle(RAMState *rs)
return; return;
} }
if (migrate_auto_converge()) { /*
/* The following detection logic can be refined later. For now: * The following detection logic can be refined later. For now:
Check to see if the ratio between dirtied bytes and the approx. * Check to see if the ratio between dirtied bytes and the approx.
amount of bytes that just got transferred since the last time * amount of bytes that just got transferred since the last time
we were in this routine reaches the threshold. If that happens * we were in this routine reaches the threshold. If that happens
twice, start or increase throttling. */ * twice, start or increase throttling.
*/
if ((bytes_dirty_period > bytes_dirty_threshold) && if ((bytes_dirty_period > bytes_dirty_threshold) &&
(++rs->dirty_rate_high_cnt >= 2)) { (++rs->dirty_rate_high_cnt >= 2)) {
rs->dirty_rate_high_cnt = 0;
if (migrate_auto_converge()) {
trace_migration_throttle(); trace_migration_throttle();
rs->dirty_rate_high_cnt = 0;
mig_throttle_guest_down(bytes_dirty_period, mig_throttle_guest_down(bytes_dirty_period,
bytes_dirty_threshold); bytes_dirty_threshold);
} }