{"id":810554,"url":"http://patchwork.ozlabs.org/api/patches/810554/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170906115143.27451-19-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-19-quintela@redhat.com>","list_archive_url":null,"date":"2017-09-06T11:51:39","name":"[v7,18/22] migration: Create thread infrastructure for multifd recv side","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"1d25eb9372db6722a52cc3d341ae5ff831e46c0b","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-19-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/810554/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/810554/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-mx04.extmail.prod.ext.phx2.redhat.com;\n\tdmarc=none (p=none dis=none) header.from=redhat.com","ext-mx04.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 3xnMm93P1lz9sBZ\n\tfor ;\n\tWed, 6 Sep 2017 22:07:53 +1000 (AEST)","from localhost ([::1]:35708 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1dpZ7X-0002zA-Ib\n\tfor incoming@patchwork.ozlabs.org; Wed, 06 Sep 2017 08:07:51 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:60541)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1dpYsq-0007pb-Ph\n\tfor qemu-devel@nongnu.org; Wed, 06 Sep 2017 07:52:42 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1dpYsl-0008DJ-Kc\n\tfor qemu-devel@nongnu.org; Wed, 06 Sep 2017 07:52:40 -0400","from mx1.redhat.com ([209.132.183.28]:38568)\n\tby eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from ) id 1dpYsl-0008Cy-BV\n\tfor qemu-devel@nongnu.org; Wed, 06 Sep 2017 07:52:35 -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 5AC7B8553D\n\tfor ; Wed, 6 Sep 2017 11:52:34 +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 372095C316;\n\tWed, 6 Sep 2017 11:52:30 +0000 (UTC)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com 5AC7B8553D","From":"Juan Quintela ","To":"qemu-devel@nongnu.org","Date":"Wed, 6 Sep 2017 13:51:39 +0200","Message-Id":"<20170906115143.27451-19-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.28]);\n\tWed, 06 Sep 2017 11:52:34 +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 18/22] migration: Create thread\n\tinfrastructure for multifd recv side","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 make the locking and the transfer of information specific, even if we\nare still receiving things through the main thread.\n\nSigned-off-by: Juan Quintela \n\n--\n\nWe split when we create the main channel and where we start the main\nmigration thread, so we wait for the creation of the other threads.\n\nUse multifd_clear_group().\n---\n migration/migration.c | 7 ++++---\n migration/migration.h | 1 +\n migration/ram.c | 55 +++++++++++++++++++++++++++++++++++++++++++++++----\n migration/socket.c | 2 +-\n 4 files changed, 57 insertions(+), 8 deletions(-)","diff":"diff --git a/migration/migration.c b/migration/migration.c\nindex b5875c0b15..157e8fd1d0 100644\n--- a/migration/migration.c\n+++ b/migration/migration.c\n@@ -388,7 +388,7 @@ static void migration_incoming_setup(QEMUFile *f)\n qemu_file_set_blocking(f, false);\n }\n \n-static void migration_incoming_process(void)\n+void migration_incoming_process(void)\n {\n Coroutine *co = qemu_coroutine_create(process_incoming_migration_co, NULL);\n qemu_coroutine_enter(co);\n@@ -407,9 +407,10 @@ void migration_ioc_process_incoming(QIOChannel *ioc)\n if (!mis->from_src_file) {\n QEMUFile *f = qemu_fopen_channel_input(ioc);\n mis->from_src_file = f;\n- migration_fd_process_incoming(f);\n+ migration_incoming_setup(f);\n+ return;\n }\n- /* We still only have a single channel. Nothing to do here yet */\n+ multifd_new_channel(ioc);\n }\n \n /**\ndiff --git a/migration/migration.h b/migration/migration.h\nindex cb634fc31f..a1b50e53ef 100644\n--- a/migration/migration.h\n+++ b/migration/migration.h\n@@ -158,6 +158,7 @@ void migrate_set_state(int *state, int old_state, int new_state);\n \n void migration_fd_process_incoming(QEMUFile *f);\n void migration_ioc_process_incoming(QIOChannel *ioc);\n+void migration_incoming_process(void);\n \n bool migration_has_all_channels(void);\n \ndiff --git a/migration/ram.c b/migration/ram.c\nindex 7eba87b84c..b897d490f2 100644\n--- a/migration/ram.c\n+++ b/migration/ram.c\n@@ -591,13 +591,18 @@ static uint16_t multifd_send_page(uint8_t *address, bool last_page)\n }\n \n struct MultiFDRecvParams {\n+ /* not changed */\n uint8_t id;\n char *name;\n QemuThread thread;\n QIOChannel *c;\n+ QemuSemaphore ready;\n QemuSemaphore sem;\n QemuMutex mutex;\n+ /* proteced by param mutex */\n bool quit;\n+ multifd_pages_t pages;\n+ bool done;\n };\n typedef struct MultiFDRecvParams MultiFDRecvParams;\n \n@@ -607,6 +612,7 @@ struct {\n int count;\n /* Should we finish */\n bool quit;\n+ multifd_pages_t pages;\n } *multifd_recv_state;\n \n static void terminate_multifd_recv_threads(Error *errp)\n@@ -628,6 +634,7 @@ static void terminate_multifd_recv_threads(Error *errp)\n p->quit = true;\n qemu_sem_post(&p->sem);\n qemu_mutex_unlock(&p->mutex);\n+ multifd_clear_group(&p->pages);\n }\n }\n \n@@ -652,6 +659,7 @@ int multifd_load_cleanup(Error **errp)\n }\n g_free(multifd_recv_state->params);\n multifd_recv_state->params = NULL;\n+ multifd_clear_group(&multifd_recv_state->pages);\n g_free(multifd_recv_state);\n multifd_recv_state = NULL;\n \n@@ -662,12 +670,20 @@ static void *multifd_recv_thread(void *opaque)\n {\n MultiFDRecvParams *p = opaque;\n \n+ qemu_sem_post(&p->ready);\n while (true) {\n qemu_mutex_lock(&p->mutex);\n if (p->quit) {\n qemu_mutex_unlock(&p->mutex);\n break;\n }\n+ if (p->pages.num) {\n+ p->pages.num = 0;\n+ p->done = true;\n+ qemu_mutex_unlock(&p->mutex);\n+ qemu_sem_post(&p->ready);\n+ continue;\n+ }\n qemu_mutex_unlock(&p->mutex);\n qemu_sem_wait(&p->sem);\n }\n@@ -713,8 +729,11 @@ void multifd_new_channel(QIOChannel *ioc)\n }\n qemu_mutex_init(&p->mutex);\n qemu_sem_init(&p->sem, 0);\n+ qemu_sem_init(&p->ready, 0);\n p->quit = false;\n p->id = id;\n+ p->done = false;\n+ multifd_init_group(&p->pages);\n p->c = ioc;\n multifd_recv_state->count++;\n p->name = g_strdup_printf(\"multifdrecv_%d\", id);\n@@ -734,6 +753,7 @@ int multifd_load_setup(void)\n multifd_recv_state->params = g_new0(MultiFDRecvParams, thread_count);\n multifd_recv_state->count = 0;\n multifd_recv_state->quit = false;\n+ multifd_init_group(&multifd_recv_state->pages);\n return 0;\n }\n \n@@ -742,6 +762,36 @@ int multifd_created_threads(void)\n return multifd_recv_state->count;\n }\n \n+static void multifd_recv_page(uint8_t *address, uint16_t fd_num)\n+{\n+ int thread_count;\n+ MultiFDRecvParams *p;\n+ multifd_pages_t *pages = &multifd_recv_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 (fd_num == MULTIFD_CONTINUE) {\n+ return;\n+ }\n+\n+ thread_count = migrate_multifd_threads();\n+ assert(fd_num < thread_count);\n+ p = &multifd_recv_state->params[fd_num];\n+\n+ qemu_sem_wait(&p->ready);\n+\n+ qemu_mutex_lock(&p->mutex);\n+ p->done = false;\n+ iov_copy(p->pages.iov, pages->num, pages->iov, pages->num, 0,\n+ iov_size(pages->iov, pages->num));\n+ p->pages.num = pages->num;\n+ pages->num = 0;\n+ qemu_mutex_unlock(&p->mutex);\n+ qemu_sem_post(&p->sem);\n+}\n+\n /**\n * save_page_header: write page header to wire\n *\n@@ -3053,10 +3103,7 @@ static int ram_load(QEMUFile *f, void *opaque, int version_id)\n \n case RAM_SAVE_FLAG_MULTIFD_PAGE:\n fd_num = qemu_get_be16(f);\n- if (fd_num != 0) {\n- /* this is yet an unused variable, changed later */\n- fd_num = fd_num;\n- }\n+ multifd_recv_page(host, fd_num);\n qemu_get_buffer(f, host, TARGET_PAGE_SIZE);\n break;\n \ndiff --git a/migration/socket.c b/migration/socket.c\nindex 58e81ae87b..530962a286 100644\n--- a/migration/socket.c\n+++ b/migration/socket.c\n@@ -179,12 +179,12 @@ static gboolean socket_accept_incoming_migration(QIOChannel *ioc,\n \n qio_channel_set_name(QIO_CHANNEL(sioc), \"migration-socket-incoming\");\n migration_channel_process_incoming(QIO_CHANNEL(sioc));\n- object_unref(OBJECT(sioc));\n \n out:\n if (migration_has_all_channels()) {\n /* Close listening socket as its no longer needed */\n qio_channel_close(ioc, NULL);\n+ migration_incoming_process();\n return G_SOURCE_REMOVE;\n } else {\n return G_SOURCE_CONTINUE;\n","prefixes":["v7","18/22"]}