From nobody Wed May 15 13:54:00 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1646304593485461.2720852037378; Thu, 3 Mar 2022 02:49:53 -0800 (PST) Received: from localhost ([::1]:53872 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nPj1r-0004BM-S1 for importer@patchew.org; Thu, 03 Mar 2022 05:49:51 -0500 Received: from eggs.gnu.org ([209.51.188.92]:49606) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nPixw-0001us-9O for qemu-devel@nongnu.org; Thu, 03 Mar 2022 05:45:48 -0500 Received: from prt-mail.chinatelecom.cn ([42.123.76.222]:52148 helo=chinatelecom.cn) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nPixj-0002b0-SD for qemu-devel@nongnu.org; Thu, 03 Mar 2022 05:45:46 -0500 Received: from clientip-182.150.57.243 (unknown [172.18.0.218]) by chinatelecom.cn (HERMES) with SMTP id 50F492800C2; Thu, 3 Mar 2022 18:45:23 +0800 (CST) Received: from ([172.18.0.218]) by app0025 with ESMTP id 2755987e1ef24999b29d08cb5cfc32b0 for qemu-devel@nongnu.org; Thu, 03 Mar 2022 18:45:25 CST HMM_SOURCE_IP: 172.18.0.218:43456.1888134411 HMM_ATTACHE_NUM: 0000 HMM_SOURCE_TYPE: SMTP X-189-SAVE-TO-SEND: +huangy81@chinatelecom.cn X-Transaction-ID: 2755987e1ef24999b29d08cb5cfc32b0 X-Real-From: huangy81@chinatelecom.cn X-Receive-IP: 172.18.0.218 X-MEDUSA-Status: 0 From: huangy81@chinatelecom.cn To: qemu-devel Subject: [PATCH] migration: Introduce dirtylimit capability Date: Thu, 3 Mar 2022 18:45:06 +0800 Message-Id: X-Mailer: git-send-email 1.8.3.1 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=42.123.76.222; envelope-from=huangy81@chinatelecom.cn; helo=chinatelecom.cn X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Hyman Huang , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , "Dr. David Alan Gilbert" , Juan Quintela Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZM-MESSAGEID: 1646304594340100001 From: Hyman Huang(=E9=BB=84=E5=8B=87) Signed-off-by: Hyman Huang(=E9=BB=84=E5=8B=87) --- migration/migration.c | 19 +++++++++++++++++++ migration/migration.h | 1 + migration/ram.c | 24 ++++++++++++++++++++++++ qapi/migration.json | 36 +++++++++++++++++++++++++++++++----- 4 files changed, 75 insertions(+), 5 deletions(-) diff --git a/migration/migration.c b/migration/migration.c index bcc385b..0b89468 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -116,6 +116,9 @@ #define DEFAULT_MIGRATE_ANNOUNCE_ROUNDS 5 #define DEFAULT_MIGRATE_ANNOUNCE_STEP 100 =20 +#define DEFAULT_MIGRATE_MIN_DIRTYLIMIT_RATE 1 +#define DEFAULT_MIGRATE_DIRTYLIMIT_STEP_SIZE 10 + static NotifierList migration_state_notifiers =3D NOTIFIER_LIST_INITIALIZER(migration_state_notifiers); =20 @@ -2397,6 +2400,15 @@ bool migrate_auto_converge(void) return s->enabled_capabilities[MIGRATION_CAPABILITY_AUTO_CONVERGE]; } =20 +bool migrate_dirtylimit(void) +{ + MigrationState *s; + + s =3D migrate_get_current(); + + return s->enabled_capabilities[MIGRATION_CAPABILITY_DIRTYLIMIT]; +} + bool migrate_zero_blocks(void) { MigrationState *s; @@ -4215,6 +4227,12 @@ static Property migration_properties[] =3D { DEFINE_PROP_SIZE("announce-step", MigrationState, parameters.announce_step, DEFAULT_MIGRATE_ANNOUNCE_STEP), + DEFINE_PROP_UINT64("min-dirtylimit-rate", MigrationState, + parameters.min_dirtylimit_rate, + DEFAULT_MIGRATE_ANNOUNCE_STEP), + DEFINE_PROP_UINT64("dirtylimit-step-size", MigrationState, + parameters.dirtylimit_step_size, + DEFAULT_MIGRATE_ANNOUNCE_STEP), =20 /* Migration capabilities */ DEFINE_PROP_MIG_CAP("x-xbzrle", MIGRATION_CAPABILITY_XBZRLE), @@ -4231,6 +4249,7 @@ static Property migration_properties[] =3D { DEFINE_PROP_MIG_CAP("x-multifd", MIGRATION_CAPABILITY_MULTIFD), DEFINE_PROP_MIG_CAP("x-background-snapshot", MIGRATION_CAPABILITY_BACKGROUND_SNAPSHOT), + DEFINE_PROP_MIG_CAP("x-dirtylimit", MIGRATION_CAPABILITY_DIRTYLIMIT), =20 DEFINE_PROP_END_OF_LIST(), }; diff --git a/migration/migration.h b/migration/migration.h index 8130b70..f2bf226 100644 --- a/migration/migration.h +++ b/migration/migration.h @@ -332,6 +332,7 @@ bool migrate_ignore_shared(void); bool migrate_validate_uuid(void); =20 bool migrate_auto_converge(void); +bool migrate_dirtylimit(void); bool migrate_use_multifd(void); bool migrate_pause_before_switchover(void); int migrate_multifd_channels(void); diff --git a/migration/ram.c b/migration/ram.c index 781f074..cf18536 100644 --- a/migration/ram.c +++ b/migration/ram.c @@ -56,6 +56,7 @@ #include "qemu/iov.h" #include "multifd.h" #include "sysemu/runstate.h" +#include "sysemu/dirtylimit.h" =20 #include "hw/boards.h" /* for machine_dump_guest_core() */ =20 @@ -1082,6 +1083,27 @@ static void migration_update_rates(RAMState *rs, int= 64_t end_time) } } =20 +/** + * mig_dirtylimit_guest_down: enable dirtylimit to throttle down the guest + */ +static void mig_dirtylimit_guest_down(void) +{ + MigrationState *s =3D migrate_get_current(); + uint64_t current_dirtyrate =3D s->mbps / 8; + uint64_t min_dirtyrate =3D s->parameters.min_dirtylimit_rate; + uint64_t step_size =3D s->parameters.dirtylimit_step_size; + static uint64_t quota_dirtyrate; + + if (!dirtylimit_in_service()) { + quota_dirtyrate =3D MAX(current_dirtyrate, min_dirtyrate); + dirtylimit_set_all(quota_dirtyrate, true); + } else { + quota_dirtyrate -=3D step_size; + quota_dirtyrate =3D MAX(current_dirtyrate, min_dirtyrate); + dirtylimit_set_all(quota_dirtyrate, true); + } +} + static void migration_trigger_throttle(RAMState *rs) { MigrationState *s =3D migrate_get_current(); @@ -1108,6 +1130,8 @@ static void migration_trigger_throttle(RAMState *rs) mig_throttle_guest_down(bytes_dirty_period, bytes_dirty_threshold); } + } else if (migrate_dirtylimit() && kvm_dirty_ring_enabled()) { + mig_dirtylimit_guest_down(); } } =20 diff --git a/qapi/migration.json b/qapi/migration.json index 2ccbb92..e074dc8 100644 --- a/qapi/migration.json +++ b/qapi/migration.json @@ -463,6 +463,9 @@ # procedure starts. The VM RAM is saved with running= VM. # (since 6.0) # +# @dirtylimit: Use dirtylimit to throttle down guest if enabled. +# (since 6.1) +# # Features: # @unstable: Members @x-colo and @x-ignore-shared are experimental. # @@ -476,7 +479,7 @@ 'block', 'return-path', 'pause-before-switchover', 'multifd', 'dirty-bitmaps', 'postcopy-blocktime', 'late-block-activate', { 'name': 'x-ignore-shared', 'features': [ 'unstable' ] }, - 'validate-uuid', 'background-snapshot'] } + 'validate-uuid', 'background-snapshot', 'dirtylimit'] } =20 ## # @MigrationCapabilityStatus: @@ -760,6 +763,12 @@ # block device name if there is one, and to their n= ode name # otherwise. (Since 5.2) # +# @min-dirtylimit-rate: minimum qouta for limiting dirty page rate. +# Defaults to 1. (Since 6.1) +# +# @dirtylimit-step-size: step size (MB/s) for limiting dirty page rate. +# Defaults to 10. (Since 6.1) +# # Features: # @unstable: Member @x-checkpoint-delay is experimental. # @@ -779,8 +788,9 @@ 'multifd-channels', 'xbzrle-cache-size', 'max-postcopy-bandwidth', 'max-cpu-throttle', 'multifd-compression', - 'multifd-zlib-level' ,'multifd-zstd-level', - 'block-bitmap-mapping' ] } + 'multifd-zlib-level', 'multifd-zstd-level', + 'block-bitmap-mapping', 'min-dirtylimit-rate', + 'dirtylimit-step-size' ] } =20 ## # @MigrateSetParameters: @@ -925,6 +935,12 @@ # block device name if there is one, and to their n= ode name # otherwise. (Since 5.2) # +# @min-dirtylimit-rate: minimum qouta for limiting dirty page rate. +# Defaults to 1. (Since 6.1) +# +# @dirtylimit-step-size: step size (MB/s) for limiting dirty page rate. +# Defaults to 10. (Since 6.1) +# # Features: # @unstable: Member @x-checkpoint-delay is experimental. # @@ -960,7 +976,9 @@ '*multifd-compression': 'MultiFDCompression', '*multifd-zlib-level': 'uint8', '*multifd-zstd-level': 'uint8', - '*block-bitmap-mapping': [ 'BitmapMigrationNodeAlias' ] } } + '*block-bitmap-mapping': [ 'BitmapMigrationNodeAlias' ], + '*min-dirtylimit-rate': 'uint64', + '*dirtylimit-step-size': 'uint64' } } =20 ## # @migrate-set-parameters: @@ -1125,6 +1143,12 @@ # block device name if there is one, and to their n= ode name # otherwise. (Since 5.2) # +# @min-dirtylimit-rate: minimum qouta for limiting dirty page rate. +# Defaults to 1. (Since 6.1) +# +# @dirtylimit-step-size: step size (MB/s) for limiting dirty page rate. +# Defaults to 10. (Since 6.1) +# # Features: # @unstable: Member @x-checkpoint-delay is experimental. # @@ -1158,7 +1182,9 @@ '*multifd-compression': 'MultiFDCompression', '*multifd-zlib-level': 'uint8', '*multifd-zstd-level': 'uint8', - '*block-bitmap-mapping': [ 'BitmapMigrationNodeAlias' ] } } + '*block-bitmap-mapping': [ 'BitmapMigrationNodeAlias' ], + '*min-dirtylimit-rate': 'uint64', + '*dirtylimit-step-size': 'uint64' } } =20 ## # @query-migrate-parameters: --=20 1.8.3.1