From patchwork Tue Jun 19 15:43:20 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Orit Wasserman X-Patchwork-Id: 165785 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id CCA61B7012 for ; Wed, 20 Jun 2012 01:45:41 +1000 (EST) Received: from localhost ([::1]:37702 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Sh0cd-0002FB-P5 for incoming@patchwork.ozlabs.org; Tue, 19 Jun 2012 11:45:39 -0400 Received: from eggs.gnu.org ([208.118.235.92]:52739) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Sh0cR-0002Ea-Sc for qemu-devel@nongnu.org; Tue, 19 Jun 2012 11:45:33 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Sh0cK-0005iO-Rk for qemu-devel@nongnu.org; Tue, 19 Jun 2012 11:45:27 -0400 Received: from mx1.redhat.com ([209.132.183.28]:51829) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Sh0cK-0005iE-Gw for qemu-devel@nongnu.org; Tue, 19 Jun 2012 11:45:20 -0400 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q5JFidI7015905 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Tue, 19 Jun 2012 11:44:40 -0400 Received: from dhcp-1-120.tlv.redhat.com (vpn-200-13.tlv.redhat.com [10.35.200.13]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id q5JFhCkc007577; Tue, 19 Jun 2012 11:44:32 -0400 From: Orit Wasserman To: qemu-devel@nongnu.org Date: Tue, 19 Jun 2012 18:43:20 +0300 Message-Id: <1340120601-24747-13-git-send-email-owasserm@redhat.com> In-Reply-To: <1340120601-24747-1-git-send-email-owasserm@redhat.com> References: <1340120601-24747-1-git-send-email-owasserm@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.132.183.28 Cc: peter.maydell@linaro.org, aliguori@us.ibm.com, quintela@redhat.com, Petter Svard , stefanha@gmail.com, mdroth@linux.vnet.ibm.com, Benoit Hudzia , blauwirbel@gmail.com, Orit Wasserman , chegu_vinod@hp.com, avi@redhat.com, Aidan Shribman , pbonzini@redhat.com, eblake@redhat.com Subject: [Qemu-devel] [PATCH v12 12/13] Add set_cachesize command X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Change XBZRLE cache size in bytes (the size should be a power of 2). If XBZRLE cache size is too small there will be many cache miss. Signed-off-by: Benoit Hudzia Signed-off-by: Petter Svard Signed-off-by: Aidan Shribman Signed-off-by: Orit Wasserman --- arch_init.c | 9 +++++++++ hmp-commands.hx | 18 ++++++++++++++++++ hmp.c | 13 +++++++++++++ hmp.h | 1 + migration.c | 23 ++++++++++++++++++++++- migration.h | 2 ++ qapi-schema.json | 16 ++++++++++++++++ qmp-commands.hx | 23 +++++++++++++++++++++++ 8 files changed, 104 insertions(+), 1 deletions(-) diff --git a/arch_init.c b/arch_init.c index 68010a6..08fe040 100644 --- a/arch_init.c +++ b/arch_init.c @@ -24,6 +24,7 @@ #include #include #include +#include #ifndef _WIN32 #include #include @@ -192,6 +193,14 @@ static struct { .cache = NULL, }; + +void xbzrle_cache_resize(int64_t new_size) +{ + if (XBZRLE.cache != NULL) { + cache_resize(XBZRLE.cache, new_size/TARGET_PAGE_SIZE); + } +} + static void save_block_hdr(QEMUFile *f, RAMBlock *block, ram_addr_t offset, int cont, int flag) { diff --git a/hmp-commands.hx b/hmp-commands.hx index b3051a8..2473741 100644 --- a/hmp-commands.hx +++ b/hmp-commands.hx @@ -829,6 +829,24 @@ STEXI @item migrate_cancel @findex migrate_cancel Cancel the current VM migration. + +ETEXI + + { + .name = "migrate_set_cachesize", + .args_type = "value:o", + .params = "value", + .help = "set cache size (in bytes) for XBZRLE migrations," + "the cache size will be round down to the nearest power of 2.\n" + "The cache size effects the number of cache misses." + "In case of a high cache miss ratio you need to increase the cache size", + .mhandler.cmd = hmp_migrate_set_cachesize, + }, + +STEXI +@item migrate_set_cachesize @var{value} +@findex migrate_set_cache +Set cache size to @var{value} (in bytes) for xbzrle migrations. ETEXI { diff --git a/hmp.c b/hmp.c index 67d4122..38f9067 100644 --- a/hmp.c +++ b/hmp.c @@ -753,6 +753,19 @@ void hmp_migrate_set_downtime(Monitor *mon, const QDict *qdict) qmp_migrate_set_downtime(value, NULL); } +void hmp_migrate_set_cachesize(Monitor *mon, const QDict *qdict) +{ + int64_t value = qdict_get_int(qdict, "value"); + Error *err = NULL; + + qmp_migrate_set_cachesize(value, &err); + if (err) { + monitor_printf(mon, "%s\n", error_get_pretty(err)); + error_free(err); + return; + } +} + void hmp_migrate_set_speed(Monitor *mon, const QDict *qdict) { int64_t value = qdict_get_int(qdict, "value"); diff --git a/hmp.h b/hmp.h index 09ba198..7c5117d 100644 --- a/hmp.h +++ b/hmp.h @@ -53,6 +53,7 @@ void hmp_migrate_cancel(Monitor *mon, const QDict *qdict); void hmp_migrate_set_downtime(Monitor *mon, const QDict *qdict); void hmp_migrate_set_speed(Monitor *mon, const QDict *qdict); void hmp_migrate_set_parameter(Monitor *mon, const QDict *qdict); +void hmp_migrate_set_cachesize(Monitor *mon, const QDict *qdict); void hmp_set_password(Monitor *mon, const QDict *qdict); void hmp_expire_password(Monitor *mon, const QDict *qdict); void hmp_eject(Monitor *mon, const QDict *qdict); diff --git a/migration.c b/migration.c index d9c0cf5..16d47c0 100644 --- a/migration.c +++ b/migration.c @@ -22,6 +22,7 @@ #include "qemu_socket.h" #include "block-migration.h" #include "qmp-commands.h" +#include //#define DEBUG_MIGRATION @@ -43,7 +44,7 @@ enum { #define MAX_THROTTLE (32 << 20) /* Migration speed throttling */ -/* Migration XBZRLE cache size */ +/* Migration XBZRLE default cache size */ #define DEFAULT_MIGRATE_CACHE_SIZE (64 * 1024 * 1024) static NotifierList migration_state_notifiers = @@ -498,6 +499,26 @@ void qmp_migrate_cancel(Error **errp) migrate_fd_cancel(migrate_get_current()); } +void qmp_migrate_set_cachesize(int64_t value, Error **errp) +{ + MigrationState *s = migrate_get_current(); + + /* Check for truncation */ + if (value != (size_t)value) { + error_set(errp, QERR_INVALID_PARAMETER_VALUE, "cache size", + "exceeding address space"); + return; + } + + /* no change */ + if (value == s->xbzrle_cache_size) { + return; + } + + s->xbzrle_cache_size = value; + xbzrle_cache_resize(value); +} + void qmp_migrate_set_speed(int64_t value, Error **errp) { MigrationState *s; diff --git a/migration.h b/migration.h index eb0b822..cc7b433 100644 --- a/migration.h +++ b/migration.h @@ -107,4 +107,6 @@ int xbzrle_decode_buffer(uint8_t *src, int slen, uint8_t *dst, int dlen); int migrate_use_xbzrle(void); int64_t migrate_xbzrle_cache_size(void); +void xbzrle_cache_resize(int64_t new_size); + #endif diff --git a/qapi-schema.json b/qapi-schema.json index 829be0f..ca12542 100644 --- a/qapi-schema.json +++ b/qapi-schema.json @@ -1379,6 +1379,22 @@ { 'command': 'migrate_set_speed', 'data': {'value': 'int'} } ## +# @migrate_set_cachesize +# +# Set XBZRLE cache size +# +# @value: cache size in bytes +# +# The size will be round down to the nearest power of 2. +# The cache size can be modified before and during ongoing migration +# +# Returns: nothing on success +# +# Since: 1.2 +## +{ 'command': 'migrate_set_cachesize', 'data': {'value': 'int'} } + +## # @ObjectPropertyInfo: # # @name: the name of the property diff --git a/qmp-commands.hx b/qmp-commands.hx index 2af4822..7a10d4f 100644 --- a/qmp-commands.hx +++ b/qmp-commands.hx @@ -520,6 +520,29 @@ Example: <- { "return": {} } EQMP +{ + .name = "migrate_set_cachesize", + .args_type = "value:o", + .mhandler.cmd_new = qmp_marshal_input_migrate_set_cachesize, + }, + +SQMP +migrate_set_cachesize +--------------------- + +Set cache size to be used by XBZRLE migration, the cache size will be round down +to the nearset power of 2 + +Arguments: + +- "value": cache size in bytes (json-int) + +Example: + +-> { "execute": "migrate_set_cachesize", "arguments": { "value": 512M } } +<- { "return": {} } + +EQMP { .name = "migrate_set_speed",