|
@@ -2322,23 +2322,17 @@ static struct page
|
|
|
int node)
|
|
int node)
|
|
|
{
|
|
{
|
|
|
VM_BUG_ON_PAGE(*hpage, *hpage);
|
|
VM_BUG_ON_PAGE(*hpage, *hpage);
|
|
|
|
|
+
|
|
|
/*
|
|
/*
|
|
|
- * Allocate the page while the vma is still valid and under
|
|
|
|
|
- * the mmap_sem read mode so there is no memory allocation
|
|
|
|
|
- * later when we take the mmap_sem in write mode. This is more
|
|
|
|
|
- * friendly behavior (OTOH it may actually hide bugs) to
|
|
|
|
|
- * filesystems in userland with daemons allocating memory in
|
|
|
|
|
- * the userland I/O paths. Allocating memory with the
|
|
|
|
|
- * mmap_sem in read mode is good idea also to allow greater
|
|
|
|
|
- * scalability.
|
|
|
|
|
|
|
+ * Before allocating the hugepage, release the mmap_sem read lock.
|
|
|
|
|
+ * The allocation can take potentially a long time if it involves
|
|
|
|
|
+ * sync compaction, and we do not need to hold the mmap_sem during
|
|
|
|
|
+ * that. We will recheck the vma after taking it again in write mode.
|
|
|
*/
|
|
*/
|
|
|
|
|
+ up_read(&mm->mmap_sem);
|
|
|
|
|
+
|
|
|
*hpage = alloc_pages_exact_node(node, alloc_hugepage_gfpmask(
|
|
*hpage = alloc_pages_exact_node(node, alloc_hugepage_gfpmask(
|
|
|
khugepaged_defrag(), __GFP_OTHER_NODE), HPAGE_PMD_ORDER);
|
|
khugepaged_defrag(), __GFP_OTHER_NODE), HPAGE_PMD_ORDER);
|
|
|
- /*
|
|
|
|
|
- * After allocating the hugepage, release the mmap_sem read lock in
|
|
|
|
|
- * preparation for taking it in write mode.
|
|
|
|
|
- */
|
|
|
|
|
- up_read(&mm->mmap_sem);
|
|
|
|
|
if (unlikely(!*hpage)) {
|
|
if (unlikely(!*hpage)) {
|
|
|
count_vm_event(THP_COLLAPSE_ALLOC_FAILED);
|
|
count_vm_event(THP_COLLAPSE_ALLOC_FAILED);
|
|
|
*hpage = ERR_PTR(-ENOMEM);
|
|
*hpage = ERR_PTR(-ENOMEM);
|