The patch titled
page allocator: do not sanity check order in the fast path
has been removed from the -mm tree. Its filename was
page-allocator-do-not-sanity-check-order-in-the-fast-path.patch
This patch was dropped because it was merged into mainline or a subsystem tree
The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/
------------------------------------------------------
Subject: page allocator: do not sanity check order in the fast path
From: Mel Gorman <mel@xxxxxxxxx>
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@xxxxxxxxxxxxxxxxxxxx: s/VM_BUG_ON/WARN_ON_ONCE/]
Signed-off-by: Mel Gorman <mel@xxxxxxxxx>
Reviewed-by: Christoph Lameter <cl@xxxxxxxxxxxxxxxxxxxx>
Reviewed-by: KOSAKI Motohiro <kosaki.motohiro@xxxxxxxxxxxxxx>
Reviewed-by: Pekka Enberg <penberg@xxxxxxxxxxxxxx>
Cc: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx>
Cc: Nick Piggin <nickpiggin@xxxxxxxxxxxx>
Cc: Dave Hansen <dave@xxxxxxxxxxxxxxxxxx>
Cc: Lee Schermerhorn <Lee.Schermerhorn@xxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
include/linux/gfp.h | 6 ------
mm/page_alloc.c | 3 +++
2 files changed, 3 insertions(+), 6 deletions(-)
diff -puN include/linux/gfp.h~page-allocator-do-not-sanity-check-order-in-the-fast-path include/linux/gfp.h
--- a/include/linux/gfp.h~page-allocator-do-not-sanity-check-order-in-the-fast-path
+++ a/include/linux/gfp.h
@@ -185,9 +185,6 @@ __alloc_pages(gfp_t gfp_mask, unsigned i
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(
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,
diff -puN mm/page_alloc.c~page-allocator-do-not-sanity-check-order-in-the-fast-path mm/page_alloc.c
--- a/mm/page_alloc.c~page-allocator-do-not-sanity-check-order-in-the-fast-path
+++ a/mm/page_alloc.c
@@ -1401,6 +1401,9 @@ get_page_from_freelist(gfp_t gfp_mask, n
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.
_
Patches currently in -mm which might be from mel@xxxxxxxxx are
origin.patch
linux-next.patch
page_alloc-oops-when-setting-percpu_pagelist_fraction.patch
memcg-fix-lru-rotation-in-isolate_pages.patch
add-debugging-aid-for-memory-initialisation-problems.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
