From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45724) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bpgiI-00026J-13 for qemu-devel@nongnu.org; Thu, 29 Sep 2016 15:09:47 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bpgiF-0007pk-DD for qemu-devel@nongnu.org; Thu, 29 Sep 2016 15:09:44 -0400 Received: from mx1.redhat.com ([209.132.183.28]:37402) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bpgiF-0007pR-5u for qemu-devel@nongnu.org; Thu, 29 Sep 2016 15:09:43 -0400 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 C05F312B7 for ; Thu, 29 Sep 2016 19:09:42 +0000 (UTC) From: "Dr. David Alan Gilbert (git)" Date: Thu, 29 Sep 2016 20:09:38 +0100 Message-Id: <1475176178-4873-3-git-send-email-dgilbert@redhat.com> In-Reply-To: <1475176178-4873-1-git-send-email-dgilbert@redhat.com> References: <1475176178-4873-1-git-send-email-dgilbert@redhat.com> Subject: [Qemu-devel] [PATCH 2/2] migration/postcopy: Explicitly disallow huge pages List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org, pbonzini@redhat.com, quintela@redhat.com, amit.shah@redhat.com From: "Dr. David Alan Gilbert" At the moment postcopy will fail as soon as qemu tries to register userfault on the RAMBlock pages that are backed by hugepages. However, the kernel is going to get userfault support for hugepage at some point, and we've not got the rest of the QEMU code to support it yet, so fail neatly with an error like: Postcopy doesn't support hugetlbfs yet (/objects/mem1) Signed-off-by: Dr. David Alan Gilbert --- migration/postcopy-ram.c | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/migration/postcopy-ram.c b/migration/postcopy-ram.c index 9b04778..9723593 100644 --- a/migration/postcopy-ram.c +++ b/migration/postcopy-ram.c @@ -85,6 +85,23 @@ static bool ufd_version_check(int ufd) } /* + * Check for things that postcopy won't support; returns 0 if the block + * is fine. + */ +static int check_range(const char *block_name, void *host_addr, + ram_addr_t offset, ram_addr_t length, void *opaque) +{ + RAMBlock *rb = qemu_ram_block_by_name(block_name); + + if (qemu_ram_pagesize(rb) > getpagesize()) { + error_report("Postcopy doesn't support hugetlbfs yet (%s)", block_name); + return -E2BIG; + } + + return 0; +} + +/* * Note: This has the side effect of munlock'ing all of RAM, that's * normally fine since if the postcopy succeeds it gets turned back on at the * end. @@ -104,6 +121,12 @@ bool postcopy_ram_supported_by_host(void) goto out; } + /* Check for anything about the RAMBlocks we don't support */ + if (qemu_ram_foreach_block(check_range, NULL)) { + /* check_range will have printed its own error */ + goto out; + } + ufd = syscall(__NR_userfaultfd, O_CLOEXEC); if (ufd == -1) { error_report("%s: userfaultfd not available: %s", __func__, -- 2.7.4