From: Mel Gorman <mel@csn.ul.ie> To: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com> Cc: Dave Chinner <david@fromorbit.com>, Chris Mason <chris.mason@oracle.com>, linux-kernel@vger.kernel.org, linux-mm@kvack.org, linux-fsdevel@vger.kernel.org Subject: Re: [PATCH 2/4] [cleanup] mm: introduce free_pages_prepare Date: Thu, 15 Apr 2010 14:33:44 +0100 [thread overview] Message-ID: <20100415133344.GE10966@csn.ul.ie> (raw) In-Reply-To: <20100415192310.D1A7.A69D9226@jp.fujitsu.com> On Thu, Apr 15, 2010 at 07:24:05PM +0900, KOSAKI Motohiro wrote: > This patch is used from [3/4] > > =================================== > Free_hot_cold_page() and __free_pages_ok() have very similar > freeing preparation. This patch make consolicate it. > > Signed-off-by: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com> > --- > mm/page_alloc.c | 40 +++++++++++++++++++++------------------- > 1 files changed, 21 insertions(+), 19 deletions(-) > > diff --git a/mm/page_alloc.c b/mm/page_alloc.c > index 88513c0..ba9aea7 100644 > --- a/mm/page_alloc.c > +++ b/mm/page_alloc.c > @@ -599,20 +599,23 @@ static void free_one_page(struct zone *zone, struct page *page, int order, > spin_unlock(&zone->lock); > } > > -static void __free_pages_ok(struct page *page, unsigned int order) > +static int free_pages_prepare(struct page *page, unsigned int order) > { You don't appear to do anything with the return value. bool? Otherwise I see no problems Acked-by: Mel Gorman <mel@csn.ul.ie> > - unsigned long flags; > int i; > int bad = 0; > - int wasMlocked = __TestClearPageMlocked(page); > > trace_mm_page_free_direct(page, order); > kmemcheck_free_shadow(page, order); > > - for (i = 0 ; i < (1 << order) ; ++i) > - bad += free_pages_check(page + i); > + for (i = 0 ; i < (1 << order) ; ++i) { > + struct page *pg = page + i; > + > + if (PageAnon(pg)) > + pg->mapping = NULL; > + bad += free_pages_check(pg); > + } > if (bad) > - return; > + return -EINVAL; > > if (!PageHighMem(page)) { > debug_check_no_locks_freed(page_address(page),PAGE_SIZE<<order); > @@ -622,6 +625,17 @@ static void __free_pages_ok(struct page *page, unsigned int order) > arch_free_page(page, order); > kernel_map_pages(page, 1 << order, 0); > > + return 0; > +} > + > +static void __free_pages_ok(struct page *page, unsigned int order) > +{ > + unsigned long flags; > + int wasMlocked = __TestClearPageMlocked(page); > + > + if (free_pages_prepare(page, order)) > + return; > + > local_irq_save(flags); > if (unlikely(wasMlocked)) > free_page_mlock(page); > @@ -1107,21 +1121,9 @@ void free_hot_cold_page(struct page *page, int cold) > int migratetype; > int wasMlocked = __TestClearPageMlocked(page); > > - trace_mm_page_free_direct(page, 0); > - kmemcheck_free_shadow(page, 0); > - > - if (PageAnon(page)) > - page->mapping = NULL; > - if (free_pages_check(page)) > + if (free_pages_prepare(page, 0)) > return; > > - if (!PageHighMem(page)) { > - debug_check_no_locks_freed(page_address(page), PAGE_SIZE); > - debug_check_no_obj_freed(page_address(page), PAGE_SIZE); > - } > - arch_free_page(page, 0); > - kernel_map_pages(page, 1, 0); > - > migratetype = get_pageblock_migratetype(page); > set_page_private(page, migratetype); > local_irq_save(flags); > -- > 1.6.5.2 > > > -- Mel Gorman Part-time Phd Student Linux Technology Center University of Limerick IBM Dublin Software Lab
WARNING: multiple messages have this Message-ID (diff)
From: Mel Gorman <mel@csn.ul.ie> To: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com> Cc: Dave Chinner <david@fromorbit.com>, Chris Mason <chris.mason@oracle.com>, linux-kernel@vger.kernel.org, linux-mm@kvack.org, linux-fsdevel@vger.kernel.org Subject: Re: [PATCH 2/4] [cleanup] mm: introduce free_pages_prepare Date: Thu, 15 Apr 2010 14:33:44 +0100 [thread overview] Message-ID: <20100415133344.GE10966@csn.ul.ie> (raw) In-Reply-To: <20100415192310.D1A7.A69D9226@jp.fujitsu.com> On Thu, Apr 15, 2010 at 07:24:05PM +0900, KOSAKI Motohiro wrote: > This patch is used from [3/4] > > =================================== > Free_hot_cold_page() and __free_pages_ok() have very similar > freeing preparation. This patch make consolicate it. > > Signed-off-by: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com> > --- > mm/page_alloc.c | 40 +++++++++++++++++++++------------------- > 1 files changed, 21 insertions(+), 19 deletions(-) > > diff --git a/mm/page_alloc.c b/mm/page_alloc.c > index 88513c0..ba9aea7 100644 > --- a/mm/page_alloc.c > +++ b/mm/page_alloc.c > @@ -599,20 +599,23 @@ static void free_one_page(struct zone *zone, struct page *page, int order, > spin_unlock(&zone->lock); > } > > -static void __free_pages_ok(struct page *page, unsigned int order) > +static int free_pages_prepare(struct page *page, unsigned int order) > { You don't appear to do anything with the return value. bool? Otherwise I see no problems Acked-by: Mel Gorman <mel@csn.ul.ie> > - unsigned long flags; > int i; > int bad = 0; > - int wasMlocked = __TestClearPageMlocked(page); > > trace_mm_page_free_direct(page, order); > kmemcheck_free_shadow(page, order); > > - for (i = 0 ; i < (1 << order) ; ++i) > - bad += free_pages_check(page + i); > + for (i = 0 ; i < (1 << order) ; ++i) { > + struct page *pg = page + i; > + > + if (PageAnon(pg)) > + pg->mapping = NULL; > + bad += free_pages_check(pg); > + } > if (bad) > - return; > + return -EINVAL; > > if (!PageHighMem(page)) { > debug_check_no_locks_freed(page_address(page),PAGE_SIZE<<order); > @@ -622,6 +625,17 @@ static void __free_pages_ok(struct page *page, unsigned int order) > arch_free_page(page, order); > kernel_map_pages(page, 1 << order, 0); > > + return 0; > +} > + > +static void __free_pages_ok(struct page *page, unsigned int order) > +{ > + unsigned long flags; > + int wasMlocked = __TestClearPageMlocked(page); > + > + if (free_pages_prepare(page, order)) > + return; > + > local_irq_save(flags); > if (unlikely(wasMlocked)) > free_page_mlock(page); > @@ -1107,21 +1121,9 @@ void free_hot_cold_page(struct page *page, int cold) > int migratetype; > int wasMlocked = __TestClearPageMlocked(page); > > - trace_mm_page_free_direct(page, 0); > - kmemcheck_free_shadow(page, 0); > - > - if (PageAnon(page)) > - page->mapping = NULL; > - if (free_pages_check(page)) > + if (free_pages_prepare(page, 0)) > return; > > - if (!PageHighMem(page)) { > - debug_check_no_locks_freed(page_address(page), PAGE_SIZE); > - debug_check_no_obj_freed(page_address(page), PAGE_SIZE); > - } > - arch_free_page(page, 0); > - kernel_map_pages(page, 1, 0); > - > migratetype = get_pageblock_migratetype(page); > set_page_private(page, migratetype); > local_irq_save(flags); > -- > 1.6.5.2 > > > -- Mel Gorman Part-time Phd Student Linux Technology Center University of Limerick IBM Dublin Software Lab -- 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:[~2010-04-15 13:34 UTC|newest] Thread overview: 248+ messages / expand[flat|nested] mbox.gz Atom feed top 2010-04-13 0:17 [PATCH] mm: disallow direct reclaim page writeback Dave Chinner 2010-04-13 0:17 ` Dave Chinner 2010-04-13 8:31 ` KOSAKI Motohiro 2010-04-13 8:31 ` KOSAKI Motohiro 2010-04-13 10:29 ` Dave Chinner 2010-04-13 10:29 ` Dave Chinner 2010-04-13 11:39 ` KOSAKI Motohiro 2010-04-13 11:39 ` KOSAKI Motohiro 2010-04-13 14:36 ` Dave Chinner 2010-04-13 14:36 ` Dave Chinner 2010-04-14 3:12 ` Dave Chinner 2010-04-14 3:12 ` Dave Chinner 2010-04-14 6:52 ` KOSAKI Motohiro 2010-04-14 6:52 ` KOSAKI Motohiro 2010-04-15 1:56 ` Dave Chinner 2010-04-15 1:56 ` Dave Chinner 2010-04-14 6:52 ` KOSAKI Motohiro 2010-04-14 6:52 ` KOSAKI Motohiro 2010-04-14 7:36 ` Dave Chinner 2010-04-14 7:36 ` Dave Chinner 2010-04-13 9:58 ` Mel Gorman 2010-04-13 9:58 ` Mel Gorman 2010-04-13 11:19 ` Dave Chinner 2010-04-13 11:19 ` Dave Chinner 2010-04-13 19:34 ` Mel Gorman 2010-04-13 19:34 ` Mel Gorman 2010-04-13 20:20 ` Chris Mason 2010-04-13 20:20 ` Chris Mason 2010-04-14 1:40 ` Dave Chinner 2010-04-14 1:40 ` Dave Chinner 2010-04-14 4:59 ` KAMEZAWA Hiroyuki 2010-04-14 4:59 ` KAMEZAWA Hiroyuki 2010-04-14 5:41 ` Dave Chinner 2010-04-14 5:41 ` Dave Chinner 2010-04-14 5:54 ` KOSAKI Motohiro 2010-04-14 5:54 ` KOSAKI Motohiro 2010-04-14 6:13 ` Minchan Kim 2010-04-14 7:19 ` Minchan Kim 2010-04-14 7:19 ` Minchan Kim 2010-04-14 9:42 ` KAMEZAWA Hiroyuki 2010-04-14 9:42 ` KAMEZAWA Hiroyuki 2010-04-14 9:42 ` KAMEZAWA Hiroyuki 2010-04-14 10:01 ` Minchan Kim 2010-04-14 10:01 ` Minchan Kim 2010-04-14 10:07 ` Mel Gorman 2010-04-14 10:07 ` Mel Gorman 2010-04-14 10:07 ` Mel Gorman 2010-04-14 10:16 ` Minchan Kim 2010-04-14 10:16 ` Minchan Kim 2010-04-14 7:06 ` Dave Chinner 2010-04-14 7:06 ` Dave Chinner 2010-04-14 6:52 ` KOSAKI Motohiro 2010-04-14 6:52 ` KOSAKI Motohiro 2010-04-14 7:28 ` Dave Chinner 2010-04-14 7:28 ` Dave Chinner 2010-04-14 8:51 ` Mel Gorman 2010-04-14 8:51 ` Mel Gorman 2010-04-15 1:34 ` Dave Chinner 2010-04-15 1:34 ` Dave Chinner 2010-04-15 1:34 ` Dave Chinner 2010-04-15 4:09 ` KOSAKI Motohiro 2010-04-15 4:09 ` KOSAKI Motohiro 2010-04-15 4:11 ` [PATCH 1/4] vmscan: delegate pageout io to flusher thread if current is kswapd KOSAKI Motohiro 2010-04-15 4:11 ` KOSAKI Motohiro 2010-04-15 4:11 ` KOSAKI Motohiro 2010-04-15 8:05 ` Suleiman Souhlal 2010-04-15 8:05 ` Suleiman Souhlal 2010-04-15 8:17 ` KOSAKI Motohiro 2010-04-15 8:17 ` KOSAKI Motohiro 2010-04-15 8:26 ` KOSAKI Motohiro 2010-04-15 8:26 ` KOSAKI Motohiro 2010-04-15 10:30 ` Johannes Weiner 2010-04-15 10:30 ` Johannes Weiner 2010-04-15 17:24 ` Suleiman Souhlal 2010-04-15 17:24 ` Suleiman Souhlal 2010-04-20 2:56 ` Ying Han 2010-04-20 2:56 ` Ying Han 2010-04-15 9:32 ` Dave Chinner 2010-04-15 9:32 ` Dave Chinner 2010-04-15 9:41 ` KOSAKI Motohiro 2010-04-15 9:41 ` KOSAKI Motohiro 2010-04-15 17:27 ` Suleiman Souhlal 2010-04-15 17:27 ` Suleiman Souhlal 2010-04-15 23:33 ` Dave Chinner 2010-04-15 23:33 ` Dave Chinner 2010-04-15 23:41 ` Suleiman Souhlal 2010-04-15 23:41 ` Suleiman Souhlal 2010-04-16 9:50 ` Alan Cox 2010-04-16 9:50 ` Alan Cox 2010-04-17 3:06 ` Dave Chinner 2010-04-17 3:06 ` Dave Chinner 2010-04-15 8:18 ` KOSAKI Motohiro 2010-04-15 8:18 ` KOSAKI Motohiro 2010-04-15 8:18 ` KOSAKI Motohiro 2010-04-15 10:31 ` Mel Gorman 2010-04-15 10:31 ` Mel Gorman 2010-04-15 11:26 ` KOSAKI Motohiro 2010-04-15 11:26 ` KOSAKI Motohiro 2010-04-15 4:13 ` [PATCH 2/4] vmscan: kill prev_priority completely KOSAKI Motohiro 2010-04-15 4:13 ` KOSAKI Motohiro 2010-04-15 4:13 ` KOSAKI Motohiro 2010-04-15 4:14 ` [PATCH 3/4] vmscan: move priority variable into scan_control KOSAKI Motohiro 2010-04-15 4:14 ` KOSAKI Motohiro 2010-04-15 4:14 ` KOSAKI Motohiro 2010-04-15 4:15 ` [PATCH 4/4] vmscan: delegate page cleaning io to flusher thread if VM pressure is low KOSAKI Motohiro 2010-04-15 4:15 ` KOSAKI Motohiro 2010-04-15 4:15 ` KOSAKI Motohiro 2010-04-15 4:35 ` [PATCH] mm: disallow direct reclaim page writeback KOSAKI Motohiro 2010-04-15 4:35 ` KOSAKI Motohiro 2010-04-15 6:32 ` Dave Chinner 2010-04-15 6:32 ` Dave Chinner 2010-04-15 6:44 ` KOSAKI Motohiro 2010-04-15 6:44 ` KOSAKI Motohiro 2010-04-15 6:58 ` Dave Chinner 2010-04-15 6:58 ` Dave Chinner 2010-04-15 6:20 ` Dave Chinner 2010-04-15 6:20 ` Dave Chinner 2010-04-15 6:35 ` KOSAKI Motohiro 2010-04-15 6:35 ` KOSAKI Motohiro 2010-04-15 8:54 ` Dave Chinner 2010-04-15 8:54 ` Dave Chinner 2010-04-15 10:21 ` KOSAKI Motohiro 2010-04-15 10:21 ` KOSAKI Motohiro 2010-04-15 10:23 ` [PATCH 1/4] vmscan: simplify shrink_inactive_list() KOSAKI Motohiro 2010-04-15 10:23 ` KOSAKI Motohiro 2010-04-15 13:15 ` Mel Gorman 2010-04-15 13:15 ` Mel Gorman 2010-04-15 15:01 ` Andi Kleen 2010-04-15 15:01 ` Andi Kleen 2010-04-15 15:01 ` Andi Kleen 2010-04-15 15:44 ` Mel Gorman 2010-04-15 15:44 ` Mel Gorman 2010-04-15 16:54 ` Andi Kleen 2010-04-15 16:54 ` Andi Kleen 2010-04-15 23:40 ` Dave Chinner 2010-04-15 23:40 ` Dave Chinner 2010-04-16 7:13 ` Andi Kleen 2010-04-16 7:13 ` Andi Kleen 2010-04-16 14:57 ` Mel Gorman 2010-04-16 14:57 ` Mel Gorman 2010-04-17 2:37 ` Dave Chinner 2010-04-17 2:37 ` Dave Chinner 2010-04-16 14:55 ` Mel Gorman 2010-04-16 14:55 ` Mel Gorman 2010-04-15 18:22 ` Valdis.Kletnieks 2010-04-16 9:39 ` Mel Gorman 2010-04-16 9:39 ` Mel Gorman 2010-04-15 10:24 ` [PATCH 2/4] [cleanup] mm: introduce free_pages_prepare KOSAKI Motohiro 2010-04-15 10:24 ` KOSAKI Motohiro 2010-04-15 10:24 ` KOSAKI Motohiro 2010-04-15 13:33 ` Mel Gorman [this message] 2010-04-15 13:33 ` Mel Gorman 2010-04-15 10:24 ` [PATCH 3/4] mm: introduce free_pages_bulk KOSAKI Motohiro 2010-04-15 10:24 ` KOSAKI Motohiro 2010-04-15 10:24 ` KOSAKI Motohiro 2010-04-15 13:46 ` Mel Gorman 2010-04-15 13:46 ` Mel Gorman 2010-04-15 10:26 ` [PATCH 4/4] vmscan: replace the pagevec in shrink_inactive_list() with list KOSAKI Motohiro 2010-04-15 10:26 ` KOSAKI Motohiro 2010-04-15 10:28 ` [PATCH] mm: disallow direct reclaim page writeback Mel Gorman 2010-04-15 10:28 ` Mel Gorman 2010-04-15 13:42 ` Chris Mason 2010-04-15 13:42 ` Chris Mason 2010-04-15 17:50 ` tytso 2010-04-15 17:50 ` tytso 2010-04-15 17:50 ` tytso 2010-04-16 15:05 ` Mel Gorman 2010-04-16 15:05 ` Mel Gorman 2010-04-19 15:15 ` Mel Gorman 2010-04-19 15:15 ` Mel Gorman 2010-04-19 15:15 ` Mel Gorman 2010-04-19 17:38 ` Chris Mason 2010-04-16 15:05 ` Mel Gorman 2010-04-16 4:14 ` Dave Chinner 2010-04-16 4:14 ` Dave Chinner 2010-04-16 15:14 ` Mel Gorman 2010-04-16 15:14 ` Mel Gorman 2010-04-18 0:32 ` Andrew Morton 2010-04-18 0:32 ` Andrew Morton 2010-04-18 19:05 ` Christoph Hellwig 2010-04-18 19:05 ` Christoph Hellwig 2010-04-18 16:31 ` Andrew Morton 2010-04-18 16:31 ` Andrew Morton 2010-04-18 19:35 ` Christoph Hellwig 2010-04-18 19:35 ` Christoph Hellwig 2010-04-18 19:11 ` Sorin Faibish 2010-04-18 19:11 ` Sorin Faibish 2010-04-18 19:11 ` Sorin Faibish 2010-04-18 19:10 ` Sorin Faibish 2010-04-18 19:10 ` Sorin Faibish 2010-04-18 19:10 ` Sorin Faibish 2010-04-18 21:30 ` James Bottomley 2010-04-18 21:30 ` James Bottomley 2010-04-18 23:34 ` Sorin Faibish 2010-04-18 23:34 ` Sorin Faibish 2010-04-18 23:34 ` Sorin Faibish 2010-04-19 3:08 ` tytso 2010-04-19 3:08 ` tytso 2010-04-19 0:35 ` Dave Chinner 2010-04-19 0:35 ` Dave Chinner 2010-04-19 0:49 ` Arjan van de Ven 2010-04-19 0:49 ` Arjan van de Ven 2010-04-19 1:08 ` Dave Chinner 2010-04-19 1:08 ` Dave Chinner 2010-04-19 4:32 ` Arjan van de Ven 2010-04-19 4:32 ` Arjan van de Ven 2010-04-19 15:20 ` Mel Gorman 2010-04-19 15:20 ` Mel Gorman 2010-04-23 1:06 ` Dave Chinner 2010-04-23 1:06 ` Dave Chinner 2010-04-23 10:50 ` Mel Gorman 2010-04-23 10:50 ` Mel Gorman 2010-04-15 14:57 ` Andi Kleen 2010-04-15 14:57 ` Andi Kleen 2010-04-15 2:37 ` Johannes Weiner 2010-04-15 2:37 ` Johannes Weiner 2010-04-15 2:43 ` KOSAKI Motohiro 2010-04-15 2:43 ` KOSAKI Motohiro 2010-04-16 23:56 ` Johannes Weiner 2010-04-16 23:56 ` Johannes Weiner 2010-04-14 6:52 ` KOSAKI Motohiro 2010-04-14 6:52 ` KOSAKI Motohiro 2010-04-14 10:06 ` Andi Kleen 2010-04-14 10:06 ` Andi Kleen 2010-04-14 10:06 ` Andi Kleen 2010-04-14 11:20 ` Chris Mason 2010-04-14 11:20 ` Chris Mason 2010-04-14 12:15 ` Andi Kleen 2010-04-14 12:15 ` Andi Kleen 2010-04-14 12:15 ` Andi Kleen 2010-04-14 12:32 ` Alan Cox 2010-04-14 12:32 ` Alan Cox 2010-04-14 12:34 ` Andi Kleen 2010-04-14 12:34 ` Andi Kleen 2010-04-14 13:23 ` Mel Gorman 2010-04-14 13:23 ` Mel Gorman 2010-04-14 14:07 ` Chris Mason 2010-04-14 14:07 ` Chris Mason 2010-04-14 0:24 ` Minchan Kim 2010-04-14 0:24 ` Minchan Kim 2010-04-14 4:44 ` Dave Chinner 2010-04-14 4:44 ` Dave Chinner 2010-04-14 7:54 ` Minchan Kim 2010-04-14 7:54 ` Minchan Kim 2010-04-16 1:13 ` KAMEZAWA Hiroyuki 2010-04-16 1:13 ` KAMEZAWA Hiroyuki 2010-04-16 4:18 ` KAMEZAWA Hiroyuki 2010-04-16 4:18 ` KAMEZAWA Hiroyuki
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=20100415133344.GE10966@csn.ul.ie \ --to=mel@csn.ul.ie \ --cc=chris.mason@oracle.com \ --cc=david@fromorbit.com \ --cc=kosaki.motohiro@jp.fujitsu.com \ --cc=linux-fsdevel@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-mm@kvack.org \ /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.