Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1376638
| From | Mel Gorman <mgorman@techsingularity.net> |
|---|---|
| Newsgroups | linux.kernel |
| Subject | [PATCH 15/24] mm, page_alloc: Move might_sleep_if check to the allocator slowpath |
| Date | 2016-04-12 12:20 +0200 |
| Message-ID | <rn3An-5K4-63@gated-at.bofh.it> (permalink) |
| References | <rn3Al-5K4-9@gated-at.bofh.it> |
| Organization | linux.* mail to news gateway |
There is a debugging check for callers that specify __GFP_DIRECT_RECLAIM from a context that cannot sleep. Triggering this is almost certainly a bug but it's also overhead in the fast path. Move the check to the slow path. It'll be harder to trigger as it'll only be checked when watermarks are depleted but it'll also only be checked in a path that can sleep. Signed-off-by: Mel Gorman <mgorman@techsingularity.net> --- mm/page_alloc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mm/page_alloc.c b/mm/page_alloc.c index e50e754ec9eb..73dc0413e997 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -3176,6 +3176,8 @@ __alloc_pages_slowpath(gfp_t gfp_mask, unsigned int order, return NULL; } + might_sleep_if(gfp_mask & __GFP_DIRECT_RECLAIM); + /* * We also sanity check to catch abuse of atomic reserves being used by * callers that are not in atomic context. @@ -3369,8 +3371,6 @@ __alloc_pages_nodemask(gfp_t gfp_mask, unsigned int order, lockdep_trace_alloc(gfp_mask); - might_sleep_if(gfp_mask & __GFP_DIRECT_RECLAIM); - if (should_fail_alloc_page(gfp_mask, order)) return NULL; -- 2.6.4
Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread
[PATCH 00/24] Optimise page alloc/free fast paths v2 Mel Gorman <mgorman@techsingularity.net> - 2016-04-12 12:20 +0200 [PATCH 02/24] mm, page_alloc: Use new PageAnonHead helper in the free page fast path Mel Gorman <mgorman@techsingularity.net> - 2016-04-12 12:20 +0200 [PATCH 18/24] mm, page_alloc: Shortcut watermark checks for order-0 pages Mel Gorman <mgorman@techsingularity.net> - 2016-04-12 12:20 +0200 [PATCH 05/24] mm, page_alloc: Inline the fast path of the zonelist iterator Mel Gorman <mgorman@techsingularity.net> - 2016-04-12 12:20 +0200 [PATCH 15/24] mm, page_alloc: Move might_sleep_if check to the allocator slowpath Mel Gorman <mgorman@techsingularity.net> - 2016-04-12 12:20 +0200 [PATCH 19/24] mm, page_alloc: Avoid looking up the first zone in a zonelist twice Mel Gorman <mgorman@techsingularity.net> - 2016-04-12 12:20 +0200 [PATCH 14/24] mm, page_alloc: Simplify last cpupid reset Mel Gorman <mgorman@techsingularity.net> - 2016-04-12 12:20 +0200 [PATCH 03/24] mm, page_alloc: Reduce branches in zone_statistics Mel Gorman <mgorman@techsingularity.net> - 2016-04-12 12:20 +0200 [PATCH 22/24] mm, page_alloc: Check once if a zone has isolated pageblocks Mel Gorman <mgorman@techsingularity.net> - 2016-04-12 12:20 +0200 [PATCH 21/24] cpuset: use static key better and convert to new API Mel Gorman <mgorman@techsingularity.net> - 2016-04-12 12:20 +0200 [PATCH 11/24] mm, page_alloc: Remove unnecessary initialisation in get_page_from_freelist Mel Gorman <mgorman@techsingularity.net> - 2016-04-12 12:20 +0200 [PATCH 24/24] mm, page_alloc: Do not lookup pcp migratetype during bulk free Mel Gorman <mgorman@techsingularity.net> - 2016-04-12 12:20 +0200 [PATCH 13/24] mm, page_alloc: Remove redundant check for empty zonelist Mel Gorman <mgorman@techsingularity.net> - 2016-04-12 12:20 +0200 [PATCH 23/24] mm, page_alloc: Remove unnecessary variable from free_pcppages_bulk Mel Gorman <mgorman@techsingularity.net> - 2016-04-12 12:20 +0200 [PATCH 08/24] mm, page_alloc: Convert alloc_flags to unsigned Mel Gorman <mgorman@techsingularity.net> - 2016-04-12 12:20 +0200 [PATCH 01/24] mm, page_alloc: Only check PageCompound for high-order pages Mel Gorman <mgorman@techsingularity.net> - 2016-04-12 12:30 +0200
csiph-web