Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751669AbZLFFlV (ORCPT ); Sun, 6 Dec 2009 00:41:21 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751307AbZLFFlP (ORCPT ); Sun, 6 Dec 2009 00:41:15 -0500 Received: from mga14.intel.com ([143.182.124.37]:37341 "EHLO mga14.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751284AbZLFFlO (ORCPT ); Sun, 6 Dec 2009 00:41:14 -0500 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.47,316,1257148800"; d="scan'208";a="219297270" Date: Sun, 6 Dec 2009 13:41:13 +0800 From: Wu Fengguang To: KOSAKI Motohiro Cc: LKML , linux-mm , Andrew Morton , Rik van Riel Subject: [PATCH] vmscan: aligned scan batching Message-ID: <20091206054113.GA23912@localhost> References: <20091127091357.A7CC.A69D9226@jp.fujitsu.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20091127091357.A7CC.A69D9226@jp.fujitsu.com> 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 Content-Length: 2065 Lines: 68 > - pass nr_to_scan into isolate_pages() directly instead > using SWAP_CLUSTER_MAX This patch will make sure nr_to_scan==SWAP_CLUSTER_MAX :) Thanks, Fengguang --- vmscan: aligned scan batching Make sure ->isolate_pages() always scans in unit of SWAP_CLUSTER_MAX. CC: Rik van Riel CC: KOSAKI Motohiro Signed-off-by: Wu Fengguang --- mm/vmscan.c | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) --- linux-mm.orig/mm/vmscan.c 2009-12-06 13:13:28.000000000 +0800 +++ linux-mm/mm/vmscan.c 2009-12-06 13:31:21.000000000 +0800 @@ -1572,15 +1572,11 @@ static void get_scan_ratio(struct zone * static unsigned long nr_scan_try_batch(unsigned long nr_to_scan, unsigned long *nr_saved_scan) { - unsigned long nr; + unsigned long nr = *nr_saved_scan + nr_to_scan; + unsigned long rem = nr & (SWAP_CLUSTER_MAX - 1); - *nr_saved_scan += nr_to_scan; - nr = *nr_saved_scan; - - if (nr >= SWAP_CLUSTER_MAX) - *nr_saved_scan = 0; - else - nr = 0; + *nr_saved_scan = rem; + nr -= rem; return nr; } @@ -1592,7 +1588,6 @@ static void shrink_zone(int priority, st struct scan_control *sc) { unsigned long nr[NR_LRU_LISTS]; - unsigned long nr_to_scan; unsigned long percent[2]; /* anon @ 0; file @ 1 */ enum lru_list l; unsigned long nr_reclaimed = sc->nr_reclaimed; @@ -1625,11 +1620,8 @@ static void shrink_zone(int priority, st nr[LRU_INACTIVE_FILE]) { for_each_evictable_lru(l) { if (nr[l]) { - nr_to_scan = min_t(unsigned long, - nr[l], SWAP_CLUSTER_MAX); - nr[l] -= nr_to_scan; - - nr_reclaimed += shrink_list(l, nr_to_scan, + nr[l] -= SWAP_CLUSTER_MAX; + nr_reclaimed += shrink_list(l, SWAP_CLUSTER_MAX, zone, sc, priority); } } -- 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/