qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Juan Quintela <quintela@redhat.com>
To: qemu-devel@nongnu.org
Cc: Yang Zhang <yang.z.zhang@intel.com>, Liang Li <liang.z.li@intel.com>
Subject: [Qemu-devel] [PULL 13/16] migration: Add qmp commands to set and query parameters
Date: Thu,  7 May 2015 18:46:13 +0200	[thread overview]
Message-ID: <1431017176-3301-14-git-send-email-quintela@redhat.com> (raw)
In-Reply-To: <1431017176-3301-1-git-send-email-quintela@redhat.com>

From: Liang Li <liang.z.li@intel.com>

Add the qmp commands to tune and query the parameters used in live
migration.

Signed-off-by: Liang Li <liang.z.li@intel.com>
Signed-off-by: Yang Zhang <yang.z.zhang@intel.com>
Signed-off-by: Juan Quintela <quintela@redhat.com>
---
 migration/migration.c | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++
 qapi-schema.json      | 45 ++++++++++++++++++++++++++++++++++++++++
 qmp-commands.hx       | 57 +++++++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 158 insertions(+)

diff --git a/migration/migration.c b/migration/migration.c
index 533717c..732d229 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -188,6 +188,21 @@ MigrationCapabilityStatusList *qmp_query_migrate_capabilities(Error **errp)
     return head;
 }

+MigrationParameters *qmp_query_migrate_parameters(Error **errp)
+{
+    MigrationParameters *params;
+    MigrationState *s = migrate_get_current();
+
+    params = g_malloc0(sizeof(*params));
+    params->compress_level = s->parameters[MIGRATION_PARAMETER_COMPRESS_LEVEL];
+    params->compress_threads =
+            s->parameters[MIGRATION_PARAMETER_COMPRESS_THREADS];
+    params->decompress_threads =
+            s->parameters[MIGRATION_PARAMETER_DECOMPRESS_THREADS];
+
+    return params;
+}
+
 static void get_xbzrle_cache_stats(MigrationInfo *info)
 {
     if (migrate_use_xbzrle()) {
@@ -301,6 +316,47 @@ void qmp_migrate_set_capabilities(MigrationCapabilityStatusList *params,
     }
 }

+void qmp_migrate_set_parameters(bool has_compress_level,
+                                int64_t compress_level,
+                                bool has_compress_threads,
+                                int64_t compress_threads,
+                                bool has_decompress_threads,
+                                int64_t decompress_threads, Error **errp)
+{
+    MigrationState *s = migrate_get_current();
+
+    if (has_compress_level && (compress_level < 0 || compress_level > 9)) {
+        error_set(errp, QERR_INVALID_PARAMETER_VALUE, "compress_level",
+                  "is invalid, it should be in the range of 0 to 9");
+        return;
+    }
+    if (has_compress_threads &&
+            (compress_threads < 1 || compress_threads > 255)) {
+        error_set(errp, QERR_INVALID_PARAMETER_VALUE,
+                  "compress_threads",
+                  "is invalid, it should be in the range of 1 to 255");
+        return;
+    }
+    if (has_decompress_threads &&
+            (decompress_threads < 1 || decompress_threads > 255)) {
+        error_set(errp, QERR_INVALID_PARAMETER_VALUE,
+                  "decompress_threads",
+                  "is invalid, it should be in the range of 1 to 255");
+        return;
+    }
+
+    if (has_compress_level) {
+        s->parameters[MIGRATION_PARAMETER_COMPRESS_LEVEL] = compress_level;
+    }
+    if (has_compress_threads) {
+        s->parameters[MIGRATION_PARAMETER_COMPRESS_THREADS] = compress_threads;
+    }
+    if (has_decompress_threads) {
+        s->parameters[MIGRATION_PARAMETER_DECOMPRESS_THREADS] =
+                                                    decompress_threads;
+    }
+}
+
 /* shared migration helpers */

 static void migrate_set_state(MigrationState *s, int old_state, int new_state)
diff --git a/qapi-schema.json b/qapi-schema.json
index 9c03e17..9c92482 100644
--- a/qapi-schema.json
+++ b/qapi-schema.json
@@ -592,6 +592,51 @@
 { 'enum': 'MigrationParameter',
   'data': ['compress-level', 'compress-threads', 'decompress-threads'] }

+#
+# @migrate-set-parameters
+#
+# Set the following migration parameters
+#
+# @compress-level: compression level
+#
+# @compress-threads: compression thread count
+#
+# @decompress-threads: decompression thread count
+#
+# Since: 2.4
+##
+{ 'command': 'migrate-set-parameters',
+  'data': { '*compress-level': 'int',
+            '*compress-threads': 'int',
+            '*decompress-threads': 'int'} }
+
+#
+# @MigrationParameters
+#
+# @compress-level: compression level
+#
+# @compress-threads: compression thread count
+#
+# @decompress-threads: decompression thread count
+#
+# Since: 2.4
+##
+{ 'struct': 'MigrationParameters',
+  'data': { 'compress-level': 'int',
+            'compress-threads': 'int',
+            'decompress-threads': 'int'} }
+##
+# @query-migrate-parameters
+#
+# Returns information about the current migration parameters
+#
+# Returns: @MigrationParameters
+#
+# Since: 2.4
+##
+{ 'command': 'query-migrate-parameters',
+  'returns': 'MigrationParameters' }
+
 ##
 # @MouseInfo:
 #
diff --git a/qmp-commands.hx b/qmp-commands.hx
index d4a837c..7506774 100644
--- a/qmp-commands.hx
+++ b/qmp-commands.hx
@@ -3443,6 +3443,63 @@ EQMP
     },

 SQMP
+migrate-set-parameters
+----------------------
+
+Set migration parameters
+
+- "compress-level": set compression level during migration (json-int)
+- "compress-threads": set compression thread count for migration (json-int)
+- "decompress-threads": set decompression thread count for migration (json-int)
+
+Arguments:
+
+Example:
+
+-> { "execute": "migrate-set-parameters" , "arguments":
+      { "compress-level": 1 } }
+
+EQMP
+
+    {
+        .name       = "migrate-set-parameters",
+        .args_type  =
+            "compress-level:i?,compress-threads:i?,decompress-threads:i?",
+	.mhandler.cmd_new = qmp_marshal_input_migrate_set_parameters,
+    },
+SQMP
+query-migrate-parameters
+------------------------
+
+Query current migration parameters
+
+- "parameters": migration parameters value
+         - "compress-level" : compression level value (json-int)
+         - "compress-threads" : compression thread count value (json-int)
+         - "decompress-threads" : decompression thread count value (json-int)
+
+Arguments:
+
+Example:
+
+-> { "execute": "query-migrate-parameters" }
+<- {
+      "return": {
+         "decompress-threads", 2,
+         "compress-threads", 8,
+         "compress-level", 1
+      }
+   }
+
+EQMP
+
+    {
+        .name       = "query-migrate-parameters",
+        .args_type  = "",
+        .mhandler.cmd_new = qmp_marshal_input_query_migrate_parameters,
+    },
+
+SQMP
 query-balloon
 -------------

-- 
2.4.0

  parent reply	other threads:[~2015-05-07 16:46 UTC|newest]

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-05-07 16:46 [Qemu-devel] [PULL 00/16] Migration pull requset (take 3) Juan Quintela
2015-05-07 16:46 ` [Qemu-devel] [PULL 01/16] docs: Add a doc about multiple thread compression Juan Quintela
2015-05-07 16:46 ` [Qemu-devel] [PULL 02/16] migration: Add the framework of multi-thread compression Juan Quintela
2015-05-07 16:46 ` [Qemu-devel] [PULL 03/16] migration: Add the framework of multi-thread decompression Juan Quintela
2015-05-07 16:46 ` [Qemu-devel] [PULL 04/16] qemu-file: Add compression functions to QEMUFile Juan Quintela
2015-05-07 16:46 ` [Qemu-devel] [PULL 05/16] arch_init: Alloc and free data struct for compression Juan Quintela
2015-05-07 17:18   ` Paolo Bonzini
2015-05-08  8:23     ` Juan Quintela
2015-05-07 16:46 ` [Qemu-devel] [PULL 06/16] arch_init: Add and free data struct for decompression Juan Quintela
2015-05-07 16:46 ` [Qemu-devel] [PULL 07/16] migration: Split save_zero_page from ram_save_page Juan Quintela
2015-05-07 16:46 ` [Qemu-devel] [PULL 08/16] migration: Add the core code of multi-thread compression Juan Quintela
2015-05-07 16:46 ` [Qemu-devel] [PULL 09/16] migration: Make compression co-work with xbzrle Juan Quintela
2015-05-07 16:46 ` [Qemu-devel] [PULL 10/16] migration: Add the core code for decompression Juan Quintela
2015-05-07 16:46 ` [Qemu-devel] [PULL 11/16] migration: Add interface to control compression Juan Quintela
2015-05-07 16:46 ` [Qemu-devel] [PULL 12/16] migration: Use an array instead of 3 parameters Juan Quintela
2015-05-07 16:46 ` Juan Quintela [this message]
2015-05-07 16:46 ` [Qemu-devel] [PULL 14/16] migration: Add hmp interface to set and query parameters Juan Quintela
2015-05-07 16:46 ` [Qemu-devel] [PULL 15/16] migration: avoid divide by zero in xbzrle cache miss rate Juan Quintela
2015-05-07 16:46 ` [Qemu-devel] [PULL 16/16] migration: Fix migration state update issue Juan Quintela
2015-05-07 18:51 ` [Qemu-devel] [PULL 00/16] Migration pull requset (take 3) Peter Maydell
  -- strict thread matches above, loose matches on Subject: below --
2015-05-07 11:50 [Qemu-devel] [PULL 00/16] Migration pull request (v2) Juan Quintela
2015-05-07 11:50 ` [Qemu-devel] [PULL 13/16] migration: Add qmp commands to set and query parameters Juan Quintela

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1431017176-3301-14-git-send-email-quintela@redhat.com \
    --to=quintela@redhat.com \
    --cc=liang.z.li@intel.com \
    --cc=qemu-devel@nongnu.org \
    --cc=yang.z.zhang@intel.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).