Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b3c466ce authored by Mel Gorman's avatar Mel Gorman Committed by Linus Torvalds
Browse files

page allocator: do not sanity check order in the fast path 



No user of the allocator API should be passing in an order >= MAX_ORDER
but we check for it on each and every allocation.  Delete this check and
make it a VM_BUG_ON check further down the call path.

[akpm@linux-foundation.org: s/VM_BUG_ON/WARN_ON_ONCE/]
Signed-off-by: default avatarMel Gorman <mel@csn.ul.ie>
Reviewed-by: default avatarChristoph Lameter <cl@linux-foundation.org>
Reviewed-by: default avatarKOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
Reviewed-by: default avatarPekka Enberg <penberg@cs.helsinki.fi>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Nick Piggin <nickpiggin@yahoo.com.au>
Cc: Dave Hansen <dave@linux.vnet.ibm.com>
Cc: Lee Schermerhorn <Lee.Schermerhorn@hp.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent d239171e

include/linux/gfp.h

+0 −6
Original line number Diff line number Diff line
@@ -185,9 +185,6 @@ __alloc_pages(gfp_t gfp_mask, unsigned int order, 
static inline struct page *alloc_pages_node(int nid, gfp_t gfp_mask,

						unsigned int order)

{

	if (unlikely(order >= MAX_ORDER))

		return NULL;



	/* Unknown node is current node */

	if (nid < 0)

		nid = numa_node_id();
@@ -201,9 +198,6 @@ extern struct page *alloc_pages_current(gfp_t gfp_mask, unsigned order); 
static inline struct page *

alloc_pages(gfp_t gfp_mask, unsigned int order)

{

	if (unlikely(order >= MAX_ORDER))

		return NULL;



	return alloc_pages_current(gfp_mask, order);

}

extern struct page *alloc_page_vma(gfp_t gfp_mask,

mm/page_alloc.c

+3 −0
Original line number Diff line number Diff line
@@ -1401,6 +1401,9 @@ get_page_from_freelist(gfp_t gfp_mask, nodemask_t *nodemask, unsigned int order, 


	classzone_idx = zone_idx(preferred_zone);



	if (WARN_ON_ONCE(order >= MAX_ORDER))

		return NULL;



zonelist_scan:

	/*

	 * Scan zonelist, looking for a zone with enough free.