{"id":807509,"url":"http://patchwork.ozlabs.org/api/1.0/patches/807509/?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-20-git-send-email-peterx@redhat.com>","date":"2017-08-30T08:32:16","name":"[RFC,v2,19/33] migration: new cmd MIG_CMD_RECV_BITMAP","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"8bb4df824047bf57d0605266cc16befadad80eb0","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-20-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/807509/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-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=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 3xhzhv1n2Fz9t2W\n\tfor ;\n\tWed, 30 Aug 2017 18:49:51 +1000 (AEST)","from localhost ([::1]:49084 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1dmyh3-0004IY-0m\n\tfor incoming@patchwork.ozlabs.org; Wed, 30 Aug 2017 04:49:49 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:34542)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1dmyS0-0007ux-6u\n\tfor qemu-devel@nongnu.org; Wed, 30 Aug 2017 04:34:17 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1dmyRz-0003gI-0q\n\tfor qemu-devel@nongnu.org; Wed, 30 Aug 2017 04:34:16 -0400","from mx1.redhat.com ([209.132.183.28]:46042)\n\tby eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from ) id 1dmyRy-0003ft-PD\n\tfor qemu-devel@nongnu.org; Wed, 30 Aug 2017 04:34:14 -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 58C6FC0587DB;\n\tWed, 30 Aug 2017 08:34:13 +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 75F4987C86;\n\tWed, 30 Aug 2017 08:34:08 +0000 (UTC)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com 58C6FC0587DB","From":"Peter Xu ","To":"qemu-devel@nongnu.org","Date":"Wed, 30 Aug 2017 16:32:16 +0800","Message-Id":"<1504081950-2528-20-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.32]);\n\tWed, 30 Aug 2017 08:34:13 +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 19/33] migration: new cmd MIG_CMD_RECV_BITMAP","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":"Add a new vm command MIG_CMD_RECV_BITMAP to request received bitmap for\none ramblock.\n\nReviewed-by: Dr. David Alan Gilbert \nSigned-off-by: Peter Xu \n---\n migration/savevm.c | 61 ++++++++++++++++++++++++++++++++++++++++++++++++++\n migration/savevm.h | 1 +\n migration/trace-events | 2 ++\n 3 files changed, 64 insertions(+)","diff":"diff --git a/migration/savevm.c b/migration/savevm.c\nindex c9bccf7..f532ca0 100644\n--- a/migration/savevm.c\n+++ b/migration/savevm.c\n@@ -78,6 +78,7 @@ enum qemu_vm_cmd {\n were previously sent during\n precopy but are dirty. */\n MIG_CMD_PACKAGED, /* Send a wrapped stream within this stream */\n+ MIG_CMD_RECV_BITMAP, /* Request for recved bitmap on dst */\n MIG_CMD_MAX\n };\n \n@@ -95,6 +96,7 @@ static struct mig_cmd_args {\n [MIG_CMD_POSTCOPY_RAM_DISCARD] = {\n .len = -1, .name = \"POSTCOPY_RAM_DISCARD\" },\n [MIG_CMD_PACKAGED] = { .len = 4, .name = \"PACKAGED\" },\n+ [MIG_CMD_RECV_BITMAP] = { .len = -1, .name = \"RECV_BITMAP\" },\n [MIG_CMD_MAX] = { .len = -1, .name = \"MAX\" },\n };\n \n@@ -929,6 +931,19 @@ void qemu_savevm_send_postcopy_run(QEMUFile *f)\n qemu_savevm_command_send(f, MIG_CMD_POSTCOPY_RUN, 0, NULL);\n }\n \n+void qemu_savevm_send_recv_bitmap(QEMUFile *f, char *block_name)\n+{\n+ size_t len;\n+ char buf[256];\n+\n+ trace_savevm_send_recv_bitmap(block_name);\n+\n+ buf[0] = len = strlen(block_name);\n+ memcpy(buf + 1, block_name, len);\n+\n+ qemu_savevm_command_send(f, MIG_CMD_RECV_BITMAP, len + 1, (uint8_t *)buf);\n+}\n+\n bool qemu_savevm_state_blocked(Error **errp)\n {\n SaveStateEntry *se;\n@@ -1716,6 +1731,49 @@ static int loadvm_handle_cmd_packaged(MigrationIncomingState *mis)\n }\n \n /*\n+ * Handle request that source requests for recved_bitmap on\n+ * destination. Payload format:\n+ *\n+ * len (1 byte) + ramblock_name (<255 bytes)\n+ */\n+static int loadvm_handle_recv_bitmap(MigrationIncomingState *mis,\n+ uint16_t len)\n+{\n+ QEMUFile *file = mis->from_src_file;\n+ RAMBlock *rb;\n+ char block_name[256];\n+ size_t cnt;\n+\n+ cnt = qemu_get_counted_string(file, block_name);\n+ if (!cnt) {\n+ error_report(\"%s: failed to read block name\", __func__);\n+ return -EINVAL;\n+ }\n+\n+ /* Validate before using the data */\n+ if (qemu_file_get_error(file)) {\n+ return qemu_file_get_error(file);\n+ }\n+\n+ if (len != cnt + 1) {\n+ error_report(\"%s: invalid payload length (%d)\", __func__, len);\n+ return -EINVAL;\n+ }\n+\n+ rb = qemu_ram_block_by_name(block_name);\n+ if (!rb) {\n+ error_report(\"%s: block '%s' not found\", __func__, block_name);\n+ return -EINVAL;\n+ }\n+\n+ /* TODO: send the bitmap back to source */\n+\n+ trace_loadvm_handle_recv_bitmap(block_name);\n+\n+ return 0;\n+}\n+\n+/*\n * Process an incoming 'QEMU_VM_COMMAND'\n * 0 just a normal return\n * LOADVM_QUIT All good, but exit the loop\n@@ -1788,6 +1846,9 @@ static int loadvm_process_command(QEMUFile *f)\n \n case MIG_CMD_POSTCOPY_RAM_DISCARD:\n return loadvm_postcopy_ram_handle_discard(mis, len);\n+\n+ case MIG_CMD_RECV_BITMAP:\n+ return loadvm_handle_recv_bitmap(mis, len);\n }\n \n return 0;\ndiff --git a/migration/savevm.h b/migration/savevm.h\nindex 295c4a1..8126b1c 100644\n--- a/migration/savevm.h\n+++ b/migration/savevm.h\n@@ -46,6 +46,7 @@ int qemu_savevm_send_packaged(QEMUFile *f, const uint8_t *buf, size_t len);\n void qemu_savevm_send_postcopy_advise(QEMUFile *f);\n void qemu_savevm_send_postcopy_listen(QEMUFile *f);\n void qemu_savevm_send_postcopy_run(QEMUFile *f);\n+void qemu_savevm_send_recv_bitmap(QEMUFile *f, char *block_name);\n \n void qemu_savevm_send_postcopy_ram_discard(QEMUFile *f, const char *name,\n uint16_t len,\ndiff --git a/migration/trace-events b/migration/trace-events\nindex 42a93d9..c5f7e41 100644\n--- a/migration/trace-events\n+++ b/migration/trace-events\n@@ -12,6 +12,7 @@ loadvm_state_cleanup(void) \"\"\n loadvm_handle_cmd_packaged(unsigned int length) \"%u\"\n loadvm_handle_cmd_packaged_main(int ret) \"%d\"\n loadvm_handle_cmd_packaged_received(int ret) \"%d\"\n+loadvm_handle_recv_bitmap(char *s) \"%s\"\n loadvm_postcopy_handle_advise(void) \"\"\n loadvm_postcopy_handle_listen(void) \"\"\n loadvm_postcopy_handle_run(void) \"\"\n@@ -34,6 +35,7 @@ savevm_send_open_return_path(void) \"\"\n savevm_send_ping(uint32_t val) \"0x%x\"\n savevm_send_postcopy_listen(void) \"\"\n savevm_send_postcopy_run(void) \"\"\n+savevm_send_recv_bitmap(char *name) \"%s\"\n savevm_state_setup(void) \"\"\n savevm_state_header(void) \"\"\n savevm_state_iterate(void) \"\"\n","prefixes":["RFC","v2","19/33"]}