summaryrefslogtreecommitdiff
path: root/mm/hugetlb.c
diff options
context:
space:
mode:
authorMel Gorman <mel@csn.ul.ie>2009-12-14 17:59:56 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2009-12-15 08:53:24 -0800
commit536240f2bde98216feac87b4891d19a536b8884a (patch)
treee4755bb36c232262a2ebadb055d8947acb39b672 /mm/hugetlb.c
parent6927c1dd93fc982140f3a3742ac4b224cd3e02b2 (diff)
downloadlinux-3.10-536240f2bde98216feac87b4891d19a536b8884a.tar.gz
linux-3.10-536240f2bde98216feac87b4891d19a536b8884a.tar.bz2
linux-3.10-536240f2bde98216feac87b4891d19a536b8884a.zip
hugetlb: abort a hugepage pool resize if a signal is pending
If a user asks for a hugepage pool resize but specified a large number, the machine can begin trashing. In response, they might hit ctrl-c but signals are ignored and the pool resize continues until it fails an allocation. This can take a considerable amount of time so this patch aborts a pool resize if a signal is pending. Suggested by Dave Hansen. Signed-off-by: Mel Gorman <mel@csn.ul.ie> Cc: Dave Hansen <dave@linux.vnet.ibm.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'mm/hugetlb.c')
-rw-r--r--mm/hugetlb.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/mm/hugetlb.c b/mm/hugetlb.c
index 6df8065039e..65f38c21820 100644
--- a/mm/hugetlb.c
+++ b/mm/hugetlb.c
@@ -1278,6 +1278,9 @@ static unsigned long set_max_huge_pages(struct hstate *h, unsigned long count,
if (!ret)
goto out;
+ /* Bail for signals. Probably ctrl-c from user */
+ if (signal_pending(current))
+ goto out;
}
/*