aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Rientjes <[email protected]>2017-07-10 15:48:50 -0700
committerLinus Torvalds <[email protected]>2017-07-10 16:32:31 -0700
commit69ed779a1454d9a57ba3738135eec9be550e0613 (patch)
treefdb48ca5122fcbbd4fbe42910a44d0341d22467f
parent8b9132388964df2cfe151a88fd1dd8219dabf23c (diff)
mm, hugetlb: schedule when potentially allocating many hugepages
A few hugetlb allocators loop while calling the page allocator and can potentially prevent rescheduling if the page allocator slowpath is not utilized. Conditionally schedule when large numbers of hugepages can be allocated. Anshuman: "Fixes a task which was getting hung while writing like 10000 hugepages (16MB on POWER8) into /proc/sys/vm/nr_hugepages." Link: http://lkml.kernel.org/r/[email protected] Signed-off-by: David Rientjes <[email protected]> Reviewed-by: Mike Kravetz <[email protected]> Tested-by: Anshuman Khandual <[email protected]> Cc: Naoya Horiguchi <[email protected]> Cc: "Aneesh Kumar K.V" <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
-rw-r--r--mm/hugetlb.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/mm/hugetlb.c b/mm/hugetlb.c
index 01c11ceb47d6..176e0318960f 100644
--- a/mm/hugetlb.c
+++ b/mm/hugetlb.c
@@ -1781,6 +1781,7 @@ retry:
break;
}
list_add(&page->lru, &surplus_list);
+ cond_resched();
}
allocated += i;
@@ -2249,6 +2250,7 @@ static void __init hugetlb_hstate_alloc_pages(struct hstate *h)
} else if (!alloc_fresh_huge_page(h,
&node_states[N_MEMORY]))
break;
+ cond_resched();
}
if (i < h->max_huge_pages) {
char buf[32];