From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56906) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cPZFe-0002wG-Sb for qemu-devel@nongnu.org; Fri, 06 Jan 2017 13:28:32 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cPZFb-0003yC-Vo for qemu-devel@nongnu.org; Fri, 06 Jan 2017 13:28:30 -0500 Received: from mx1.redhat.com ([209.132.183.28]:60486) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cPZFb-0003wX-OA for qemu-devel@nongnu.org; Fri, 06 Jan 2017 13:28:27 -0500 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id B95768124B for ; Fri, 6 Jan 2017 18:28:27 +0000 (UTC) From: "Dr. David Alan Gilbert (git)" Date: Fri, 6 Jan 2017 18:28:09 +0000 Message-Id: <20170106182823.1960-2-dgilbert@redhat.com> In-Reply-To: <20170106182823.1960-1-dgilbert@redhat.com> References: <20170106182823.1960-1-dgilbert@redhat.com> Subject: [Qemu-devel] [PATCH 01/15] postcopy: Transmit and compare individual page sizes List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org, quintela@redhat.com, amit.shah@redhat.com Cc: aarcange@redhat.com From: "Dr. David Alan Gilbert" When using postcopy with hugepages, we require the source and destination page sizes for any RAMBlock to match. Transmit them as part of the RAM information header and fail if there's a difference. Signed-off-by: Dr. David Alan Gilbert --- migration/ram.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/migration/ram.c b/migration/ram.c index a1c8089..39998f5 100644 --- a/migration/ram.c +++ b/migration/ram.c @@ -1970,6 +1970,9 @@ static int ram_save_setup(QEMUFile *f, void *opaque) qemu_put_byte(f, strlen(block->idstr)); qemu_put_buffer(f, (uint8_t *)block->idstr, strlen(block->idstr)); qemu_put_be64(f, block->used_length); + if (migrate_postcopy_ram() && block->page_size != qemu_host_page_size) { + qemu_put_be64(f, block->page_size); + } } rcu_read_unlock(); @@ -2536,6 +2539,18 @@ static int ram_load(QEMUFile *f, void *opaque, int version_id) error_report_err(local_err); } } + /* For postcopy we need to check hugepage sizes match */ + if (migrate_postcopy_ram() && + block->page_size != qemu_host_page_size) { + uint64_t remote_page_size = qemu_get_be64(f); + if (remote_page_size != block->page_size) { + error_report("Mismatched RAM page size %s " + "(local) %" PRId64 "!= %" PRId64, + id, block->page_size, + remote_page_size); + ret = -EINVAL; + } + } ram_control_load_hook(f, RAM_CONTROL_BLOCK_REG, block->idstr); } else { -- 2.9.3