Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/807513/?format=api
{ "id": 807513, "url": "http://patchwork.ozlabs.org/api/patches/807513/?format=api", "web_url": "http://patchwork.ozlabs.org/project/qemu-devel/patch/1504081950-2528-26-git-send-email-peterx@redhat.com/", "project": { "id": 14, "url": "http://patchwork.ozlabs.org/api/projects/14/?format=api", "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": "<1504081950-2528-26-git-send-email-peterx@redhat.com>", "list_archive_url": null, "date": "2017-08-30T08:32:22", "name": "[RFC,v2,25/33] migration: setup ramstate for resume", "commit_ref": null, "pull_url": null, "state": "new", "archived": false, "hash": "f47bdf76b0773650aa0602c82dd5bf8e4394c583", "submitter": { "id": 67717, "url": "http://patchwork.ozlabs.org/api/people/67717/?format=api", "name": "Peter Xu", "email": "peterx@redhat.com" }, "delegate": null, "mbox": "http://patchwork.ozlabs.org/project/qemu-devel/patch/1504081950-2528-26-git-send-email-peterx@redhat.com/mbox/", "series": [ { "id": 552, "url": "http://patchwork.ozlabs.org/api/series/552/?format=api", "web_url": "http://patchwork.ozlabs.org/project/qemu-devel/list/?series=552", "date": "2017-08-30T08:31:59", "name": "Migration: postcopy failure recovery", "version": 2, "mbox": "http://patchwork.ozlabs.org/series/552/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/807513/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/807513/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>", "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=<UNKNOWN>)", "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 3xhzlt4Ckpz9t1t\n\tfor <incoming@patchwork.ozlabs.org>;\n\tWed, 30 Aug 2017 18:52:26 +1000 (AEST)", "from localhost ([::1]:49098 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>)\n\tid 1dmyjY-0006im-7s\n\tfor incoming@patchwork.ozlabs.org; Wed, 30 Aug 2017 04:52:24 -0400", "from eggs.gnu.org ([2001:4830:134:3::10]:35196)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from <peterx@redhat.com>) id 1dmySv-0000Ti-15\n\tfor qemu-devel@nongnu.org; Wed, 30 Aug 2017 04:35:14 -0400", "from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from <peterx@redhat.com>) id 1dmySu-0004Ej-5F\n\tfor qemu-devel@nongnu.org; Wed, 30 Aug 2017 04:35:13 -0400", "from mx1.redhat.com ([209.132.183.28]:43944)\n\tby eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from <peterx@redhat.com>) id 1dmySt-0004EH-W1\n\tfor qemu-devel@nongnu.org; Wed, 30 Aug 2017 04:35:12 -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 00A73806B4;\n\tWed, 30 Aug 2017 08:35:11 +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 3C5FB84792;\n\tWed, 30 Aug 2017 08:35:05 +0000 (UTC)" ], "DMARC-Filter": "OpenDMARC Filter v1.3.2 mx1.redhat.com 00A73806B4", "From": "Peter Xu <peterx@redhat.com>", "To": "qemu-devel@nongnu.org", "Date": "Wed, 30 Aug 2017 16:32:22 +0800", "Message-Id": "<1504081950-2528-26-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:11 +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 25/33] migration: setup ramstate for resume", "X-BeenThere": "qemu-devel@nongnu.org", "X-Mailman-Version": "2.1.21", "Precedence": "list", "List-Id": "<qemu-devel.nongnu.org>", "List-Unsubscribe": "<https://lists.nongnu.org/mailman/options/qemu-devel>,\n\t<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>", "List-Archive": "<http://lists.nongnu.org/archive/html/qemu-devel/>", "List-Post": "<mailto:qemu-devel@nongnu.org>", "List-Help": "<mailto:qemu-devel-request@nongnu.org?subject=help>", "List-Subscribe": "<https://lists.nongnu.org/mailman/listinfo/qemu-devel>,\n\t<mailto:qemu-devel-request@nongnu.org?subject=subscribe>", "Cc": "Laurent Vivier <lvivier@redhat.com>,\n\tAndrea Arcangeli <aarcange@redhat.com>, \n\tJuan Quintela <quintela@redhat.com>,\n\tAlexey Perevalov <a.perevalov@samsung.com>, peterx@redhat.com,\n\t\"Dr . David Alan Gilbert\" <dgilbert@redhat.com>", "Errors-To": "qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org", "Sender": "\"Qemu-devel\"\n\t<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>" }, "content": "After we updated the dirty bitmaps of ramblocks, we also need to update\nthe critical fields in RAMState to make sure it is ready for a resume.\n\nSigned-off-by: Peter Xu <peterx@redhat.com>\n---\n migration/ram.c | 37 ++++++++++++++++++++++++++++++++++++-\n migration/trace-events | 1 +\n 2 files changed, 37 insertions(+), 1 deletion(-)", "diff": "diff --git a/migration/ram.c b/migration/ram.c\nindex afabcf5..c5d9028 100644\n--- a/migration/ram.c\n+++ b/migration/ram.c\n@@ -1986,6 +1986,33 @@ static int ram_state_init(RAMState **rsp)\n return 0;\n }\n \n+static void ram_state_resume_prepare(RAMState *rs)\n+{\n+ RAMBlock *block;\n+ long pages = 0;\n+\n+ /*\n+ * Postcopy is not using xbzrle/compression, so no need for that.\n+ * Also, since source are already halted, we don't need to care\n+ * about dirty page logging as well.\n+ */\n+\n+ RAMBLOCK_FOREACH(block) {\n+ pages += bitmap_count_one(block->bmap,\n+ block->used_length >> TARGET_PAGE_BITS);\n+ }\n+\n+ /* This may not be aligned with current bitmaps. Recalculate. */\n+ rs->migration_dirty_pages = pages;\n+\n+ rs->last_seen_block = NULL;\n+ rs->last_sent_block = NULL;\n+ rs->last_page = 0;\n+ rs->last_version = ram_list.version;\n+\n+ trace_ram_state_resume_prepare(pages);\n+}\n+\n /*\n * Each of ram_save_setup, ram_save_iterate and ram_save_complete has\n * long-running RCU critical section. When rcu-reclaims in the code\n@@ -2909,8 +2936,16 @@ out:\n static int ram_resume_prepare(MigrationState *s, void *opaque)\n {\n RAMState *rs = *(RAMState **)opaque;\n+ int ret;\n \n- return ram_dirty_bitmap_sync_all(s, rs);\n+ ret = ram_dirty_bitmap_sync_all(s, rs);\n+ if (ret) {\n+ return ret;\n+ }\n+\n+ ram_state_resume_prepare(rs);\n+\n+ return 0;\n }\n \n static SaveVMHandlers savevm_ram_handlers = {\ndiff --git a/migration/trace-events b/migration/trace-events\nindex 8962916..6e06283 100644\n--- a/migration/trace-events\n+++ b/migration/trace-events\n@@ -85,6 +85,7 @@ ram_dirty_bitmap_sync_start(void) \"\"\n ram_dirty_bitmap_sync_wait(void) \"\"\n ram_dirty_bitmap_sync_notify(void) \"\"\n ram_dirty_bitmap_sync_complete(void) \"\"\n+ram_state_resume_prepare(long v) \"%ld\"\n \n # migration/migration.c\n await_return_path_close_on_source_close(void) \"\"\n", "prefixes": [ "RFC", "v2", "25/33" ] }