Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1534585

[PATCH 1/2] mm, page_alloc: Keep pcp count and list contents in sync if struct page is corrupted

Show all headers | View raw

Vlastimil Babka pointed out that commit 479f854a207c ("mm, page_alloc:
defer debugging checks of pages allocated from the PCP") will allow the
per-cpu list counter to be out of sync with the per-cpu list contents
if a struct page is corrupted. This patch keeps the accounting in sync.

Fixes: 479f854a207c ("mm, page_alloc: defer debugging checks of pages allocated from the PCP")
Signed-off-by: Mel Gorman <mgorman@suse.de>
cc: stable@vger.kernel.org [4.7+]
---
 mm/page_alloc.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index 6de9440e3ae2..777ed59570df 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -2192,7 +2192,7 @@ static int rmqueue_bulk(struct zone *zone, unsigned int order,
 			unsigned long count, struct list_head *list,
 			int migratetype, bool cold)
 {
-	int i;
+	int i, alloced = 0;
 
 	spin_lock(&zone->lock);
 	for (i = 0; i < count; ++i) {
@@ -2217,13 +2217,14 @@ static int rmqueue_bulk(struct zone *zone, unsigned int order,
 		else
 			list_add_tail(&page->lru, list);
 		list = &page->lru;
+		alloced++;
 		if (is_migrate_cma(get_pcppage_migratetype(page)))
 			__mod_zone_page_state(zone, NR_FREE_CMA_PAGES,
 					      -(1 << order));
 	}
 	__mod_zone_page_state(zone, NR_FREE_PAGES, -(i << order));
 	spin_unlock(&zone->lock);
-	return i;
+	return alloced;
 }
 
 #ifdef CONFIG_NUMA
-- 
2.10.2

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH 0/2] High-order per-cpu cache v5 Mel Gorman <mgorman@techsingularity.net> - 2016-12-02 01:30 +0100
  [PATCH 1/2] mm, page_alloc: Keep pcp count and list contents in sync if struct page is corrupted Mel Gorman <mgorman@techsingularity.net> - 2016-12-02 01:30 +0100
    Re: [PATCH 1/2] mm, page_alloc: Keep pcp count and list contents in sync if struct page is corrupted "Hillf Danton" <hillf.zj@alibaba-inc.com> - 2016-12-02 05:00 +0100
      Re: [PATCH 1/2] mm, page_alloc: Keep pcp count and list contents in  sync if struct page is corrupted Vlastimil Babka <vbabka@suse.cz> - 2016-12-02 07:20 +0100
        Re: [PATCH 1/2] mm, page_alloc: Keep pcp count and list contents in sync if struct page is corrupted "Hillf Danton" <hillf.zj@alibaba-inc.com> - 2016-12-02 10:40 +0100
          Re: [PATCH 1/2] mm, page_alloc: Keep pcp count and list contents in  sync if struct page is corrupted Michal Hocko <mhocko@kernel.org> - 2016-12-02 11:20 +0100
            Re: [PATCH 1/2] mm, page_alloc: Keep pcp count and list contents in  sync if struct page is corrupted Mel Gorman <mgorman@techsingularity.net> - 2016-12-02 12:10 +0100
    Re: [PATCH 1/2] mm, page_alloc: Keep pcp count and list contents in  sync if struct page is corrupted Michal Hocko <mhocko@kernel.org> - 2016-12-02 09:20 +0100
      Re: [PATCH 1/2] mm, page_alloc: Keep pcp count and list contents in  sync if struct page is corrupted Mel Gorman <mgorman@techsingularity.net> - 2016-12-02 10:50 +0100
        Re: [PATCH 1/2] mm, page_alloc: Keep pcp count and list contents in  sync if struct page is corrupted Michal Hocko <mhocko@kernel.org> - 2016-12-02 11:10 +0100
  [PATCH 2/2] mm: page_alloc: High-order per-cpu page allocator v5 Mel Gorman <mgorman@techsingularity.net> - 2016-12-02 01:30 +0100
    Re: [PATCH 2/2] mm: page_alloc: High-order per-cpu page allocator v5 Joonsoo Kim <iamjoonsoo.kim@lge.com> - 2016-12-02 07:10 +0100
      Re: [PATCH 2/2] mm: page_alloc: High-order per-cpu page allocator v5 Michal Hocko <mhocko@kernel.org> - 2016-12-02 09:30 +0100
        Re: [PATCH 2/2] mm: page_alloc: High-order per-cpu page allocator v5 Joonsoo Kim <iamjoonsoo.kim@lge.com> - 2016-12-05 04:10 +0100
      Re: [PATCH 2/2] mm: page_alloc: High-order per-cpu page allocator v5 Mel Gorman <mgorman@techsingularity.net> - 2016-12-02 10:10 +0100
        Re: [PATCH 2/2] mm: page_alloc: High-order per-cpu page allocator v5 Joonsoo Kim <iamjoonsoo.kim@lge.com> - 2016-12-05 04:10 +0100
          Re: [PATCH 2/2] mm: page_alloc: High-order per-cpu page allocator v5 Mel Gorman <mgorman@techsingularity.net> - 2016-12-05 11:00 +0100
            Re: [PATCH 2/2] mm: page_alloc: High-order per-cpu page allocator v5 Joonsoo Kim <iamjoonsoo.kim@lge.com> - 2016-12-06 03:50 +0100
              Re: [PATCH 2/2] mm: page_alloc: High-order per-cpu page allocator v5 Mel Gorman <mgorman@techsingularity.net> - 2016-12-06 15:00 +0100
    Re: [PATCH 2/2] mm: page_alloc: High-order per-cpu page allocator v5 Michal Hocko <mhocko@kernel.org> - 2016-12-02 09:30 +0100

csiph-web