{"id":807519,"url":"http://patchwork.ozlabs.org/api/1.0/patches/807519/?format=json","project":{"id":14,"url":"http://patchwork.ozlabs.org/api/1.0/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":""},"msgid":"<1504081950-2528-32-git-send-email-peterx@redhat.com>","date":"2017-08-30T08:32:28","name":"[RFC,v2,31/33] migration: store listen task tag","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"7a26e6ae7f38c4b1c5477c15fe95077fde3b92b9","submitter":{"id":67717,"url":"http://patchwork.ozlabs.org/api/1.0/people/67717/?format=json","name":"Peter Xu","email":"peterx@redhat.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/1504081950-2528-32-git-send-email-peterx@redhat.com/mbox/","series":[{"id":552,"url":"http://patchwork.ozlabs.org/api/1.0/series/552/?format=json","date":"2017-08-30T08:31:59","name":"Migration: postcopy failure recovery","version":2,"mbox":"http://patchwork.ozlabs.org/series/552/mbox/"}],"check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/807519/checks/","tags":{},"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-mx02.extmail.prod.ext.phx2.redhat.com;\n\tdmarc=none (p=none dis=none) header.from=redhat.com","ext-mx02.extmail.prod.ext.phx2.redhat.com;\n\tspf=fail smtp.mailfrom=peterx@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 3xhzrQ0TScz9t2Q\n\tfor ;\n\tWed, 30 Aug 2017 18:56:22 +1000 (AEST)","from localhost ([::1]:49122 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1dmynL-0002Oe-Qi\n\tfor incoming@patchwork.ozlabs.org; Wed, 30 Aug 2017 04:56:19 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:35460)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1dmyTS-00019n-Ak\n\tfor qemu-devel@nongnu.org; Wed, 30 Aug 2017 04:35:47 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1dmyTR-0004eY-6f\n\tfor qemu-devel@nongnu.org; Wed, 30 Aug 2017 04:35:46 -0400","from mx1.redhat.com ([209.132.183.28]:45554)\n\tby eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from ) id 1dmyTQ-0004e4-TP\n\tfor qemu-devel@nongnu.org; Wed, 30 Aug 2017 04:35:45 -0400","from smtp.corp.redhat.com\n\t(int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15])\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 E0192806B4;\n\tWed, 30 Aug 2017 08:35:43 +0000 (UTC)","from pxdev.xzpeter.org.com (dhcp-14-103.nay.redhat.com\n\t[10.66.14.103])\n\tby smtp.corp.redhat.com (Postfix) with ESMTP id A6C7284792;\n\tWed, 30 Aug 2017 08:35:40 +0000 (UTC)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com E0192806B4","From":"Peter Xu ","To":"qemu-devel@nongnu.org","Date":"Wed, 30 Aug 2017 16:32:28 +0800","Message-Id":"<1504081950-2528-32-git-send-email-peterx@redhat.com>","In-Reply-To":"<1504081950-2528-1-git-send-email-peterx@redhat.com>","References":"<1504081950-2528-1-git-send-email-peterx@redhat.com>","X-Scanned-By":"MIMEDefang 2.79 on 10.5.11.15","X-Greylist":"Sender IP whitelisted, not delayed by milter-greylist-4.5.16\n\t(mx1.redhat.com [10.5.110.26]);\n\tWed, 30 Aug 2017 08:35:44 +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] [RFC v2 31/33] migration: store listen task tag","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":"Laurent Vivier ,\n\tAndrea Arcangeli , \n\tJuan Quintela ,\n\tAlexey Perevalov , peterx@redhat.com,\n\t\"Dr . David Alan Gilbert\" ","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t"},"content":"Store the task tag for migration types: tcp/unix/fd/exec in current\nMigrationIncomingState struct.\n\nFor defered migration, no need to store task tag since there is no task\nrunning in the main loop at all. For RDMA, let's mark it as todo.\n\nSigned-off-by: Peter Xu \n---\n migration/migration.c | 22 ++++++++++++++++++----\n migration/migration.h | 2 ++\n 2 files changed, 20 insertions(+), 4 deletions(-)","diff":"diff --git a/migration/migration.c b/migration/migration.c\nindex c9b7085..daf356b 100644\n--- a/migration/migration.c\n+++ b/migration/migration.c\n@@ -171,6 +171,7 @@ void migration_incoming_state_destroy(void)\n mis->from_src_file = NULL;\n }\n \n+ mis->listen_task_tag = 0;\n qemu_event_destroy(&mis->main_thread_load_event);\n }\n \n@@ -265,25 +266,31 @@ int migrate_send_rp_req_pages(MigrationIncomingState *mis, const char *rbname,\n void qemu_start_incoming_migration(const char *uri, Error **errp)\n {\n const char *p;\n+ guint task_tag = 0;\n+ MigrationIncomingState *mis = migration_incoming_get_current();\n \n qapi_event_send_migration(MIGRATION_STATUS_SETUP, &error_abort);\n if (!strcmp(uri, \"defer\")) {\n deferred_incoming_migration(errp);\n } else if (strstart(uri, \"tcp:\", &p)) {\n- tcp_start_incoming_migration(p, errp);\n+ task_tag = tcp_start_incoming_migration(p, errp);\n #ifdef CONFIG_RDMA\n } else if (strstart(uri, \"rdma:\", &p)) {\n+ /* TODO: store task tag for RDMA migrations */\n rdma_start_incoming_migration(p, errp);\n #endif\n } else if (strstart(uri, \"exec:\", &p)) {\n- exec_start_incoming_migration(p, errp);\n+ task_tag = exec_start_incoming_migration(p, errp);\n } else if (strstart(uri, \"unix:\", &p)) {\n- unix_start_incoming_migration(p, errp);\n+ task_tag = unix_start_incoming_migration(p, errp);\n } else if (strstart(uri, \"fd:\", &p)) {\n- fd_start_incoming_migration(p, errp);\n+ task_tag = fd_start_incoming_migration(p, errp);\n } else {\n error_setg(errp, \"unknown migration protocol: %s\", uri);\n+ return;\n }\n+\n+ mis->listen_task_tag = task_tag;\n }\n \n static void process_incoming_migration_bh(void *opaque)\n@@ -422,6 +429,13 @@ void migration_fd_process_incoming(QEMUFile *f)\n co = qemu_coroutine_create(process_incoming_migration_co, f);\n qemu_coroutine_enter(co);\n }\n+\n+ /*\n+ * When reach here, we should not need the listening port any\n+ * more. We'll detach the listening task soon, let's reset the\n+ * listen task tag.\n+ */\n+ mis->listen_task_tag = 0;\n }\n \n /*\ndiff --git a/migration/migration.h b/migration/migration.h\nindex d041369..1f4faef 100644\n--- a/migration/migration.h\n+++ b/migration/migration.h\n@@ -26,6 +26,8 @@\n /* State for the incoming migration */\n struct MigrationIncomingState {\n QEMUFile *from_src_file;\n+ /* Task tag for incoming listen port. Valid when >0. */\n+ guint listen_task_tag;\n \n /*\n * Free at the start of the main state load, set as the main thread finishes\n","prefixes":["RFC","v2","31/33"]}