The patch titled
page allocator: fix zone statistic accumulation on error path
has been added to the -mm tree. Its filename is
page-allocator-fix-zone-statistic-accumulation-on-error-path.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/SubmitChecklist when testing your code ***
See http://userweb.kernel.org/~akpm/stuff/added-to-mm.txt to find
out what to do about this
The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/
------------------------------------------------------
Subject: page allocator: fix zone statistic accumulation on error path
From: Huang Shijie <shijie8@xxxxxxxxx>
When the `page' returned by __rmqueue() is NULL, the origin code still
adds -(1 << order) to zone's NR_FREE_PAGES item.
The patch fixes it.
Signed-off-by: Huang Shijie <shijie8@xxxxxxxxx>
Cc: Minchan Kim <minchan.kim@xxxxxxxxx>
Cc: Mel Gorman <mel@xxxxxxxxx>
Cc: KOSAKI Motohiro <kosaki.motohiro@xxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
mm/page_alloc.c | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff -puN mm/page_alloc.c~page-allocator-fix-zone-statistic-accumulation-on-error-path mm/page_alloc.c
--- a/mm/page_alloc.c~page-allocator-fix-zone-statistic-accumulation-on-error-path
+++ a/mm/page_alloc.c
@@ -1219,10 +1219,14 @@ again:
}
spin_lock_irqsave(&zone->lock, flags);
page = __rmqueue(zone, order, migratetype);
- __mod_zone_page_state(zone, NR_FREE_PAGES, -(1 << order));
- spin_unlock(&zone->lock);
- if (!page)
+ if (likely(page)) {
+ __mod_zone_page_state(zone, NR_FREE_PAGES,
+ -(1 << order));
+ spin_unlock(&zone->lock);
+ } else {
+ spin_unlock(&zone->lock);
goto failed;
+ }
}
__count_zone_vm_events(PGALLOC, zone, 1 << order);
_
Patches currently in -mm which might be from shijie8@xxxxxxxxx are
page-allocator-fix-zone-statistic-accumulation-on-error-path.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
