From patchwork Tue Aug 16 00:25:02 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Md Haris Iqbal X-Patchwork-Id: 9282433 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 9F53D607FD for ; Tue, 16 Aug 2016 00:25:50 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8D17828E2A for ; Tue, 16 Aug 2016 00:25:50 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7C92328E8E; Tue, 16 Aug 2016 00:25:50 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id D899828E2A for ; Tue, 16 Aug 2016 00:25:49 +0000 (UTC) Received: from localhost ([::1]:39429 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bZSCS-00024M-Kh for patchwork-qemu-devel@patchwork.kernel.org; Mon, 15 Aug 2016 20:25:48 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34968) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bZSCB-0001z5-DI for qemu-devel@nongnu.org; Mon, 15 Aug 2016 20:25:32 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bZSC1-0007Ne-CU for qemu-devel@nongnu.org; Mon, 15 Aug 2016 20:25:30 -0400 Received: from mail-pa0-x241.google.com ([2607:f8b0:400e:c03::241]:35689) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bZSC1-0007NX-17 for qemu-devel@nongnu.org; Mon, 15 Aug 2016 20:25:21 -0400 Received: by mail-pa0-x241.google.com with SMTP id cf3so4299046pad.2 for ; Mon, 15 Aug 2016 17:25:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=dYEETVSdSXbrxD4aKiEU92tcS0T7K3IcFxLrYJtPmj0=; b=a4n9C0j9tHjbZZRBmtqy3DYnS4lbcDo1NBKN6EiqP5s04yus+PnQEZQn2HSsx3Fq99 5jBFGrLXq2LbS0l4rtXS73ZzHwPq8QvyxulGvk0uB9vfh+g3Yap9Pj5EmkCXwa8Dk1Iu 0YcO2b4D499FtRv2PIBB8n+W17OWKlpPFFRBf87wV9H5Ny2clsrB1z5txTTngYKZuXOY w6dHz9IFDtWVR4JH8Okgi6qChrOrgCV3VnNdbtCWW6WNBDLBJHW9vFYRi0tnsRbRKuT2 XIr0bAEWf7RWt10dMCQxPBVFv8Pa0umQOqXPkwVpmEXIlM5BZaNsvtbWBvHVQ6rOA4dD KeOA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=dYEETVSdSXbrxD4aKiEU92tcS0T7K3IcFxLrYJtPmj0=; b=OL4TUseCl8CaO0C+TYoKHjuKzz6ZxIJuktAK0FO09Yg+Uvf81Dq1kqmFwdOhEJRkqM IeKGlL0cA6sYJF85zyuJ5W2ubzWk1LgOww7ltIPXnqZxa4x0pKHL+yV3BlFRxUQacduW q6MqEhO+dPwnirFru1v1WfpVvqquuqa80vjLItBMo8v9lVrjxT5LMza2lIT2ff4D0j6/ KVttTjvO5vXb94ToQK2ZvSO+sJyvJbo5oz6aWdytRIgUkR4ycbURK9pMdinaLOtOI7fc IYhaEftoGCZO2O7mY12mKEjlxV8yXnxRMgdJVoX0qtUacIswcMnyYxmm1dSR101M6lSy 63Yw== X-Gm-Message-State: AEkoouvqbaAAGEeKg4RKII3FamzNSpHUxVmw8LXVVkTnTDvOq/s2hSn9zSQieJ3VNrsJJA== X-Received: by 10.66.148.202 with SMTP id tu10mr58830944pab.52.1471307120346; Mon, 15 Aug 2016 17:25:20 -0700 (PDT) Received: from deepak.domain.name ([103.252.25.174]) by smtp.googlemail.com with ESMTPSA id s12sm34028656pfj.73.2016.08.15.17.25.18 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 15 Aug 2016 17:25:19 -0700 (PDT) From: Md Haris Iqbal To: qemu-devel@nongnu.org Date: Tue, 16 Aug 2016 05:55:02 +0530 Message-Id: <1471307103-13316-2-git-send-email-haris.phnx@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1471307103-13316-1-git-send-email-haris.phnx@gmail.com> References: <1471307103-13316-1-git-send-email-haris.phnx@gmail.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2607:f8b0:400e:c03::241 Subject: [Qemu-devel] [PATCH 1/2] Migration: New bitmap for postcopy migration failure X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Md Haris Iqbal , dgilbert@redhat.com Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Md Haris Iqbal --- include/migration/migration.h | 3 +++ migration/migration.c | 8 ++++-- migration/postcopy-ram.c | 2 +- migration/ram.c | 63 ++++++++++++++++++++++++++++++++++++++++++- 4 files changed, 72 insertions(+), 4 deletions(-) diff --git a/include/migration/migration.h b/include/migration/migration.h index 74d456e..0a42b87 100644 --- a/include/migration/migration.h +++ b/include/migration/migration.h @@ -358,6 +358,9 @@ int ram_save_queue_pages(MigrationState *ms, const char *rbname, int qemu_migrate_postcopy_outgoing_recovery(MigrationState *ms); int qemu_migrate_postcopy_incoming_recovery(QEMUFile **f,MigrationIncomingState* mis); +void migrate_incoming_ram_bitmap_init(void); +void migrate_incoming_ram_bitmap_update(RAMBlock *rb, ram_addr_t addr); + PostcopyState postcopy_state_get(void); /* Set the state and return the old state */ PostcopyState postcopy_state_set(PostcopyState new_state); diff --git a/migration/migration.c b/migration/migration.c index 4edd77c..99138dd 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -381,6 +381,10 @@ static void process_incoming_migration_co(void *opaque) postcopy_state_set(POSTCOPY_INCOMING_NONE); migrate_set_state(&mis->state, MIGRATION_STATUS_NONE, MIGRATION_STATUS_ACTIVE); + + /* Initializing the bitmap for destination side */ + migrate_incoming_ram_bitmap_init(); + ret = qemu_loadvm_state(f); ps = postcopy_state_get(); diff --git a/migration/ram.c b/migration/ram.c index 815bc0e..4f16243 100644 --- a/migration/ram.c +++ b/migration/ram.c @@ -250,6 +250,13 @@ static struct BitmapRcu { * of the postcopy phase */ unsigned long *unsentmap; + /* + * A new bitmap for postcopy network failure recovery. + * It keeps track of the pages recieved. + * In the end, it would be used to request pages that were + * lost due to network failure. + */ + unsigned long *not_received; } *migration_bitmap_rcu; struct CompressParam { @@ -2340,6 +2347,7 @@ static int ram_load_postcopy(QEMUFile *f) void *page_buffer = NULL; void *place_source = NULL; uint8_t ch; + RAMBlock* block = NULL; addr = qemu_get_be64(f); flags = addr & ~TARGET_PAGE_MASK; @@ -2348,7 +2356,7 @@ static int ram_load_postcopy(QEMUFile *f) trace_ram_load_postcopy_loop((uint64_t)addr, flags); place_needed = false; if (flags & (RAM_SAVE_FLAG_COMPRESS | RAM_SAVE_FLAG_PAGE)) { - RAMBlock *block = ram_block_from_stream(f, flags); + block = ram_block_from_stream(f, flags); host = host_from_ram_block_offset(block, addr); if (!host) { @@ -2436,6 +2444,15 @@ static int ram_load_postcopy(QEMUFile *f) if (!ret) { ret = qemu_file_get_error(f); } + if (block != NULL) { + /* + * TODO + * We need to delay updating the bits until host page is + * recieved and the place is done, or tidy up the bitmap later + * accordingly (whether whole host page was recieved or not) + */ + migrate_incoming_ram_bitmap_update(block, addr); + } } return ret; @@ -2483,6 +2500,16 @@ static int ram_load(QEMUFile *f, void *opaque, int version_id) RAMBlock *block = ram_block_from_stream(f, flags); host = host_from_ram_block_offset(block, addr); + + migrate_incoming_ram_bitmap_update(block, addr); + /* + * TODO + * 1) Do we need a bitmap_update call later in the while loop also? + * 2) We need to delay updating the bits until host page is + * recieved and the place is done, or tidy up the bitmap later + * accordingly (whether whole host page was recieved or not) + */ + if (!host) { error_report("Illegal RAM offset " RAM_ADDR_FMT, addr); ret = -EINVAL; @@ -2578,6 +2605,40 @@ static int ram_load(QEMUFile *f, void *opaque, int version_id) return ret; } +void migrate_incoming_ram_bitmap_init(void) +{ + int64_t ram_bitmap_pages; /* Size of bitmap in pages, including gaps */ + + /* + * A new bitmap for postcopy network failure recovery. + * It keeps track of the pages recieved. + * In the end, it would be used to request pages that were + * lost due to network failure. + */ + + ram_bitmap_pages = last_ram_offset() >> TARGET_PAGE_BITS; + migration_bitmap_rcu = g_new0(struct BitmapRcu, 1); + migration_bitmap_rcu->not_received = bitmap_new(ram_bitmap_pages); + bitmap_set(migration_bitmap_rcu->not_received, 0, ram_bitmap_pages); +} + +void migrate_incoming_ram_bitmap_update(RAMBlock *rb, ram_addr_t addr) +{ + unsigned long base = rb->offset >> TARGET_PAGE_BITS; + unsigned long nr = base + (addr >> TARGET_PAGE_BITS); + unsigned long *bitmap; + + bitmap = atomic_rcu_read(&migration_bitmap_rcu)->not_received; + clear_bit(nr, bitmap); + + static int count = 0; + count++; + if(count == 1000) { + count = 0; + ram_debug_dump_bitmap(bitmap, true); + } +} + static SaveVMHandlers savevm_ram_handlers = { .save_live_setup = ram_save_setup, .save_live_iterate = ram_save_iterate,