diff options
| author | Andrea Arcangeli <aarcange@redhat.com> | 2011-01-13 15:46:49 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-13 17:32:42 -0800 |
| commit | 5c3240d92e29ae7bfb9cb58a9b37e80ab40894ff (patch) | |
| tree | fffa9f90492b61ef1578e1c41118024c81d77863 /mm/page_alloc.c | |
| parent | 32dba98e085f8b2b4345887df9abf5e0e93bfc12 (diff) | |
| download | linux-3.10-5c3240d92e29ae7bfb9cb58a9b37e80ab40894ff.tar.gz linux-3.10-5c3240d92e29ae7bfb9cb58a9b37e80ab40894ff.tar.bz2 linux-3.10-5c3240d92e29ae7bfb9cb58a9b37e80ab40894ff.zip | |
thp: don't alloc harder for gfp nomemalloc even if nowait
Not worth throwing away the precious reserved free memory pool for
allocations that can fail gracefully (either through mempool or because
they're transhuge allocations later falling back to 4k allocations).
Signed-off-by: Andrea Arcangeli <aarcange@redhat.com>
Acked-by: Rik van Riel <riel@redhat.com>
Reviewed-by: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
Acked-by: Mel Gorman <mel@csn.ul.ie>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'mm/page_alloc.c')
| -rw-r--r-- | mm/page_alloc.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/mm/page_alloc.c b/mm/page_alloc.c index bbd0423f282..e7664b9f706 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -1971,7 +1971,12 @@ gfp_to_alloc_flags(gfp_t gfp_mask) alloc_flags |= (__force int) (gfp_mask & __GFP_HIGH); if (!wait) { - alloc_flags |= ALLOC_HARDER; + /* + * Not worth trying to allocate harder for + * __GFP_NOMEMALLOC even if it can't schedule. + */ + if (!(gfp_mask & __GFP_NOMEMALLOC)) + alloc_flags |= ALLOC_HARDER; /* * Ignore cpuset if GFP_ATOMIC (!wait) rather than fail alloc. * See also cpuset_zone_allowed() comment in kernel/cpuset.c. |