Skip to content

Commit

Permalink
postcopy: Check for userfault+hugepage feature
Browse files Browse the repository at this point in the history
We need extra Linux kernel support (~4.11) to support userfaults
on hugetlbfs; check for them.

Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Reviewed-by: Juan Quintela <quintela@redhat.com>
Reviewed-by: Laurent Vivier <lvivier@redhat.com>
Message-Id: <20170224182844.32452-15-dgilbert@redhat.com>
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
  • Loading branch information
dagrh committed Feb 28, 2017
1 parent 61a5021 commit 7e8cafb
Showing 1 changed file with 11 additions and 1 deletion.
12 changes: 11 additions & 1 deletion migration/postcopy-ram.c
Expand Up @@ -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;
}

Expand Down Expand Up @@ -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
Expand Down

0 comments on commit 7e8cafb

Please sign in to comment.