From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:60415) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UU1eZ-0007d6-Eg for qemu-devel@nongnu.org; Sun, 21 Apr 2013 17:18:39 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UU1eS-0008Bb-8O for qemu-devel@nongnu.org; Sun, 21 Apr 2013 17:18:31 -0400 Received: from e8.ny.us.ibm.com ([32.97.182.138]:55001) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UU1eS-0008Av-2x for qemu-devel@nongnu.org; Sun, 21 Apr 2013 17:18:24 -0400 Received: from /spool/local by e8.ny.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Sun, 21 Apr 2013 17:18:22 -0400 Received: from d01relay07.pok.ibm.com (d01relay07.pok.ibm.com [9.56.227.147]) by d01dlp01.pok.ibm.com (Postfix) with ESMTP id 5204F38C8042 for ; Sun, 21 Apr 2013 17:18:20 -0400 (EDT) Received: from d01av03.pok.ibm.com (d01av03.pok.ibm.com [9.56.224.217]) by d01relay07.pok.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id r3LLIKTc57933862 for ; Sun, 21 Apr 2013 17:18:20 -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 r3LLIKbK023932 for ; Sun, 21 Apr 2013 18:18:20 -0300 From: mrhines@linux.vnet.ibm.com Date: Sun, 21 Apr 2013 17:17:53 -0400 Message-Id: <1366579081-6857-5-git-send-email-mrhines@linux.vnet.ibm.com> In-Reply-To: <1366579081-6857-1-git-send-email-mrhines@linux.vnet.ibm.com> References: <1366579081-6857-1-git-send-email-mrhines@linux.vnet.ibm.com> Subject: [Qemu-devel] [PATCH v5 04/12] rdma: introduce qemu_get_max_size() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: aliguori@us.ibm.com, quintela@redhat.com, owasserm@redhat.com, abali@us.ibm.com, mrhines@us.ibm.com, gokul@us.ibm.com, pbonzini@redhat.com From: "Michael R. Hines" This functions allows you to perform your own per-QEMUFileOps calculation for the value of 'max_size'. For RDMA, this calculation artificially limits migration throughput and needs to be done differently for high-throughput links. Signed-off-by: Michael R. Hines --- include/migration/qemu-file.h | 12 ++++++++++++ migration.c | 3 ++- savevm.c | 19 +++++++++++++++++++ 3 files changed, 33 insertions(+), 1 deletion(-) diff --git a/include/migration/qemu-file.h b/include/migration/qemu-file.h index 70eb9bd..1803aeb 100644 --- a/include/migration/qemu-file.h +++ b/include/migration/qemu-file.h @@ -57,12 +57,22 @@ typedef int (QEMUFileGetFD)(void *opaque); typedef ssize_t (QEMUFileWritevBufferFunc)(void *opaque, struct iovec *iov, int iovcnt, int64_t pos); +/* + * This function allows override of how to calculate max_size + * after each iteration. + */ +typedef size_t (QEMUFileMaxSizeFunc)(QEMUFile *f, void *opaque, + uint64_t transferred_bytes, + uint64_t time_spent, + uint64_t max_downtime); + typedef struct QEMUFileOps { QEMUFilePutBufferFunc *put_buffer; QEMUFileGetBufferFunc *get_buffer; QEMUFileCloseFunc *close; QEMUFileGetFD *get_fd; QEMUFileWritevBufferFunc *writev_buffer; + QEMUFileMaxSizeFunc *get_max_size; } QEMUFileOps; QEMUFile *qemu_fopen_ops(void *opaque, const QEMUFileOps *ops); @@ -81,6 +91,8 @@ void qemu_put_byte(QEMUFile *f, int v); */ void qemu_put_buffer_async(QEMUFile *f, const uint8_t *buf, int size); double qemu_get_mbps(void); +size_t qemu_get_max_size(QEMUFile *f, uint64_t transferred_bytes, + uint64_t time_spent, uint64_t max_downtime); static inline void qemu_put_ubyte(QEMUFile *f, unsigned int v) diff --git a/migration.c b/migration.c index e2d73c4..48b5174 100644 --- a/migration.c +++ b/migration.c @@ -545,7 +545,8 @@ static void *migration_thread(void *opaque) uint64_t transferred_bytes = qemu_ftell(s->file) - initial_bytes; uint64_t time_spent = current_time - initial_time - sleep_time; double bandwidth = transferred_bytes / time_spent; - max_size = bandwidth * migrate_max_downtime() / 1000000; + max_size = qemu_get_max_size(s->file, transferred_bytes, + time_spent, migrate_max_downtime()); DPRINTF("transferred %" PRIu64 " time_spent %" PRIu64 " bandwidth %g max_size %" PRId64 "\n", diff --git a/savevm.c b/savevm.c index 6fcad19..60776e5 100644 --- a/savevm.c +++ b/savevm.c @@ -647,6 +647,25 @@ int qemu_get_fd(QEMUFile *f) return -1; } +size_t qemu_get_max_size(QEMUFile *f, uint64_t transferred_bytes, + uint64_t time_spent, uint64_t max_downtime) +{ + if (time_spent) { + mbps = (((double) transferred_bytes * 8.0) / + ((double) time_spent / 1000.0)) / 1000.0 / 1000.0; + } else { + mbps = -1.0; + } + + if (f->ops->get_max_size) { + return f->ops->get_max_size(f, f->opaque, + transferred_bytes, time_spent, max_downtime); + } + + return ((double) (transferred_bytes / time_spent)) * + max_downtime / 1000000; +} + /** Closes the file * * Returns negative error value if any error happened on previous operations or -- 1.7.10.4