From patchwork Tue Apr 16 02:44:42 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: mrhines@linux.vnet.ibm.com X-Patchwork-Id: 236830 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 48EF62C00F2 for ; Tue, 16 Apr 2013 13:03:01 +1000 (EST) Received: from localhost ([::1]:42411 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1URvvh-0006Gw-0J for incoming@patchwork.ozlabs.org; Mon, 15 Apr 2013 22:47:33 -0400 Received: from eggs.gnu.org ([208.118.235.92]:58134) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1URvtN-0003Mq-T1 for qemu-devel@nongnu.org; Mon, 15 Apr 2013 22:45:15 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1URvtK-0001Hj-7C for qemu-devel@nongnu.org; Mon, 15 Apr 2013 22:45:09 -0400 Received: from e7.ny.us.ibm.com ([32.97.182.137]:35165) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1URvtK-0001HT-3x for qemu-devel@nongnu.org; Mon, 15 Apr 2013 22:45:06 -0400 Received: from /spool/local by e7.ny.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Mon, 15 Apr 2013 22:45:05 -0400 Received: from d01dlp02.pok.ibm.com (9.56.250.167) by e7.ny.us.ibm.com (192.168.1.107) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Mon, 15 Apr 2013 22:45:04 -0400 Received: from d01relay06.pok.ibm.com (d01relay06.pok.ibm.com [9.56.227.116]) by d01dlp02.pok.ibm.com (Postfix) with ESMTP id 3CD096E803F for ; Mon, 15 Apr 2013 22:45:01 -0400 (EDT) Received: from d01av03.pok.ibm.com (d01av03.pok.ibm.com [9.56.224.217]) by d01relay06.pok.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id r3G2j3w123265416 for ; Mon, 15 Apr 2013 22:45:03 -0400 Received: from d01av03.pok.ibm.com (loopback [127.0.0.1]) by d01av03.pok.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id r3G2j3Zu014817 for ; Mon, 15 Apr 2013 23:45:03 -0300 Received: from mrhinesdev.klabtestbed.com (klinux.watson.ibm.com [9.2.208.21]) by d01av03.pok.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id r3G2j15K014657; Mon, 15 Apr 2013 23:45:03 -0300 From: mrhines@linux.vnet.ibm.com To: qemu-devel@nongnu.org Date: Mon, 15 Apr 2013 22:44:42 -0400 Message-Id: <1366080286-9288-5-git-send-email-mrhines@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1366080286-9288-1-git-send-email-mrhines@linux.vnet.ibm.com> References: <1366080286-9288-1-git-send-email-mrhines@linux.vnet.ibm.com> X-TM-AS-MML: No X-Content-Scanned: Fidelis XPS MAILER x-cbid: 13041602-5806-0000-0000-000020BE2F9F X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x-2.6.x [generic] X-Received-From: 32.97.182.137 Cc: aliguori@us.ibm.com, mst@redhat.com, owasserm@redhat.com, abali@us.ibm.com, mrhines@us.ibm.com, gokul@us.ibm.com, pbonzini@redhat.com Subject: [Qemu-devel] [PULL 4/8] rdma: introduce capability for chunk registration 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 From: "Michael R. Hines" This capability allows you to disable dynamic chunk registration for better throughput on high-performance links. It is enabled by default. Signed-off-by: Michael R. Hines --- include/migration/migration.h | 2 ++ migration.c | 11 ++++++++++- qapi-schema.json | 2 +- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/include/migration/migration.h b/include/migration/migration.h index 0f4510f..e71ac12 100644 --- a/include/migration/migration.h +++ b/include/migration/migration.h @@ -144,4 +144,6 @@ size_t ram_control_save_page(QEMUFile *f, ram_addr_t block_offset, ram_addr_t offset, size_t size); void ram_handle_compressed(void *host, uint8_t ch, uint64_t size); + +bool migrate_chunk_register_destination(void); #endif diff --git a/migration.c b/migration.c index 3b4b467..b46e103 100644 --- a/migration.c +++ b/migration.c @@ -66,6 +66,7 @@ MigrationState *migrate_get_current(void) .state = MIG_STATE_SETUP, .bandwidth_limit = MAX_THROTTLE, .xbzrle_cache_size = DEFAULT_MIGRATE_CACHE_SIZE, + .enabled_capabilities[MIGRATION_CAPABILITY_CHUNK_REGISTER_DESTINATION] = true, }; return ¤t_migration; @@ -120,7 +121,6 @@ void process_incoming_migration(QEMUFile *f) Coroutine *co = qemu_coroutine_create(process_incoming_migration_co); int fd = qemu_get_fd(f); - assert(fd != -1); qemu_set_nonblock(fd); qemu_coroutine_enter(co, f); } @@ -474,6 +474,15 @@ void qmp_migrate_set_downtime(double value, Error **errp) max_downtime = (uint64_t)value; } +bool migrate_chunk_register_destination(void) +{ + MigrationState *s; + + s = migrate_get_current(); + + return s->enabled_capabilities[MIGRATION_CAPABILITY_CHUNK_REGISTER_DESTINATION]; +} + int migrate_use_xbzrle(void) { MigrationState *s; diff --git a/qapi-schema.json b/qapi-schema.json index 751d3c2..691bae6 100644 --- a/qapi-schema.json +++ b/qapi-schema.json @@ -602,7 +602,7 @@ # Since: 1.2 ## { 'enum': 'MigrationCapability', - 'data': ['xbzrle'] } + 'data': ['xbzrle', 'chunk_register_destination'] } ## # @MigrationCapabilityStatus