From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45526) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1canAQ-0004AD-5E for qemu-devel@nongnu.org; Mon, 06 Feb 2017 12:33:31 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1canAN-0006TG-1M for qemu-devel@nongnu.org; Mon, 06 Feb 2017 12:33:30 -0500 Received: from mx1.redhat.com ([209.132.183.28]:43688) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1canAM-0006Sq-Rk for qemu-devel@nongnu.org; Mon, 06 Feb 2017 12:33:26 -0500 Received: from int-mx14.intmail.prod.int.phx2.redhat.com (int-mx14.intmail.prod.int.phx2.redhat.com [10.5.11.27]) (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 0A3053DE3F for ; Mon, 6 Feb 2017 17:33:27 +0000 (UTC) From: "Dr. David Alan Gilbert (git)" Date: Mon, 6 Feb 2017 17:33:05 +0000 Message-Id: <20170206173306.20603-16-dgilbert@redhat.com> In-Reply-To: <20170206173306.20603-1-dgilbert@redhat.com> References: <20170206173306.20603-1-dgilbert@redhat.com> Subject: [Qemu-devel] [PATCH v2 15/16] postcopy: Check for userfault+hugepage feature List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org, quintela@redhat.com Cc: aarcange@redhat.com From: "Dr. David Alan Gilbert" We need extra Linux kernel support (~4.11) to support userfaults on hugetlbfs; check for them. Signed-off-by: Dr. David Alan Gilbert Reviewed-by: Juan Quintela --- migration/postcopy-ram.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/migration/postcopy-ram.c b/migration/postcopy-ram.c index 6b30b43..102fb61 100644 --- a/migration/postcopy-ram.c +++ b/migration/postcopy-ram.c @@ -81,6 +81,17 @@ static bool ufd_version_check(int ufd) return false; } + if (getpagesize() != ram_pagesize_summary()) { + bool have_hp = false; + /* We've got a huge page */ +#ifdef UFFD_FEATURE_MISSING_HUGETLBFS + have_hp = api_struct.features & UFFD_FEATURE_MISSING_HUGETLBFS; +#endif + if (!have_hp) { + error_report("Userfault on this host does not support huge pages"); + return false; + } + } return true; } @@ -115,7 +126,6 @@ bool postcopy_ram_supported_by_host(void) if (!ufd_version_check(ufd)) { goto out; } - /* TODO: Only allow huge pages if the kernel supports it */ /* * userfault and mlock don't go together; we'll put it back later if -- 2.9.3