From patchwork Mon Mar 18 03:19:02 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: 228353 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 736E02C00AC for ; Mon, 18 Mar 2013 14:21:51 +1100 (EST) Received: from localhost ([::1]:40341 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UHQdx-0000gq-IE for incoming@patchwork.ozlabs.org; Sun, 17 Mar 2013 23:21:49 -0400 Received: from eggs.gnu.org ([208.118.235.92]:44764) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UHQbu-0006C2-UP for qemu-devel@nongnu.org; Sun, 17 Mar 2013 23:19:46 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UHQbi-0004dt-QF for qemu-devel@nongnu.org; Sun, 17 Mar 2013 23:19:42 -0400 Received: from e7.ny.us.ibm.com ([32.97.182.137]:43090) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UHQbi-0004dM-MK for qemu-devel@nongnu.org; Sun, 17 Mar 2013 23:19:30 -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 ; Sun, 17 Mar 2013 23:19:30 -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; Sun, 17 Mar 2013 23:19:26 -0400 Received: from d01relay05.pok.ibm.com (d01relay05.pok.ibm.com [9.56.227.237]) by d01dlp02.pok.ibm.com (Postfix) with ESMTP id 705B96E801D for ; Sun, 17 Mar 2013 23:19:23 -0400 (EDT) Received: from d01av04.pok.ibm.com (d01av04.pok.ibm.com [9.56.224.64]) by d01relay05.pok.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id r2I3JPm0323360 for ; Sun, 17 Mar 2013 23:19:25 -0400 Received: from d01av04.pok.ibm.com (loopback [127.0.0.1]) by d01av04.pok.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id r2I3JP52009335 for ; Sun, 17 Mar 2013 23:19:25 -0400 Received: from mrhinesdev.klabtestbed.com (klinux.watson.ibm.com [9.2.208.21]) by d01av04.pok.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id r2I3JMH7009195; Sun, 17 Mar 2013 23:19:25 -0400 From: mrhines@linux.vnet.ibm.com To: qemu-devel@nongnu.org Date: Sun, 17 Mar 2013 23:19:02 -0400 Message-Id: <1363576743-6146-10-git-send-email-mrhines@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1363576743-6146-1-git-send-email-mrhines@linux.vnet.ibm.com> References: <1363576743-6146-1-git-send-email-mrhines@linux.vnet.ibm.com> X-TM-AS-MML: No X-Content-Scanned: Fidelis XPS MAILER x-cbid: 13031803-5806-0000-0000-000020601EA3 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] [RFC PATCH RDMA support v4: 09/10] check for QMP string and bypass nonblock() calls 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" Since we're not using TCP anymore, we skip these calls. Also print a little extra text while debugging, like "gbps" which is helpful to know how the link is being utilized. Signed-off-by: Michael R. Hines --- include/migration/migration.h | 3 +++ migration.c | 19 +++++++++++++------ 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/include/migration/migration.h b/include/migration/migration.h index bb617fd..88ab5f6 100644 --- a/include/migration/migration.h +++ b/include/migration/migration.h @@ -20,6 +20,7 @@ #include "qemu/notify.h" #include "qapi/error.h" #include "migration/vmstate.h" +#include "migration/rdma.h" #include "qapi-types.h" struct MigrationParams { @@ -102,6 +103,7 @@ uint64_t xbzrle_mig_bytes_transferred(void); uint64_t xbzrle_mig_pages_transferred(void); uint64_t xbzrle_mig_pages_overflow(void); uint64_t xbzrle_mig_pages_cache_miss(void); +uint64_t delta_norm_mig_bytes_transferred(void); /** * @migrate_add_blocker - prevent migration from proceeding @@ -122,6 +124,7 @@ int xbzrle_encode_buffer(uint8_t *old_buf, uint8_t *new_buf, int slen, int xbzrle_decode_buffer(uint8_t *src, int slen, uint8_t *dst, int dlen); int migrate_use_xbzrle(void); +void *migrate_use_rdma(QEMUFile *f); int64_t migrate_xbzrle_cache_size(void); int64_t xbzrle_cache_resize(int64_t new_size); diff --git a/migration.c b/migration.c index 185d112..634437a 100644 --- a/migration.c +++ b/migration.c @@ -15,6 +15,7 @@ #include "qemu-common.h" #include "migration/migration.h" +#include "migration/rdma.h" #include "monitor/monitor.h" #include "migration/qemu-file.h" #include "sysemu/sysemu.h" @@ -77,6 +78,8 @@ void qemu_start_incoming_migration(const char *uri, Error **errp) if (strstart(uri, "tcp:", &p)) tcp_start_incoming_migration(p, errp); + else if (strstart(uri, "rdma:", &p)) + rdma_start_incoming_migration(p, errp); #if !defined(WIN32) else if (strstart(uri, "exec:", &p)) exec_start_incoming_migration(p, errp); @@ -118,10 +121,11 @@ static void process_incoming_migration_co(void *opaque) void process_incoming_migration(QEMUFile *f) { Coroutine *co = qemu_coroutine_create(process_incoming_migration_co); - int fd = qemu_get_fd(f); - - assert(fd != -1); - socket_set_nonblock(fd); + if(!migrate_use_rdma(f)) { + int fd = qemu_get_fd(f); + assert(fd != -1); + socket_set_nonblock(fd); + } qemu_coroutine_enter(co, f); } @@ -404,6 +408,8 @@ void qmp_migrate(const char *uri, bool has_blk, bool blk, if (strstart(uri, "tcp:", &p)) { tcp_start_outgoing_migration(s, p, &local_err); + } else if (strstart(uri, "rdma:", &p)) { + rdma_start_outgoing_migration(s, p, &local_err); #if !defined(WIN32) } else if (strstart(uri, "exec:", &p)) { exec_start_outgoing_migration(s, p, &local_err); @@ -545,8 +551,9 @@ static void *migration_thread(void *opaque) max_size = bandwidth * migrate_max_downtime() / 1000000; DPRINTF("transferred %" PRIu64 " time_spent %" PRIu64 - " bandwidth %g max_size %" PRId64 "\n", - transferred_bytes, time_spent, bandwidth, max_size); + " bandwidth %g (%0.2f mbps) max_size %" PRId64 "\n", + transferred_bytes, time_spent, + bandwidth, Gbps(transferred_bytes, time_spent), max_size); /* if we haven't sent anything, we don't want to recalculate 10000 is a small enough number for our purposes */ if (s->dirty_bytes_rate && transferred_bytes > 10000) {