From: Minchan Kim <minchan.kim@gmail.com> To: Andrew Morton <akpm@linux-foundation.org> Cc: linux-mm <linux-mm@kvack.org>, LKML <linux-kernel@vger.kernel.org>, KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>, KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>, Mel Gorman <mgorman@suse.de>, Rik van Riel <riel@redhat.com>, Andrea Arcangeli <aarcange@redhat.com>, Johannes Weiner <hannes@cmpxchg.org>, Minchan Kim <minchan.kim@gmail.com> Subject: [PATCH v2 09/10] compaction: make compaction use in-order putback Date: Mon, 30 May 2011 03:13:48 +0900 [thread overview] Message-ID: <72df4bdb6c375fccb47a38ef6a5c99a57a375c6b.1306689214.git.minchan.kim@gmail.com> (raw) In-Reply-To: <cover.1306689214.git.minchan.kim@gmail.com> In-Reply-To: <cover.1306689214.git.minchan.kim@gmail.com> Compaction is good solution to get contiguous page but it makes LRU churing which is not good. This patch makes that compaction code use in-order putback so after compaction completion, migrated pages are keeping LRU ordering. Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com> Cc: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com> Cc: Mel Gorman <mgorman@suse.de> Cc: Rik van Riel <riel@redhat.com> Cc: Andrea Arcangeli <aarcange@redhat.com> Signed-off-by: Minchan Kim <minchan.kim@gmail.com> --- mm/compaction.c | 26 ++++++++++++++------------ 1 files changed, 14 insertions(+), 12 deletions(-) diff --git a/mm/compaction.c b/mm/compaction.c index e218562..00e710a 100644 --- a/mm/compaction.c +++ b/mm/compaction.c @@ -28,7 +28,7 @@ */ struct compact_control { struct list_head freepages; /* List of free pages to migrate to */ - struct list_head migratepages; /* List of pages being migrated */ + struct inorder_lru migratepages;/* List of pages being migrated */ unsigned long nr_freepages; /* Number of isolated free pages */ unsigned long nr_migratepages; /* Number of pages to migrate */ unsigned long free_pfn; /* isolate_freepages search base */ @@ -210,7 +210,7 @@ static void acct_isolated(struct zone *zone, struct compact_control *cc) struct page *page; unsigned int count[2] = { 0, }; - list_for_each_entry(page, &cc->migratepages, lru) + list_for_each_migrate_entry(page, &cc->migratepages, ilru) count[!!page_is_file_cache(page)]++; __mod_zone_page_state(zone, NR_ISOLATED_ANON, count[0]); @@ -242,7 +242,7 @@ static unsigned long isolate_migratepages(struct zone *zone, unsigned long low_pfn, end_pfn; unsigned long last_pageblock_nr = 0, pageblock_nr; unsigned long nr_scanned = 0, nr_isolated = 0; - struct list_head *migratelist = &cc->migratepages; + struct inorder_lru *migratelist = &cc->migratepages; enum ISOLATE_PAGE_MODE mode = ISOLATE_BOTH; /* Do not scan outside zone boundaries */ @@ -273,7 +273,7 @@ static unsigned long isolate_migratepages(struct zone *zone, cond_resched(); spin_lock_irq(&zone->lru_lock); for (; low_pfn < end_pfn; low_pfn++) { - struct page *page; + struct page *page, *prev_page; bool locked = true; /* give a chance to irqs before checking need_resched() */ @@ -330,14 +330,15 @@ static unsigned long isolate_migratepages(struct zone *zone, /* Try isolate the page */ if (!cc->sync) mode |= ISOLATE_CLEAN; - if (__isolate_lru_page(page, mode, 0) != 0) + if (__isolate_inorder_lru_page(page, mode, 0, &prev_page) != 0) continue; VM_BUG_ON(PageTransCompound(page)); /* Successfully isolated */ del_page_from_lru_list(zone, page, page_lru(page)); - list_add(&page->lru, migratelist); + migratelist_add(page, prev_page, migratelist); + cc->nr_migratepages++; nr_isolated++; @@ -393,7 +394,7 @@ static void update_nr_listpages(struct compact_control *cc) int nr_freepages = 0; struct page *page; - list_for_each_entry(page, &cc->migratepages, lru) + list_for_each_migrate_entry(page, &cc->migratepages, ilru) nr_migratepages++; list_for_each_entry(page, &cc->freepages, lru) nr_freepages++; @@ -521,7 +522,8 @@ static int compact_zone(struct zone *zone, struct compact_control *cc) continue; nr_migrate = cc->nr_migratepages; - err = migrate_pages(&cc->migratepages, compaction_alloc, + err = migrate_inorder_lru_pages(&cc->migratepages, + compaction_alloc, (unsigned long)cc, false, cc->sync); update_nr_listpages(cc); @@ -536,7 +538,7 @@ static int compact_zone(struct zone *zone, struct compact_control *cc) /* Release LRU pages not migrated */ if (err) { - putback_lru_pages(&cc->migratepages); + putback_inorder_lru_pages(&cc->migratepages); cc->nr_migratepages = 0; } @@ -562,7 +564,7 @@ unsigned long compact_zone_order(struct zone *zone, .sync = sync, }; INIT_LIST_HEAD(&cc.freepages); - INIT_LIST_HEAD(&cc.migratepages); + INIT_MIGRATE_LIST(&cc.migratepages); return compact_zone(zone, &cc); } @@ -644,12 +646,12 @@ static int compact_node(int nid) cc.zone = zone; INIT_LIST_HEAD(&cc.freepages); - INIT_LIST_HEAD(&cc.migratepages); + INIT_MIGRATE_LIST(&cc.migratepages); compact_zone(zone, &cc); VM_BUG_ON(!list_empty(&cc.freepages)); - VM_BUG_ON(!list_empty(&cc.migratepages)); + VM_BUG_ON(!migratelist_empty(&cc.migratepages)); } return 0; -- 1.7.0.4
WARNING: multiple messages have this Message-ID (diff)
From: Minchan Kim <minchan.kim@gmail.com> To: Andrew Morton <akpm@linux-foundation.org> Cc: linux-mm <linux-mm@kvack.org>, LKML <linux-kernel@vger.kernel.org>, KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>, KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>, Mel Gorman <mgorman@suse.de>, Rik van Riel <riel@redhat.com>, Andrea Arcangeli <aarcange@redhat.com>, Johannes Weiner <hannes@cmpxchg.org>, Minchan Kim <minchan.kim@gmail.com> Subject: [PATCH v2 09/10] compaction: make compaction use in-order putback Date: Mon, 30 May 2011 03:13:48 +0900 [thread overview] Message-ID: <72df4bdb6c375fccb47a38ef6a5c99a57a375c6b.1306689214.git.minchan.kim@gmail.com> (raw) In-Reply-To: <cover.1306689214.git.minchan.kim@gmail.com> In-Reply-To: <cover.1306689214.git.minchan.kim@gmail.com> Compaction is good solution to get contiguous page but it makes LRU churing which is not good. This patch makes that compaction code use in-order putback so after compaction completion, migrated pages are keeping LRU ordering. Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com> Cc: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com> Cc: Mel Gorman <mgorman@suse.de> Cc: Rik van Riel <riel@redhat.com> Cc: Andrea Arcangeli <aarcange@redhat.com> Signed-off-by: Minchan Kim <minchan.kim@gmail.com> --- mm/compaction.c | 26 ++++++++++++++------------ 1 files changed, 14 insertions(+), 12 deletions(-) diff --git a/mm/compaction.c b/mm/compaction.c index e218562..00e710a 100644 --- a/mm/compaction.c +++ b/mm/compaction.c @@ -28,7 +28,7 @@ */ struct compact_control { struct list_head freepages; /* List of free pages to migrate to */ - struct list_head migratepages; /* List of pages being migrated */ + struct inorder_lru migratepages;/* List of pages being migrated */ unsigned long nr_freepages; /* Number of isolated free pages */ unsigned long nr_migratepages; /* Number of pages to migrate */ unsigned long free_pfn; /* isolate_freepages search base */ @@ -210,7 +210,7 @@ static void acct_isolated(struct zone *zone, struct compact_control *cc) struct page *page; unsigned int count[2] = { 0, }; - list_for_each_entry(page, &cc->migratepages, lru) + list_for_each_migrate_entry(page, &cc->migratepages, ilru) count[!!page_is_file_cache(page)]++; __mod_zone_page_state(zone, NR_ISOLATED_ANON, count[0]); @@ -242,7 +242,7 @@ static unsigned long isolate_migratepages(struct zone *zone, unsigned long low_pfn, end_pfn; unsigned long last_pageblock_nr = 0, pageblock_nr; unsigned long nr_scanned = 0, nr_isolated = 0; - struct list_head *migratelist = &cc->migratepages; + struct inorder_lru *migratelist = &cc->migratepages; enum ISOLATE_PAGE_MODE mode = ISOLATE_BOTH; /* Do not scan outside zone boundaries */ @@ -273,7 +273,7 @@ static unsigned long isolate_migratepages(struct zone *zone, cond_resched(); spin_lock_irq(&zone->lru_lock); for (; low_pfn < end_pfn; low_pfn++) { - struct page *page; + struct page *page, *prev_page; bool locked = true; /* give a chance to irqs before checking need_resched() */ @@ -330,14 +330,15 @@ static unsigned long isolate_migratepages(struct zone *zone, /* Try isolate the page */ if (!cc->sync) mode |= ISOLATE_CLEAN; - if (__isolate_lru_page(page, mode, 0) != 0) + if (__isolate_inorder_lru_page(page, mode, 0, &prev_page) != 0) continue; VM_BUG_ON(PageTransCompound(page)); /* Successfully isolated */ del_page_from_lru_list(zone, page, page_lru(page)); - list_add(&page->lru, migratelist); + migratelist_add(page, prev_page, migratelist); + cc->nr_migratepages++; nr_isolated++; @@ -393,7 +394,7 @@ static void update_nr_listpages(struct compact_control *cc) int nr_freepages = 0; struct page *page; - list_for_each_entry(page, &cc->migratepages, lru) + list_for_each_migrate_entry(page, &cc->migratepages, ilru) nr_migratepages++; list_for_each_entry(page, &cc->freepages, lru) nr_freepages++; @@ -521,7 +522,8 @@ static int compact_zone(struct zone *zone, struct compact_control *cc) continue; nr_migrate = cc->nr_migratepages; - err = migrate_pages(&cc->migratepages, compaction_alloc, + err = migrate_inorder_lru_pages(&cc->migratepages, + compaction_alloc, (unsigned long)cc, false, cc->sync); update_nr_listpages(cc); @@ -536,7 +538,7 @@ static int compact_zone(struct zone *zone, struct compact_control *cc) /* Release LRU pages not migrated */ if (err) { - putback_lru_pages(&cc->migratepages); + putback_inorder_lru_pages(&cc->migratepages); cc->nr_migratepages = 0; } @@ -562,7 +564,7 @@ unsigned long compact_zone_order(struct zone *zone, .sync = sync, }; INIT_LIST_HEAD(&cc.freepages); - INIT_LIST_HEAD(&cc.migratepages); + INIT_MIGRATE_LIST(&cc.migratepages); return compact_zone(zone, &cc); } @@ -644,12 +646,12 @@ static int compact_node(int nid) cc.zone = zone; INIT_LIST_HEAD(&cc.freepages); - INIT_LIST_HEAD(&cc.migratepages); + INIT_MIGRATE_LIST(&cc.migratepages); compact_zone(zone, &cc); VM_BUG_ON(!list_empty(&cc.freepages)); - VM_BUG_ON(!list_empty(&cc.migratepages)); + VM_BUG_ON(!migratelist_empty(&cc.migratepages)); } return 0; -- 1.7.0.4 -- 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/ . Fight unfair telecom internet charges in Canada: sign http://stopthemeter.ca/ Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>
next prev parent reply other threads:[~2011-05-29 18:15 UTC|newest] Thread overview: 50+ messages / expand[flat|nested] mbox.gz Atom feed top 2011-05-29 18:13 [PATCH v2 00/10] Prevent LRU churning Minchan Kim 2011-05-29 18:13 ` Minchan Kim 2011-05-29 18:13 ` [PATCH v2 01/10] Make clear description of isolate/putback functions Minchan Kim 2011-05-29 18:13 ` Minchan Kim 2011-05-31 20:48 ` Rik van Riel 2011-05-31 20:48 ` Rik van Riel 2011-05-29 18:13 ` [PATCH v2 02/10] compaction: trivial clean up acct_isolated Minchan Kim 2011-05-29 18:13 ` Minchan Kim 2011-05-31 12:11 ` Johannes Weiner 2011-05-31 12:11 ` Johannes Weiner 2011-06-01 15:31 ` Rik van Riel 2011-06-01 15:31 ` Rik van Riel 2011-05-29 18:13 ` [PATCH v2 03/10] Change isolate mode from int type to enum type Minchan Kim 2011-05-29 18:13 ` Minchan Kim 2011-05-31 13:36 ` Johannes Weiner 2011-05-31 13:36 ` Johannes Weiner 2011-05-31 13:44 ` Minchan Kim 2011-05-31 13:44 ` Minchan Kim 2011-05-29 18:13 ` [PATCH v2 04/10] Add additional isolation mode Minchan Kim 2011-05-29 18:13 ` Minchan Kim 2011-05-31 13:39 ` Johannes Weiner 2011-05-31 13:39 ` Johannes Weiner 2011-06-01 15:55 ` Rik van Riel 2011-06-01 15:55 ` Rik van Riel 2011-05-29 18:13 ` [PATCH v2 05/10] compaction: make isolate_lru_page with filter aware Minchan Kim 2011-05-29 18:13 ` Minchan Kim 2011-06-01 16:03 ` Rik van Riel 2011-06-01 16:03 ` Rik van Riel 2011-05-29 18:13 ` [PATCH v2 06/10] vmscan: " Minchan Kim 2011-05-29 18:13 ` Minchan Kim 2011-05-31 13:46 ` Johannes Weiner 2011-05-31 13:46 ` Johannes Weiner 2011-05-31 13:51 ` Minchan Kim 2011-05-31 13:51 ` Minchan Kim 2011-05-29 18:13 ` [PATCH v2 07/10] In order putback lru core Minchan Kim 2011-05-29 18:13 ` Minchan Kim 2011-06-01 21:08 ` Rik van Riel 2011-06-01 21:08 ` Rik van Riel 2011-05-29 18:13 ` [PATCH v2 08/10] migration: make in-order-putback aware Minchan Kim 2011-05-29 18:13 ` Minchan Kim 2011-05-29 18:13 ` Minchan Kim [this message] 2011-05-29 18:13 ` [PATCH v2 09/10] compaction: make compaction use in-order putback Minchan Kim 2011-05-29 18:13 ` [PATCH v2 10/10] add tracepoints Minchan Kim 2011-05-29 18:13 ` Minchan Kim 2011-05-29 18:37 ` [PATCH v2 00/10] Prevent LRU churning Minchan Kim 2011-05-29 18:37 ` Minchan Kim 2011-05-30 1:47 ` KOSAKI Motohiro 2011-05-30 1:47 ` KOSAKI Motohiro 2011-05-30 7:25 ` Minchan Kim 2011-05-30 7:25 ` 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=72df4bdb6c375fccb47a38ef6a5c99a57a375c6b.1306689214.git.minchan.kim@gmail.com \ --to=minchan.kim@gmail.com \ --cc=aarcange@redhat.com \ --cc=akpm@linux-foundation.org \ --cc=hannes@cmpxchg.org \ --cc=kamezawa.hiroyu@jp.fujitsu.com \ --cc=kosaki.motohiro@jp.fujitsu.com \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-mm@kvack.org \ --cc=mgorman@suse.de \ --cc=riel@redhat.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.