{"id":807502,"url":"http://patchwork.ozlabs.org/api/1.0/patches/807502/?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-23-git-send-email-peterx@redhat.com>","date":"2017-08-30T08:32:19","name":"[RFC,v2,22/33] migration: new message MIG_RP_MSG_RESUME_ACK","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"5f2e396bb62648ee7b1990aa342a45cc27124ad1","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-23-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/807502/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-mx03.extmail.prod.ext.phx2.redhat.com;\n\tdmarc=none (p=none dis=none) header.from=redhat.com","ext-mx03.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 3xhzbQ1xwDz9t2R\n\tfor ;\n\tWed, 30 Aug 2017 18:45:06 +1000 (AEST)","from localhost ([::1]:49064 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1dmycS-0008PZ-1h\n\tfor incoming@patchwork.ozlabs.org; Wed, 30 Aug 2017 04:45:04 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:35042)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1dmySh-0000CV-6x\n\tfor qemu-devel@nongnu.org; Wed, 30 Aug 2017 04:35:00 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1dmySc-00040L-A1\n\tfor qemu-devel@nongnu.org; Wed, 30 Aug 2017 04:34:59 -0400","from mx1.redhat.com ([209.132.183.28]:50994)\n\tby eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from ) id 1dmySc-0003zU-1O\n\tfor qemu-devel@nongnu.org; Wed, 30 Aug 2017 04:34:54 -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 064587E433;\n\tWed, 30 Aug 2017 08:34:53 +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 43BD784792;\n\tWed, 30 Aug 2017 08:34:39 +0000 (UTC)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com 064587E433","From":"Peter Xu ","To":"qemu-devel@nongnu.org","Date":"Wed, 30 Aug 2017 16:32:19 +0800","Message-Id":"<1504081950-2528-23-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.27]);\n\tWed, 30 Aug 2017 08:34:53 +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 22/33] migration: new message\n\tMIG_RP_MSG_RESUME_ACK","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":"Creating new message to reply for MIG_CMD_POSTCOPY_RESUME. One uint32_t\nis used as payload to let the source know whether destination is ready\nto continue the migration.\n\nSigned-off-by: Peter Xu \n---\n migration/migration.c | 37 +++++++++++++++++++++++++++++++++++++\n migration/migration.h | 3 +++\n migration/savevm.c | 3 ++-\n migration/trace-events | 1 +\n 4 files changed, 43 insertions(+), 1 deletion(-)","diff":"diff --git a/migration/migration.c b/migration/migration.c\nindex 625f19a..4dc564a 100644\n--- a/migration/migration.c\n+++ b/migration/migration.c\n@@ -93,6 +93,7 @@ enum mig_rp_message_type {\n MIG_RP_MSG_REQ_PAGES_ID, /* data (start: be64, len: be32, id: string) */\n MIG_RP_MSG_REQ_PAGES, /* data (start: be64, len: be32) */\n MIG_RP_MSG_RECV_BITMAP, /* send recved_bitmap back to source */\n+ MIG_RP_MSG_RESUME_ACK, /* tell source that we are ready to resume */\n \n MIG_RP_MSG_MAX\n };\n@@ -489,6 +490,14 @@ void migrate_send_rp_recv_bitmap(MigrationIncomingState *mis,\n trace_migrate_send_rp_recv_bitmap(block_name, res);\n }\n \n+void migrate_send_rp_resume_ack(MigrationIncomingState *mis, uint32_t value)\n+{\n+ uint32_t buf;\n+\n+ buf = cpu_to_be32(value);\n+ migrate_send_rp_message(mis, MIG_RP_MSG_RESUME_ACK, sizeof(buf), &buf);\n+}\n+\n MigrationCapabilityStatusList *qmp_query_migrate_capabilities(Error **errp)\n {\n MigrationCapabilityStatusList *head = NULL;\n@@ -1613,6 +1622,7 @@ static struct rp_cmd_args {\n [MIG_RP_MSG_REQ_PAGES] = { .len = 12, .name = \"REQ_PAGES\" },\n [MIG_RP_MSG_REQ_PAGES_ID] = { .len = -1, .name = \"REQ_PAGES_ID\" },\n [MIG_RP_MSG_RECV_BITMAP] = { .len = -1, .name = \"RECV_BITMAP\" },\n+ [MIG_RP_MSG_RESUME_ACK] = { .len = 4, .name = \"RESUME_ACK\" },\n [MIG_RP_MSG_MAX] = { .len = -1, .name = \"MAX\" },\n };\n \n@@ -1670,6 +1680,25 @@ static int migrate_handle_rp_recv_bitmap(MigrationState *s, char *block_name)\n return ram_dirty_bitmap_reload(s, block);\n }\n \n+static int migrate_handle_rp_resume_ack(MigrationState *s, uint32_t value)\n+{\n+ trace_source_return_path_thread_resume_ack(value);\n+\n+ if (value != MIGRATION_RESUME_ACK_VALUE) {\n+ error_report(\"%s: illegal resume_ack value %\"PRIu32,\n+ __func__, value);\n+ return -1;\n+ }\n+\n+ /* Now both sides are active. */\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+\n+ return 0;\n+}\n+\n /*\n * Handles messages sent on the return path towards the source VM\n *\n@@ -1789,6 +1818,14 @@ retry:\n }\n break;\n \n+ case MIG_RP_MSG_RESUME_ACK:\n+ tmp32 = ldl_be_p(buf);\n+ if (migrate_handle_rp_resume_ack(ms, tmp32)) {\n+ mark_source_rp_bad(ms);\n+ goto out;\n+ }\n+ break;\n+\n default:\n break;\n }\ndiff --git a/migration/migration.h b/migration/migration.h\nindex 4051379..a3a0582 100644\n--- a/migration/migration.h\n+++ b/migration/migration.h\n@@ -21,6 +21,8 @@\n #include \"qemu/coroutine_int.h\"\n #include \"hw/qdev.h\"\n \n+#define MIGRATION_RESUME_ACK_VALUE (1)\n+\n /* State for the incoming migration */\n struct MigrationIncomingState {\n QEMUFile *from_src_file;\n@@ -204,5 +206,6 @@ int migrate_send_rp_req_pages(MigrationIncomingState *mis, const char* rbname,\n ram_addr_t start, size_t len);\n void migrate_send_rp_recv_bitmap(MigrationIncomingState *mis,\n char *block_name);\n+void migrate_send_rp_resume_ack(MigrationIncomingState *mis, uint32_t value);\n \n #endif\ndiff --git a/migration/savevm.c b/migration/savevm.c\nindex e914346..7fd5390 100644\n--- a/migration/savevm.c\n+++ b/migration/savevm.c\n@@ -1707,7 +1707,8 @@ static int loadvm_postcopy_handle_resume(MigrationIncomingState *mis)\n MIGRATION_STATUS_POSTCOPY_ACTIVE);\n qemu_sem_post(&mis->postcopy_pause_sem_fault);\n \n- /* TODO: Tell source that \"we are ready\" */\n+ /* Tell source that \"we are ready\" */\n+ migrate_send_rp_resume_ack(mis, MIGRATION_RESUME_ACK_VALUE);\n \n return 0;\n }\ndiff --git a/migration/trace-events b/migration/trace-events\nindex 0a1c302..a929bc7 100644\n--- a/migration/trace-events\n+++ b/migration/trace-events\n@@ -117,6 +117,7 @@ source_return_path_thread_entry(void) \"\"\n source_return_path_thread_loop_top(void) \"\"\n source_return_path_thread_pong(uint32_t val) \"0x%x\"\n source_return_path_thread_shut(uint32_t val) \"0x%x\"\n+source_return_path_thread_resume_ack(uint32_t v) \"%\"PRIu32\n migrate_global_state_post_load(const char *state) \"loaded state: %s\"\n migrate_global_state_pre_save(const char *state) \"saved state: %s\"\n migration_thread_low_pending(uint64_t pending) \"%\" PRIu64\n","prefixes":["RFC","v2","22/33"]}