Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755968AbYFTBIf (ORCPT ); Thu, 19 Jun 2008 21:08:35 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752599AbYFTBI1 (ORCPT ); Thu, 19 Jun 2008 21:08:27 -0400 Received: from fgwmail6.fujitsu.co.jp ([192.51.44.36]:35802 "EHLO fgwmail6.fujitsu.co.jp" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752880AbYFTBI0 (ORCPT ); Thu, 19 Jun 2008 21:08:26 -0400 Date: Fri, 20 Jun 2008 10:13:52 +0900 From: KAMEZAWA Hiroyuki To: Lee Schermerhorn Cc: Daisuke Nishimura , Andrew Morton , Rik van Riel , Kosaki Motohiro , Nick Piggin , linux-mm@kvack.org, linux-kernel@vger.kernel.org, kernel-testers@vger.kernel.org Subject: Re: [Experimental][PATCH] putback_lru_page rework Message-Id: <20080620101352.e1200b8e.kamezawa.hiroyu@jp.fujitsu.com> In-Reply-To: <1213886722.6398.29.camel@lts-notebook> References: <20080611225945.4da7bb7f.akpm@linux-foundation.org> <20080617163501.7cf411ee.nishimura@mxp.nes.nec.co.jp> <20080617164709.de4db070.nishimura@mxp.nes.nec.co.jp> <20080618184000.a855dfe0.kamezawa.hiroyu@jp.fujitsu.com> <1213813266.6497.14.camel@lts-notebook> <20080619092242.79648592.kamezawa.hiroyu@jp.fujitsu.com> <1213886722.6398.29.camel@lts-notebook> Organization: Fujitsu X-Mailer: Sylpheed 2.4.2 (GTK+ 2.10.11; i686-pc-mingw32) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3017 Lines: 112 Lee-san, this is an additonal one.. Not-tested-yet, just by review. Fixing page_lock() <-> zone->lock nesting of bad-behavior. Before: lock_page()(TestSetPageLocked()) spin_lock(zone->lock) unlock_page() spin_unlock(zone->lock) After: spin_lock(zone->lock) spin_unlock(zone->lock) Including nit-pick fix. (I'll ask Kosaki-san to merge this to his 5/5) Hmm... --- mm/vmscan.c | 25 +++++-------------------- 1 file changed, 5 insertions(+), 20 deletions(-) Index: test-2.6.26-rc5-mm3/mm/vmscan.c =================================================================== --- test-2.6.26-rc5-mm3.orig/mm/vmscan.c +++ test-2.6.26-rc5-mm3/mm/vmscan.c @@ -1106,7 +1106,7 @@ static unsigned long shrink_inactive_lis if (nr_taken == 0) goto done; - spin_lock(&zone->lru_lock); + spin_lock_irq(&zone->lru_lock); /* * Put back any unfreeable pages. */ @@ -1136,9 +1136,8 @@ static unsigned long shrink_inactive_lis } } } while (nr_scanned < max_scan); - spin_unlock(&zone->lru_lock); + spin_unlock_irq(&zone->lru_lock); done: - local_irq_enable(); pagevec_release(&pvec); return nr_reclaimed; } @@ -2438,7 +2437,7 @@ static void show_page_path(struct page * */ static void check_move_unevictable_page(struct page *page, struct zone *zone) { - +retry: ClearPageUnevictable(page); /* for page_evictable() */ if (page_evictable(page, NULL)) { enum lru_list l = LRU_INACTIVE_ANON + page_is_file_cache(page); @@ -2455,6 +2454,8 @@ static void check_move_unevictable_page( */ SetPageUnevictable(page); list_move(&page->lru, &zone->lru[LRU_UNEVICTABLE].list); + if (page_evictable(page, NULL)) + goto retry; } } @@ -2494,16 +2495,6 @@ void scan_mapping_unevictable_pages(stru next = page_index; next++; - if (TestSetPageLocked(page)) { - /* - * OK, let's do it the hard way... - */ - if (zone) - spin_unlock_irq(&zone->lru_lock); - zone = NULL; - lock_page(page); - } - if (pagezone != zone) { if (zone) spin_unlock_irq(&zone->lru_lock); @@ -2514,8 +2505,6 @@ void scan_mapping_unevictable_pages(stru if (PageLRU(page) && PageUnevictable(page)) check_move_unevictable_page(page, zone); - unlock_page(page); - } if (zone) spin_unlock_irq(&zone->lru_lock); @@ -2551,15 +2540,11 @@ void scan_zone_unevictable_pages(struct for (scan = 0; scan < batch_size; scan++) { struct page *page = lru_to_page(l_unevictable); - if (TestSetPageLocked(page)) - continue; - prefetchw_prev_lru_page(page, l_unevictable, flags); if (likely(PageLRU(page) && PageUnevictable(page))) check_move_unevictable_page(page, zone); - unlock_page(page); } spin_unlock_irq(&zone->lru_lock); -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/