From patchwork Wed Apr 11 18:49:12 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Orit Wasserman X-Patchwork-Id: 151860 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 3D516B7055 for ; Thu, 12 Apr 2012 05:27:05 +1000 (EST) Received: from localhost ([::1]:57902 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SI2d8-00084p-By for incoming@patchwork.ozlabs.org; Wed, 11 Apr 2012 14:50:58 -0400 Received: from eggs.gnu.org ([208.118.235.92]:48189) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SI2cU-0006Qa-89 for qemu-devel@nongnu.org; Wed, 11 Apr 2012 14:50:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SI2cN-0005Dm-GV for qemu-devel@nongnu.org; Wed, 11 Apr 2012 14:50:17 -0400 Received: from mx1.redhat.com ([209.132.183.28]:45356) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SI2cN-0005De-8d for qemu-devel@nongnu.org; Wed, 11 Apr 2012 14:50:11 -0400 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q3BIo6gr023203 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Wed, 11 Apr 2012 14:50:07 -0400 Received: from dhcp-1-120.tlv.redhat.com (reserved-201-244.tlv.redhat.com [10.35.201.244] (may be forged)) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id q3BInUsN008086; Wed, 11 Apr 2012 14:50:01 -0400 From: Orit Wasserman To: qemu-devel@nongnu.org Date: Wed, 11 Apr 2012 21:49:12 +0300 Message-Id: <1334170153-9503-10-git-send-email-owasserm@redhat.com> In-Reply-To: <1334170153-9503-1-git-send-email-owasserm@redhat.com> References: <1334170153-9503-1-git-send-email-owasserm@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.24 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.132.183.28 Cc: aliguori@us.ibm.com, quintela@redhat.com, Petter Svard , stefanha@gmail.com, blauwirbel@gmail.com, Orit Wasserman , Benoit Hudzia , avi@redhat.com, Aidan Shribman Subject: [Qemu-devel] [PATCH v9 09/10] 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: Orit Wasserman Signed-off-by: Benoit Hudzia Signed-off-by: Petter Svard Signed-off-by: Aidan Shribman --- arch_init.c | 5 +++++ hmp-commands.hx | 15 +++++++++++++++ hmp.c | 13 +++++++++++++ hmp.h | 1 + migration.c | 31 ++++++++++++++++++++++++++++++- migration.h | 2 ++ qapi-schema.json | 13 +++++++++++++ qmp-commands.hx | 22 ++++++++++++++++++++++ 8 files changed, 101 insertions(+), 1 deletions(-) diff --git a/arch_init.c b/arch_init.c index 793f0be..af9fcc3 100644 --- a/arch_init.c +++ b/arch_init.c @@ -175,6 +175,11 @@ typedef struct __attribute__((packed)) XBZRLEHeader { static uint8 *prev_cache_page; +void xbzrle_cache_resize(int64_t new_size) +{ + cache_resize(new_size); +} + /***********************************************************/ /* XBRLE page cache implementation */ static CacheItem *cache_item_get(unsigned long pos, int item) diff --git a/hmp-commands.hx b/hmp-commands.hx index a73b538..6ef2b6b 100644 --- a/hmp-commands.hx +++ b/hmp-commands.hx @@ -833,6 +833,21 @@ 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 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 d681bfc..b569887 100644 --- a/hmp.c +++ b/hmp.c @@ -740,6 +740,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 868bfb3..4cce377 100644 --- a/hmp.h +++ b/hmp.h @@ -52,6 +52,7 @@ void hmp_snapshot_blkdev(Monitor *mon, const QDict *qdict); 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_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 7578163..071a1b9 100644 --- a/migration.c +++ b/migration.c @@ -167,7 +167,7 @@ MigrationCapList *qmp_query_migration_caps(Error **errp) MigrationCapList *caps_list = g_malloc0(sizeof(*caps_list)); caps_list->value = g_malloc(sizeof(*caps_list->value)); - caps_list->value->name = g_strdup("uleb"); + caps_list->value->name = g_strdup("xbzrle"); caps_list->next = NULL; return caps_list; @@ -465,6 +465,35 @@ void qmp_migrate_cancel(Error **errp) migrate_fd_cancel(migrate_get_current()); } +void qmp_migrate_set_cachesize(int64_t value, Error **errp) +{ + MigrationState *s; + + /* Check for truncation */ + if (value != (size_t)value) { + error_set(errp, QERR_INVALID_PARAMETER_VALUE, "cache size", + "exceeding address space"); + return; + } + + /* power of 2 */ + if (value != 1 && (value & (value - 1))) { + error_set(errp, QERR_INVALID_PARAMETER_VALUE, "cache size", + "needs to be power of 2"); + return; + } + + value = MIN(UINT64_MAX, value); + if (value == migrate_cache_size) { + return; + } + + migrate_cache_size = value; + s = migrate_get_current(); + s->params.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 06ce8ab..3426c94 100644 --- a/migration.h +++ b/migration.h @@ -109,4 +109,6 @@ int decode_page(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 775fe56..956caed 100644 --- a/qapi-schema.json +++ b/qapi-schema.json @@ -1310,6 +1310,19 @@ { 'command': 'migrate_set_speed', 'data': {'value': 'int'} } ## +# @migrate_set_cachesize +# +# Set XBZRLE cache size +# +# @value: cache size in bytes +# +# Returns: nothing on success +# +# Since: 1.1 +## +{ '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 b994951..3f2c9e2 100644 --- a/qmp-commands.hx +++ b/qmp-commands.hx @@ -522,6 +522,28 @@ 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 + +Arguments: + +- "value": cache size in bytes (json-int) + +Example: + +-> { "execute": "migrate_set_cachesize", "arguments": { "value": 512 } } +<- { "return": {} } + +EQMP { .name = "migrate_set_speed",