diff options
author | Mel Gorman <mel@csn.ul.ie> | 2009-12-14 20:59:56 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-15 11:53:24 -0500 |
commit | 536240f2bde98216feac87b4891d19a536b8884a (patch) | |
tree | e4755bb36c232262a2ebadb055d8947acb39b672 /mm/hugetlb.c | |
parent | 6927c1dd93fc982140f3a3742ac4b224cd3e02b2 (diff) |
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.c | 3 |
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, | |||
1278 | if (!ret) | 1278 | if (!ret) |
1279 | goto out; | 1279 | goto out; |
1280 | 1280 | ||
1281 | /* Bail for signals. Probably ctrl-c from user */ | ||
1282 | if (signal_pending(current)) | ||
1283 | goto out; | ||
1281 | } | 1284 | } |
1282 | 1285 | ||
1283 | /* | 1286 | /* |