From: Minchan Kim <minchan@kernel.org> To: Andrew Morton <akpm@linux-foundation.org> Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, Mel Gorman <mgorman@suse.de>, Kamezawa Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>, Yasuaki Ishimatsu <isimatu.yasuaki@jp.fujitsu.com>, Xishi Qiu <qiuxishi@huawei.com>, Wen Congyang <wency@cn.fujitsu.com>, Minchan Kim <minchan@kernel.org> Subject: [PATCH v2 1/3] use get_page_migratetype instead of page_private Date: Thu, 6 Sep 2012 14:16:57 +0900 [thread overview] Message-ID: <1346908619-16056-2-git-send-email-minchan@kernel.org> (raw) In-Reply-To: <1346908619-16056-1-git-send-email-minchan@kernel.org> page allocator uses set_page_private and page_private for handling migratetype when it frees page. Let's replace them with [set|get] _freepage_migratetype to make it more clear. * from v1 * Change set_page_migratetype with set_freepage_migratetype * Add comment on set_freepage_migratetype Signed-off-by: Minchan Kim <minchan@kernel.org> --- include/linux/mm.h | 12 ++++++++++++ mm/page_alloc.c | 10 ++++++---- mm/page_isolation.c | 2 +- 3 files changed, 19 insertions(+), 5 deletions(-) diff --git a/include/linux/mm.h b/include/linux/mm.h index 0514fe9..84d1663f 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -237,6 +237,18 @@ struct inode; #define page_private(page) ((page)->private) #define set_page_private(page, v) ((page)->private = (v)) +/* It's valid only if the page is free path or free_list */ +static inline void set_freepage_migratetype(struct page *page, int migratetype) +{ + set_page_private(page, migratetype); +} + +/* It's valid only if the page is free path or free_list */ +static inline int get_freepage_migratetype(struct page *page) +{ + return page_private(page); +} + /* * 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 ba3100a..f5ba236 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -671,8 +671,10 @@ static void free_pcppages_bulk(struct zone *zone, int count, /* must delete as __free_one_page list manipulates */ list_del(&page->lru); /* MIGRATE_MOVABLE list may include MIGRATE_RESERVEs */ - __free_one_page(page, zone, 0, page_private(page)); - trace_mm_page_pcpu_drain(page, 0, page_private(page)); + __free_one_page(page, zone, 0, + get_freepage_migratetype(page)); + trace_mm_page_pcpu_drain(page, 0, + get_freepage_migratetype(page)); } while (--to_free && --batch_free && !list_empty(list)); } __mod_zone_page_state(zone, NR_FREE_PAGES, count); @@ -1134,7 +1136,7 @@ static int rmqueue_bulk(struct zone *zone, unsigned int order, if (!is_migrate_cma(mt) && mt != MIGRATE_ISOLATE) mt = migratetype; } - set_page_private(page, mt); + set_freepage_migratetype(page, mt); list = &page->lru; } __mod_zone_page_state(zone, NR_FREE_PAGES, -(i << order)); @@ -1301,7 +1303,7 @@ void free_hot_cold_page(struct page *page, int cold) return; migratetype = get_pageblock_migratetype(page); - set_page_private(page, migratetype); + set_freepage_migratetype(page, migratetype); local_irq_save(flags); if (unlikely(wasMlocked)) free_page_mlock(page); diff --git a/mm/page_isolation.c b/mm/page_isolation.c index 247d1f1..87a7929 100644 --- a/mm/page_isolation.c +++ b/mm/page_isolation.c @@ -196,7 +196,7 @@ __test_page_isolated_in_pageblock(unsigned long pfn, unsigned long end_pfn) if (PageBuddy(page)) pfn += 1 << page_order(page); else if (page_count(page) == 0 && - page_private(page) == MIGRATE_ISOLATE) + get_freepage_migratetype(page) == MIGRATE_ISOLATE) pfn += 1; else break; -- 1.7.9.5
WARNING: multiple messages have this Message-ID (diff)
From: Minchan Kim <minchan@kernel.org> To: Andrew Morton <akpm@linux-foundation.org> Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, Mel Gorman <mgorman@suse.de>, Kamezawa Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>, Yasuaki Ishimatsu <isimatu.yasuaki@jp.fujitsu.com>, Xishi Qiu <qiuxishi@huawei.com>, Wen Congyang <wency@cn.fujitsu.com>, Minchan Kim <minchan@kernel.org> Subject: [PATCH v2 1/3] use get_page_migratetype instead of page_private Date: Thu, 6 Sep 2012 14:16:57 +0900 [thread overview] Message-ID: <1346908619-16056-2-git-send-email-minchan@kernel.org> (raw) In-Reply-To: <1346908619-16056-1-git-send-email-minchan@kernel.org> page allocator uses set_page_private and page_private for handling migratetype when it frees page. Let's replace them with [set|get] _freepage_migratetype to make it more clear. * from v1 * Change set_page_migratetype with set_freepage_migratetype * Add comment on set_freepage_migratetype Signed-off-by: Minchan Kim <minchan@kernel.org> --- include/linux/mm.h | 12 ++++++++++++ mm/page_alloc.c | 10 ++++++---- mm/page_isolation.c | 2 +- 3 files changed, 19 insertions(+), 5 deletions(-) diff --git a/include/linux/mm.h b/include/linux/mm.h index 0514fe9..84d1663f 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -237,6 +237,18 @@ struct inode; #define page_private(page) ((page)->private) #define set_page_private(page, v) ((page)->private = (v)) +/* It's valid only if the page is free path or free_list */ +static inline void set_freepage_migratetype(struct page *page, int migratetype) +{ + set_page_private(page, migratetype); +} + +/* It's valid only if the page is free path or free_list */ +static inline int get_freepage_migratetype(struct page *page) +{ + return page_private(page); +} + /* * 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 ba3100a..f5ba236 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -671,8 +671,10 @@ static void free_pcppages_bulk(struct zone *zone, int count, /* must delete as __free_one_page list manipulates */ list_del(&page->lru); /* MIGRATE_MOVABLE list may include MIGRATE_RESERVEs */ - __free_one_page(page, zone, 0, page_private(page)); - trace_mm_page_pcpu_drain(page, 0, page_private(page)); + __free_one_page(page, zone, 0, + get_freepage_migratetype(page)); + trace_mm_page_pcpu_drain(page, 0, + get_freepage_migratetype(page)); } while (--to_free && --batch_free && !list_empty(list)); } __mod_zone_page_state(zone, NR_FREE_PAGES, count); @@ -1134,7 +1136,7 @@ static int rmqueue_bulk(struct zone *zone, unsigned int order, if (!is_migrate_cma(mt) && mt != MIGRATE_ISOLATE) mt = migratetype; } - set_page_private(page, mt); + set_freepage_migratetype(page, mt); list = &page->lru; } __mod_zone_page_state(zone, NR_FREE_PAGES, -(i << order)); @@ -1301,7 +1303,7 @@ void free_hot_cold_page(struct page *page, int cold) return; migratetype = get_pageblock_migratetype(page); - set_page_private(page, migratetype); + set_freepage_migratetype(page, migratetype); local_irq_save(flags); if (unlikely(wasMlocked)) free_page_mlock(page); diff --git a/mm/page_isolation.c b/mm/page_isolation.c index 247d1f1..87a7929 100644 --- a/mm/page_isolation.c +++ b/mm/page_isolation.c @@ -196,7 +196,7 @@ __test_page_isolated_in_pageblock(unsigned long pfn, unsigned long end_pfn) if (PageBuddy(page)) pfn += 1 << page_order(page); else if (page_count(page) == 0 && - page_private(page) == MIGRATE_ISOLATE) + get_freepage_migratetype(page) == MIGRATE_ISOLATE) pfn += 1; else break; -- 1.7.9.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:[~2012-09-06 5:16 UTC|newest] Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top 2012-09-06 5:16 [PATCH v2 0/3] memory-hotplug: handle page race between allocation and isolation Minchan Kim 2012-09-06 5:16 ` Minchan Kim 2012-09-06 5:16 ` Minchan Kim [this message] 2012-09-06 5:16 ` [PATCH v2 1/3] use get_page_migratetype instead of page_private Minchan Kim 2012-09-06 6:06 ` Kamezawa Hiroyuki 2012-09-06 6:06 ` Kamezawa Hiroyuki 2012-09-06 5:16 ` [PATCH v2 2/3] mm: remain migratetype in freed page Minchan Kim 2012-09-06 5:16 ` Minchan Kim 2012-09-06 6:13 ` Kamezawa Hiroyuki 2012-09-06 6:13 ` Kamezawa Hiroyuki 2012-09-07 0:08 ` Minchan Kim 2012-09-07 0:08 ` Minchan Kim 2012-09-06 5:16 ` [PATCH v2 3/3] memory-hotplug: bug fix race between isolation and allocation Minchan Kim 2012-09-06 5:16 ` Minchan Kim 2012-09-06 6:18 ` Kamezawa Hiroyuki 2012-09-06 6:18 ` Kamezawa Hiroyuki 2012-09-06 7:17 ` Yasuaki Ishimatsu 2012-09-06 7:17 ` Yasuaki Ishimatsu 2012-09-06 7:30 ` Minchan Kim 2012-09-06 7:30 ` Minchan Kim 2012-09-06 9:14 ` Yasuaki Ishimatsu 2012-09-06 9:14 ` Yasuaki Ishimatsu 2012-09-06 23:37 ` Minchan Kim 2012-09-06 23:37 ` Minchan Kim 2012-09-07 3:47 ` Yasuaki Ishimatsu 2012-09-07 3:47 ` Yasuaki Ishimatsu
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=1346908619-16056-2-git-send-email-minchan@kernel.org \ --to=minchan@kernel.org \ --cc=akpm@linux-foundation.org \ --cc=isimatu.yasuaki@jp.fujitsu.com \ --cc=kamezawa.hiroyu@jp.fujitsu.com \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-mm@kvack.org \ --cc=mgorman@suse.de \ --cc=qiuxishi@huawei.com \ --cc=wency@cn.fujitsu.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.