From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756849AbZEDXpY (ORCPT ); Mon, 4 May 2009 19:45:24 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752520AbZEDXpK (ORCPT ); Mon, 4 May 2009 19:45:10 -0400 Received: from mga03.intel.com ([143.182.124.21]:57001 "EHLO mga03.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753946AbZEDXpF (ORCPT ); Mon, 4 May 2009 19:45:05 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.40,293,1239001200"; d="scan'208";a="139130098" Date: Tue, 5 May 2009 07:44:55 +0800 From: Wu Fengguang To: "akpm@linux-foundation.org" Cc: "a.p.zijlstra@chello.nl" , "cl@linux-foundation.org" , "kosaki.motohiro@jp.fujitsu.com" , "npiggin@suse.de" , "riel@redhat.com" , linux-mm@kvack.org, LKML Subject: [PATCH] vmscan: ZVC updates in shrink_active_list() can be done once Message-ID: <20090504234455.GA6324@localhost> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.5.18 (2008-05-17) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This effectively lifts the unit of nr_inactive_* and pgdeactivate updates from PAGEVEC_SIZE=14 to SWAP_CLUSTER_MAX=32. Signed-off-by: Wu Fengguang --- mm/vmscan.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) --- linux.orig/mm/vmscan.c +++ linux/mm/vmscan.c @@ -1228,7 +1228,6 @@ static void shrink_active_list(unsigned struct scan_control *sc, int priority, int file) { unsigned long pgmoved; - int pgdeactivate = 0; unsigned long pgscanned; LIST_HEAD(l_hold); /* The pages which were snipped off */ LIST_HEAD(l_inactive); @@ -1257,7 +1256,7 @@ static void shrink_active_list(unsigned __mod_zone_page_state(zone, NR_ACTIVE_ANON, -pgmoved); spin_unlock_irq(&zone->lru_lock); - pgmoved = 0; + pgmoved = 0; /* count referenced (mapping) mapped pages */ while (!list_empty(&l_hold)) { cond_resched(); page = lru_to_page(&l_hold); @@ -1291,7 +1290,7 @@ static void shrink_active_list(unsigned */ reclaim_stat->recent_rotated[!!file] += pgmoved; - pgmoved = 0; + pgmoved = 0; /* count pages moved to inactive list */ while (!list_empty(&l_inactive)) { page = lru_to_page(&l_inactive); prefetchw_prev_lru_page(page, &l_inactive, flags); @@ -1304,10 +1303,7 @@ static void shrink_active_list(unsigned mem_cgroup_add_lru_list(page, lru); pgmoved++; if (!pagevec_add(&pvec, page)) { - __mod_zone_page_state(zone, NR_LRU_BASE + lru, pgmoved); spin_unlock_irq(&zone->lru_lock); - pgdeactivate += pgmoved; - pgmoved = 0; if (buffer_heads_over_limit) pagevec_strip(&pvec); __pagevec_release(&pvec); @@ -1315,9 +1311,8 @@ static void shrink_active_list(unsigned } } __mod_zone_page_state(zone, NR_LRU_BASE + lru, pgmoved); - pgdeactivate += pgmoved; __count_zone_vm_events(PGREFILL, zone, pgscanned); - __count_vm_events(PGDEACTIVATE, pgdeactivate); + __count_vm_events(PGDEACTIVATE, pgmoved); spin_unlock_irq(&zone->lru_lock); if (buffer_heads_over_limit) pagevec_strip(&pvec);