linux-mm.kvack.org archive mirror
 help / color / mirror / Atom feed
* [PATCH v2 1/2] vmscan: don't subtraction of unsined
@ 2010-07-08  7:38 KOSAKI Motohiro
  2010-07-08  7:40 ` [PATCH v2 2/2] vmscan: shrink_slab() require number of lru_pages, not page order KOSAKI Motohiro
                   ` (2 more replies)
  0 siblings, 3 replies; 31+ messages in thread
From: KOSAKI Motohiro @ 2010-07-08  7:38 UTC (permalink / raw)
  To: LKML, linux-mm, Andrew Morton, Mel Gorman, Rik van Riel,
	Minchan Kim, Johannes Weiner
  Cc: kosaki.motohiro

'slab_reclaimable' and 'nr_pages' are unsigned. so, subtraction is
unsafe.

Signed-off-by: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
Acked-by: Christoph Lameter <cl@linux-foundation.org>
---
 mm/vmscan.c |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/mm/vmscan.c b/mm/vmscan.c
index 9c7e57c..8715da1 100644
--- a/mm/vmscan.c
+++ b/mm/vmscan.c
@@ -2588,7 +2588,7 @@ static int __zone_reclaim(struct zone *zone, gfp_t gfp_mask, unsigned int order)
 		.swappiness = vm_swappiness,
 		.order = order,
 	};
-	unsigned long slab_reclaimable;
+	unsigned long n, m;
 
 	disable_swap_token();
 	cond_resched();
@@ -2615,8 +2615,8 @@ static int __zone_reclaim(struct zone *zone, gfp_t gfp_mask, unsigned int order)
 		} while (priority >= 0 && sc.nr_reclaimed < nr_pages);
 	}
 
-	slab_reclaimable = zone_page_state(zone, NR_SLAB_RECLAIMABLE);
-	if (slab_reclaimable > zone->min_slab_pages) {
+	n = zone_page_state(zone, NR_SLAB_RECLAIMABLE);
+	if (n > zone->min_slab_pages) {
 		/*
 		 * shrink_slab() does not currently allow us to determine how
 		 * many pages were freed in this zone. So we take the current
@@ -2628,16 +2628,16 @@ static int __zone_reclaim(struct zone *zone, gfp_t gfp_mask, unsigned int order)
 		 * take a long time.
 		 */
 		while (shrink_slab(sc.nr_scanned, gfp_mask, order) &&
-			zone_page_state(zone, NR_SLAB_RECLAIMABLE) >
-				slab_reclaimable - nr_pages)
+		       (zone_page_state(zone, NR_SLAB_RECLAIMABLE) + nr_pages > n))
 			;
 
 		/*
 		 * Update nr_reclaimed by the number of slab pages we
 		 * reclaimed from this zone.
 		 */
-		sc.nr_reclaimed += slab_reclaimable -
-			zone_page_state(zone, NR_SLAB_RECLAIMABLE);
+		m = zone_page_state(zone, NR_SLAB_RECLAIMABLE);
+		if (m < n)
+			sc.nr_reclaimed += n - m;
 	}
 
 	p->reclaim_state = NULL;
-- 
1.6.5.2



--
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>

^ permalink raw reply related	[flat|nested] 31+ messages in thread

end of thread, other threads:[~2010-07-16  1:44 UTC | newest]

Thread overview: 31+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-07-08  7:38 [PATCH v2 1/2] vmscan: don't subtraction of unsined KOSAKI Motohiro
2010-07-08  7:40 ` [PATCH v2 2/2] vmscan: shrink_slab() require number of lru_pages, not page order KOSAKI Motohiro
2010-07-08 13:23   ` Rik van Riel
2010-07-08 14:04   ` Christoph Lameter
2010-07-08 20:31     ` Andrew Morton
2010-07-08 21:01       ` Christoph Lameter
2010-07-09  0:46         ` KOSAKI Motohiro
2010-07-09  8:21       ` KOSAKI Motohiro
2010-07-09 10:13         ` [PATCH] vmscan: stop meaningless loop iteration when no reclaimable slab KOSAKI Motohiro
2010-07-09 10:53           ` Minchan Kim
2010-07-09 11:04             ` KOSAKI Motohiro
2010-07-11 22:28               ` Minchan Kim
2010-07-13  4:48                 ` KOSAKI Motohiro
2010-07-13  6:33                   ` Minchan Kim
2010-07-09 14:02           ` Christoph Lameter
2010-07-13  4:59             ` KOSAKI Motohiro
2010-07-09  8:36   ` [PATCH v2 2/2] vmscan: shrink_slab() require number of lru_pages, not page order Minchan Kim
2010-07-09 13:54     ` Christoph Lameter
2010-07-13  5:41     ` KOSAKI Motohiro
2010-07-15 19:15       ` Andrew Morton
2010-07-16  1:39         ` KOSAKI Motohiro
2010-07-16  1:44           ` Minchan Kim
2010-07-08  7:41 ` [PATCH v2 1/2] vmscan: don't subtraction of unsined KOSAKI Motohiro
2010-07-08 14:01   ` Christoph Lameter
2010-07-08 20:00 ` Andrew Morton
2010-07-09  1:16   ` KOSAKI Motohiro
2010-07-09  1:46     ` Minchan Kim
2010-07-09 22:28     ` Andrew Morton
2010-07-13  9:32       ` KOSAKI Motohiro
2010-07-14  1:50         ` Christoph Lameter
2010-07-14  2:15           ` KOSAKI Motohiro

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).