{"id":807514,"url":"http://patchwork.ozlabs.org/api/1.0/patches/807514/?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-27-git-send-email-peterx@redhat.com>","date":"2017-08-30T08:32:23","name":"[RFC,v2,26/33] migration: final handshake for the resume","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"68c9b27af955e8ca533912c17e687bc7ad3cdb92","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-27-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/807514/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-mx07.extmail.prod.ext.phx2.redhat.com;\n\tdmarc=none (p=none dis=none) header.from=redhat.com","ext-mx07.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 3xhzmc4XKzz9t2Q\n\tfor ;\n\tWed, 30 Aug 2017 18:53:04 +1000 (AEST)","from localhost ([::1]:49101 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1dmykA-0007Mr-BN\n\tfor incoming@patchwork.ozlabs.org; Wed, 30 Aug 2017 04:53:02 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:35242)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1dmySy-0000XS-Vo\n\tfor qemu-devel@nongnu.org; Wed, 30 Aug 2017 04:35:22 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1dmySy-0004Gl-5t\n\tfor qemu-devel@nongnu.org; Wed, 30 Aug 2017 04:35:17 -0400","from mx1.redhat.com ([209.132.183.28]:46112)\n\tby eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from ) id 1dmySy-0004GG-0q\n\tfor qemu-devel@nongnu.org; Wed, 30 Aug 2017 04:35:16 -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 114ABC04BD2C;\n\tWed, 30 Aug 2017 08:35:15 +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 7D1B984792;\n\tWed, 30 Aug 2017 08:35:11 +0000 (UTC)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com 114ABC04BD2C","From":"Peter Xu ","To":"qemu-devel@nongnu.org","Date":"Wed, 30 Aug 2017 16:32:23 +0800","Message-Id":"<1504081950-2528-27-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.31]);\n\tWed, 30 Aug 2017 08:35:15 +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 26/33] migration: final handshake for the\n\tresume","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":"Finish the last step to do the final handshake for the recovery.\n\nFirst source sends one MIG_CMD_RESUME to dst, telling that source is\nready to resume.\n\nThen, dest replies with MIG_RP_MSG_RESUME_ACK to source, telling that\ndest is ready to resume (after switch to postcopy-active state).\n\nWhen source received the RESUME_ACK, it switches its state to\npostcopy-active, and finally the recovery is completed.\n\nSigned-off-by: Peter Xu \n---\n migration/migration.c | 28 ++++++++++++++++++++++++----\n 1 file changed, 24 insertions(+), 4 deletions(-)","diff":"diff --git a/migration/migration.c b/migration/migration.c\nindex 19aed72..c9b7085 100644\n--- a/migration/migration.c\n+++ b/migration/migration.c\n@@ -1694,7 +1694,8 @@ static int migrate_handle_rp_resume_ack(MigrationState *s, uint32_t value)\n migrate_set_state(&s->state, MIGRATION_STATUS_POSTCOPY_RECOVER,\n MIGRATION_STATUS_POSTCOPY_ACTIVE);\n \n- /* TODO: notify send thread that time to continue send pages */\n+ /* Notify send thread that time to continue send pages */\n+ qemu_sem_post(&s->rp_state.rp_sem);\n \n return 0;\n }\n@@ -2169,6 +2170,21 @@ typedef enum MigThrError {\n MIG_THR_ERR_FATAL = 2,\n } MigThrError;\n \n+static int postcopy_resume_handshake(MigrationState *s)\n+{\n+ qemu_savevm_send_postcopy_resume(s->to_dst_file);\n+\n+ while (s->state == MIGRATION_STATUS_POSTCOPY_RECOVER) {\n+ qemu_sem_wait(&s->rp_state.rp_sem);\n+ }\n+\n+ if (s->state == MIGRATION_STATUS_POSTCOPY_ACTIVE) {\n+ return 0;\n+ }\n+\n+ return -1;\n+}\n+\n /* Return zero if success, or <0 for error */\n static int postcopy_do_resume(MigrationState *s)\n {\n@@ -2186,10 +2202,14 @@ static int postcopy_do_resume(MigrationState *s)\n }\n \n /*\n- * TODO: handshake with dest using MIG_CMD_RESUME,\n- * MIG_RP_MSG_RESUME_ACK, then switch source state to\n- * \"postcopy-active\"\n+ * Last handshake with destination on the resume (destination will\n+ * switch to postcopy-active afterwards)\n */\n+ ret = postcopy_resume_handshake(s);\n+ if (ret) {\n+ error_report(\"%s: handshake failed: %d\", __func__, ret);\n+ return ret;\n+ }\n \n return 0;\n }\n","prefixes":["RFC","v2","26/33"]}