From: Vlastimil Babka <vbabka@suse.cz> To: Andrew Morton <akpm@linux-foundation.org>, Joonsoo Kim <iamjoonsoo.kim@lge.com>, Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com> Cc: linux-kernel@vger.kernel.org, linux-mm@kvack.org, Mel Gorman <mgorman@suse.de>, Yong-Taek Lee <ytk.lee@samsung.com>, Vlastimil Babka <vbabka@suse.cz>, Minchan Kim <minchan@kernel.org>, KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>, Marek Szyprowski <m.szyprowski@samsung.com>, Hugh Dickins <hughd@google.com>, Rik van Riel <riel@redhat.com>, Michal Nazarewicz <mina86@mina86.com> Subject: [PATCH 2/2] mm/page_alloc: DEBUG_VM checks for free_list placement of CMA and RESERVE pages Date: Thu, 3 Apr 2014 17:40:18 +0200 [thread overview] Message-ID: <1396539618-31362-2-git-send-email-vbabka@suse.cz> (raw) In-Reply-To: <1396539618-31362-1-git-send-email-vbabka@suse.cz> For the MIGRATE_RESERVE pages, it is important they do not get misplaced on free_list of other migratetype, otherwise the whole MIGRATE_RESERVE pageblock might be changed to other migratetype in try_to_steal_freepages(). For MIGRATE_CMA, the pages also must not go to a different free_list, otherwise they could get allocated as unmovable and result in CMA failure. This is ensured by setting the freepage_migratetype appropriately when placing pages on pcp lists, and using the information when releasing them back to free_list. It is also assumed that CMA and RESERVE pageblocks are created only in the init phase. This patch adds DEBUG_VM checks to catch any regressions introduced for this invariant. Cc: Yong-Taek Lee <ytk.lee@samsung.com> Cc: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com> Cc: Joonsoo Kim <iamjoonsoo.kim@lge.com> Cc: Mel Gorman <mgorman@suse.de> Cc: Minchan Kim <minchan@kernel.org> Cc: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com> Cc: Marek Szyprowski <m.szyprowski@samsung.com> Cc: Hugh Dickins <hughd@google.com> Cc: Rik van Riel <riel@redhat.com> Cc: Michal Nazarewicz <mina86@mina86.com> Signed-off-by: Vlastimil Babka <vbabka@suse.cz> --- include/linux/mm.h | 19 +++++++++++++++++++ mm/page_alloc.c | 3 +++ 2 files changed, 22 insertions(+) diff --git a/include/linux/mm.h b/include/linux/mm.h index c1b7414..27a74ba 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -280,6 +280,25 @@ static inline int get_freepage_migratetype(struct page *page) } /* + * Check that a freepage cannot end up on a wrong free_list for "sensitive" + * migratetypes. Return false if it could. Useful for VM_BUG_ON checks. + */ +static inline bool check_freepage_migratetype(struct page *page) +{ + int pageblock_mt = get_pageblock_migratetype(page); + int freepage_mt = get_freepage_migratetype(page); + + /* + * For RESERVE and CMA pageblocks, the freepage_migratetype must + * match their migratetype. For other pageblocks, we don't care. + */ + if (pageblock_mt != MIGRATE_RESERVE && !is_migrate_cma(pageblock_mt)) + return true; + + return (freepage_mt == pageblock_mt); +} + +/* * FIXME: take this include out, include page-flags.h in * files which need it (119 of them) */ diff --git a/mm/page_alloc.c b/mm/page_alloc.c index 2dbaba1..0ee9f8c 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -697,6 +697,8 @@ static void free_pcppages_bulk(struct zone *zone, int count, page = list_entry(list->prev, struct page, lru); /* must delete as __free_one_page list manipulates */ list_del(&page->lru); + + VM_BUG_ON(!check_freepage_migratetype(page)); mt = get_freepage_migratetype(page); /* MIGRATE_MOVABLE list may include MIGRATE_RESERVEs */ __free_one_page(page, zone, 0, mt); @@ -1190,6 +1192,7 @@ static int rmqueue_bulk(struct zone *zone, unsigned int order, struct page *page = __rmqueue(zone, order, migratetype); if (unlikely(page == NULL)) break; + VM_BUG_ON(!check_freepage_migratetype(page)); /* * Split buddy pages returned by expand() are received here -- 1.8.4.5
WARNING: multiple messages have this Message-ID (diff)
From: Vlastimil Babka <vbabka@suse.cz> To: Andrew Morton <akpm@linux-foundation.org>, Joonsoo Kim <iamjoonsoo.kim@lge.com>, Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com> Cc: linux-kernel@vger.kernel.org, linux-mm@kvack.org, Mel Gorman <mgorman@suse.de>, Yong-Taek Lee <ytk.lee@samsung.com>, Vlastimil Babka <vbabka@suse.cz>, Minchan Kim <minchan@kernel.org>, KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>, Marek Szyprowski <m.szyprowski@samsung.com>, Hugh Dickins <hughd@google.com>, Rik van Riel <riel@redhat.com>, Michal Nazarewicz <mina86@mina86.com> Subject: [PATCH 2/2] mm/page_alloc: DEBUG_VM checks for free_list placement of CMA and RESERVE pages Date: Thu, 3 Apr 2014 17:40:18 +0200 [thread overview] Message-ID: <1396539618-31362-2-git-send-email-vbabka@suse.cz> (raw) In-Reply-To: <1396539618-31362-1-git-send-email-vbabka@suse.cz> For the MIGRATE_RESERVE pages, it is important they do not get misplaced on free_list of other migratetype, otherwise the whole MIGRATE_RESERVE pageblock might be changed to other migratetype in try_to_steal_freepages(). For MIGRATE_CMA, the pages also must not go to a different free_list, otherwise they could get allocated as unmovable and result in CMA failure. This is ensured by setting the freepage_migratetype appropriately when placing pages on pcp lists, and using the information when releasing them back to free_list. It is also assumed that CMA and RESERVE pageblocks are created only in the init phase. This patch adds DEBUG_VM checks to catch any regressions introduced for this invariant. Cc: Yong-Taek Lee <ytk.lee@samsung.com> Cc: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com> Cc: Joonsoo Kim <iamjoonsoo.kim@lge.com> Cc: Mel Gorman <mgorman@suse.de> Cc: Minchan Kim <minchan@kernel.org> Cc: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com> Cc: Marek Szyprowski <m.szyprowski@samsung.com> Cc: Hugh Dickins <hughd@google.com> Cc: Rik van Riel <riel@redhat.com> Cc: Michal Nazarewicz <mina86@mina86.com> Signed-off-by: Vlastimil Babka <vbabka@suse.cz> --- include/linux/mm.h | 19 +++++++++++++++++++ mm/page_alloc.c | 3 +++ 2 files changed, 22 insertions(+) diff --git a/include/linux/mm.h b/include/linux/mm.h index c1b7414..27a74ba 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -280,6 +280,25 @@ static inline int get_freepage_migratetype(struct page *page) } /* + * Check that a freepage cannot end up on a wrong free_list for "sensitive" + * migratetypes. Return false if it could. Useful for VM_BUG_ON checks. + */ +static inline bool check_freepage_migratetype(struct page *page) +{ + int pageblock_mt = get_pageblock_migratetype(page); + int freepage_mt = get_freepage_migratetype(page); + + /* + * For RESERVE and CMA pageblocks, the freepage_migratetype must + * match their migratetype. For other pageblocks, we don't care. + */ + if (pageblock_mt != MIGRATE_RESERVE && !is_migrate_cma(pageblock_mt)) + return true; + + return (freepage_mt == pageblock_mt); +} + +/* * FIXME: take this include out, include page-flags.h in * files which need it (119 of them) */ diff --git a/mm/page_alloc.c b/mm/page_alloc.c index 2dbaba1..0ee9f8c 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -697,6 +697,8 @@ static void free_pcppages_bulk(struct zone *zone, int count, page = list_entry(list->prev, struct page, lru); /* must delete as __free_one_page list manipulates */ list_del(&page->lru); + + VM_BUG_ON(!check_freepage_migratetype(page)); mt = get_freepage_migratetype(page); /* MIGRATE_MOVABLE list may include MIGRATE_RESERVEs */ __free_one_page(page, zone, 0, mt); @@ -1190,6 +1192,7 @@ static int rmqueue_bulk(struct zone *zone, unsigned int order, struct page *page = __rmqueue(zone, order, migratetype); if (unlikely(page == NULL)) break; + VM_BUG_ON(!check_freepage_migratetype(page)); /* * Split buddy pages returned by expand() are received here -- 1.8.4.5 -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@kvack.org. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>
next prev parent reply other threads:[~2014-04-03 15:40 UTC|newest] Thread overview: 52+ messages / expand[flat|nested] mbox.gz Atom feed top 2014-03-06 17:35 [PATCH v3] mm/page_alloc: fix freeing of MIGRATE_RESERVE migratetype pages Bartlomiej Zolnierkiewicz 2014-03-06 17:35 ` Bartlomiej Zolnierkiewicz 2014-03-21 14:16 ` Vlastimil Babka 2014-03-21 14:16 ` Vlastimil Babka 2014-03-25 13:47 ` Bartlomiej Zolnierkiewicz 2014-03-25 13:47 ` Bartlomiej Zolnierkiewicz 2014-04-03 15:36 ` Vlastimil Babka 2014-04-03 15:36 ` Vlastimil Babka 2014-04-03 15:40 ` [PATCH 1/2] mm/page_alloc: prevent MIGRATE_RESERVE pages from being misplaced Vlastimil Babka 2014-04-03 15:40 ` Vlastimil Babka 2014-04-03 15:40 ` Vlastimil Babka [this message] 2014-04-03 15:40 ` [PATCH 2/2] mm/page_alloc: DEBUG_VM checks for free_list placement of CMA and RESERVE pages Vlastimil Babka 2014-04-16 1:09 ` Joonsoo Kim 2014-04-16 1:09 ` Joonsoo Kim 2014-04-30 21:46 ` Sasha Levin 2014-04-30 21:46 ` Sasha Levin 2014-05-02 12:08 ` Vlastimil Babka 2014-05-02 12:08 ` Vlastimil Babka 2014-05-05 14:36 ` Sasha Levin 2014-05-05 14:36 ` Sasha Levin 2014-05-05 15:50 ` Vlastimil Babka 2014-05-05 15:50 ` Vlastimil Babka 2014-05-05 16:37 ` Sasha Levin 2014-05-05 16:37 ` Sasha Levin 2014-05-07 1:33 ` Minchan Kim 2014-05-07 1:33 ` Minchan Kim 2014-05-07 14:59 ` Vlastimil Babka 2014-05-07 14:59 ` Vlastimil Babka 2014-05-08 5:54 ` Joonsoo Kim 2014-05-08 5:54 ` Joonsoo Kim 2014-05-08 6:19 ` Minchan Kim 2014-05-08 6:19 ` Minchan Kim 2014-05-08 22:34 ` Andrew Morton 2014-05-08 22:34 ` Andrew Morton 2014-05-13 1:40 ` Joonsoo Kim 2014-05-13 1:40 ` Joonsoo Kim 2014-05-08 8:51 ` Mel Gorman 2014-05-08 8:51 ` Mel Gorman 2014-05-12 8:28 ` Vlastimil Babka 2014-05-12 8:28 ` Vlastimil Babka 2014-05-13 1:37 ` Joonsoo Kim 2014-05-13 1:37 ` Joonsoo Kim 2014-05-14 3:47 ` Sasha Levin 2014-05-14 3:47 ` Sasha Levin 2014-05-14 5:19 ` Hugh Dickins 2014-05-14 5:19 ` Hugh Dickins 2014-05-14 9:01 ` Vlastimil Babka 2014-05-14 9:01 ` Vlastimil Babka 2014-04-16 0:56 ` [PATCH 1/2] mm/page_alloc: prevent MIGRATE_RESERVE pages from being misplaced Joonsoo Kim 2014-04-16 0:56 ` Joonsoo Kim 2014-04-17 23:29 ` Minchan Kim 2014-04-17 23:29 ` Minchan Kim
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1396539618-31362-2-git-send-email-vbabka@suse.cz \ --to=vbabka@suse.cz \ --cc=akpm@linux-foundation.org \ --cc=b.zolnierkie@samsung.com \ --cc=hughd@google.com \ --cc=iamjoonsoo.kim@lge.com \ --cc=kosaki.motohiro@jp.fujitsu.com \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-mm@kvack.org \ --cc=m.szyprowski@samsung.com \ --cc=mgorman@suse.de \ --cc=mina86@mina86.com \ --cc=minchan@kernel.org \ --cc=riel@redhat.com \ --cc=ytk.lee@samsung.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.