{"id":810548,"url":"http://patchwork.ozlabs.org/api/patches/810548/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170906115143.27451-17-quintela@redhat.com/","project":{"id":14,"url":"http://patchwork.ozlabs.org/api/projects/14/?format=json","name":"QEMU Development","link_name":"qemu-devel","list_id":"qemu-devel.nongnu.org","list_email":"qemu-devel@nongnu.org","web_url":"","scm_url":"","webscm_url":"","list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<20170906115143.27451-17-quintela@redhat.com>","list_archive_url":null,"date":"2017-09-06T11:51:37","name":"[v7,16/22] migration: Really use multiple pages at a time","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"3b418d4d72dbe7ef7b849303399110120953a801","submitter":{"id":2643,"url":"http://patchwork.ozlabs.org/api/people/2643/?format=json","name":"Juan Quintela","email":"quintela@redhat.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170906115143.27451-17-quintela@redhat.com/mbox/","series":[{"id":1773,"url":"http://patchwork.ozlabs.org/api/series/1773/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/list/?series=1773","date":"2017-09-06T11:51:21","name":"Multifd","version":7,"mbox":"http://patchwork.ozlabs.org/series/1773/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/810548/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/810548/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@bilbo.ozlabs.org","Authentication-Results":["ozlabs.org;\n\tspf=pass (mailfrom) smtp.mailfrom=nongnu.org\n\t(client-ip=2001:4830:134:3::11; helo=lists.gnu.org;\n\tenvelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n\treceiver=)","ext-mx08.extmail.prod.ext.phx2.redhat.com;\n\tdmarc=none (p=none dis=none) header.from=redhat.com","ext-mx08.extmail.prod.ext.phx2.redhat.com;\n\tspf=fail smtp.mailfrom=quintela@redhat.com"],"Received":["from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11])\n\t(using TLSv1 with cipher AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 3xnMhG6hZ3z9sBZ\n\tfor ;\n\tWed, 6 Sep 2017 22:04:30 +1000 (AEST)","from localhost ([::1]:35654 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1dpZ4H-0000Wu-09\n\tfor incoming@patchwork.ozlabs.org; Wed, 06 Sep 2017 08:04:29 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:60422)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1dpYsi-0007go-2D\n\tfor qemu-devel@nongnu.org; Wed, 06 Sep 2017 07:52:33 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1dpYsf-0008Ac-6G\n\tfor qemu-devel@nongnu.org; Wed, 06 Sep 2017 07:52:32 -0400","from mx1.redhat.com ([209.132.183.28]:51252)\n\tby eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from ) id 1dpYse-0008A1-UV\n\tfor qemu-devel@nongnu.org; Wed, 06 Sep 2017 07:52:29 -0400","from smtp.corp.redhat.com\n\t(int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11])\n\t(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby mx1.redhat.com (Postfix) with ESMTPS id E61DCC0587C6\n\tfor ; Wed, 6 Sep 2017 11:52:27 +0000 (UTC)","from secure.mitica (ovpn-117-188.ams2.redhat.com [10.36.117.188])\n\tby smtp.corp.redhat.com (Postfix) with ESMTP id 6A76919EE6;\n\tWed, 6 Sep 2017 11:52:26 +0000 (UTC)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com E61DCC0587C6","From":"Juan Quintela ","To":"qemu-devel@nongnu.org","Date":"Wed, 6 Sep 2017 13:51:37 +0200","Message-Id":"<20170906115143.27451-17-quintela@redhat.com>","In-Reply-To":"<20170906115143.27451-1-quintela@redhat.com>","References":"<20170906115143.27451-1-quintela@redhat.com>","X-Scanned-By":"MIMEDefang 2.79 on 10.5.11.11","X-Greylist":"Sender IP whitelisted, not delayed by milter-greylist-4.5.16\n\t(mx1.redhat.com [10.5.110.32]);\n\tWed, 06 Sep 2017 11:52:28 +0000 (UTC)","X-detected-operating-system":"by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]\n\t[fuzzy]","X-Received-From":"209.132.183.28","Subject":"[Qemu-devel] [PATCH v7 16/22] migration: Really use multiple pages\n\tat a time","X-BeenThere":"qemu-devel@nongnu.org","X-Mailman-Version":"2.1.21","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Cc":"lvivier@redhat.com, dgilbert@redhat.com, peterx@redhat.com","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t"},"content":"We now send several pages at a time each time that we wakeup a thread.\n\nSigned-off-by: Juan Quintela \n\n--\n\nUse iovec's instead of creating the equivalent.\nClear memory used by pages (dave)\nUse g_new0(danp)\ndefine MULTIFD_CONTINUE\n---\n migration/ram.c | 57 ++++++++++++++++++++++++++++++++++++++++++++++++---------\n 1 file changed, 48 insertions(+), 9 deletions(-)","diff":"diff --git a/migration/ram.c b/migration/ram.c\nindex 2ee2699bb2..4329039f8c 100644\n--- a/migration/ram.c\n+++ b/migration/ram.c\n@@ -49,6 +49,7 @@\n #include \"migration/colo.h\"\n #include \"sysemu/sysemu.h\"\n #include \"qemu/uuid.h\"\n+#include \"qemu/iov.h\"\n \n /***********************************************************/\n /* ram save/restore */\n@@ -362,6 +363,15 @@ static void compress_threads_save_setup(void)\n \n /* Multiple fd's */\n \n+/* used to continue on the same multifd group */\n+#define MULTIFD_CONTINUE UINT16_MAX\n+\n+typedef struct {\n+ int num;\n+ size_t size;\n+ struct iovec *iov;\n+} multifd_pages_t;\n+\n struct MultiFDSendParams {\n /* not changed */\n uint8_t id;\n@@ -372,11 +382,7 @@ struct MultiFDSendParams {\n QemuMutex mutex;\n /* protected by param mutex */\n bool quit;\n- /* This is a temp field. We are using it now to transmit\n- something the address of the page. Later in the series, we\n- change it for the real page.\n- */\n- uint8_t *address;\n+ multifd_pages_t pages;\n /* protected by multifd mutex */\n /* has the thread finish the last submitted job */\n bool done;\n@@ -389,8 +395,24 @@ struct {\n int count;\n QemuMutex mutex;\n QemuSemaphore sem;\n+ multifd_pages_t pages;\n } *multifd_send_state;\n \n+static void multifd_init_group(multifd_pages_t *pages)\n+{\n+ pages->num = 0;\n+ pages->size = migrate_multifd_group();\n+ pages->iov = g_new0(struct iovec, pages->size);\n+}\n+\n+static void multifd_clear_group(multifd_pages_t *pages)\n+{\n+ pages->num = 0;\n+ pages->size = 0;\n+ g_free(pages->iov);\n+ pages->iov = NULL;\n+}\n+\n static void terminate_multifd_send_threads(Error *errp)\n {\n int i;\n@@ -429,9 +451,11 @@ int multifd_save_cleanup(Error **errp)\n socket_send_channel_destroy(p->c);\n g_free(p->name);\n p->name = NULL;\n+ multifd_clear_group(&p->pages);\n }\n g_free(multifd_send_state->params);\n multifd_send_state->params = NULL;\n+ multifd_clear_group(&multifd_send_state->pages);\n g_free(multifd_send_state);\n multifd_send_state = NULL;\n return ret;\n@@ -471,8 +495,8 @@ static void *multifd_send_thread(void *opaque)\n qemu_mutex_unlock(&p->mutex);\n break;\n }\n- if (p->address) {\n- p->address = 0;\n+ if (p->pages.num) {\n+ p->pages.num = 0;\n qemu_mutex_unlock(&p->mutex);\n qemu_mutex_lock(&multifd_send_state->mutex);\n p->done = true;\n@@ -502,6 +526,7 @@ int multifd_save_setup(void)\n multifd_send_state->count = 0;\n qemu_mutex_init(&multifd_send_state->mutex);\n qemu_sem_init(&multifd_send_state->sem, 0);\n+ multifd_init_group(&multifd_send_state->pages);\n for (i = 0; i < thread_count; i++) {\n MultiFDSendParams *p = &multifd_send_state->params[i];\n \n@@ -510,7 +535,7 @@ int multifd_save_setup(void)\n p->quit = false;\n p->id = i;\n p->done = true;\n- p->address = 0;\n+ multifd_init_group(&p->pages);\n p->c = socket_send_channel_create(&local_err);\n if (!p->c) {\n if (multifd_save_cleanup(&local_err) != 0) {\n@@ -531,6 +556,17 @@ static uint16_t multifd_send_page(uint8_t *address, bool last_page)\n {\n int i;\n MultiFDSendParams *p = NULL; /* make happy gcc */\n+ multifd_pages_t *pages = &multifd_send_state->pages;\n+\n+ pages->iov[pages->num].iov_base = address;\n+ pages->iov[pages->num].iov_len = TARGET_PAGE_SIZE;\n+ pages->num++;\n+\n+ if (!last_page) {\n+ if (pages->num < (pages->size - 1)) {\n+ return MULTIFD_CONTINUE;\n+ }\n+ }\n \n qemu_sem_wait(&multifd_send_state->sem);\n qemu_mutex_lock(&multifd_send_state->mutex);\n@@ -544,7 +580,10 @@ static uint16_t multifd_send_page(uint8_t *address, bool last_page)\n }\n qemu_mutex_unlock(&multifd_send_state->mutex);\n qemu_mutex_lock(&p->mutex);\n- p->address = address;\n+ p->pages.num = pages->num;\n+ iov_copy(p->pages.iov, pages->num, pages->iov, pages->num, 0,\n+ iov_size(pages->iov, pages->num));\n+ pages->num = 0;\n qemu_mutex_unlock(&p->mutex);\n qemu_sem_post(&p->sem);\n \n","prefixes":["v7","16/22"]}