linux-mm.kvack.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] mm/vmscan.c:shrink_list(): check PageSwapCache() after add_to_swap()
@ 2004-01-28 16:43 Nikita Danilov
  2004-01-28 21:44 ` Andrew Morton
  0 siblings, 1 reply; 8+ messages in thread
From: Nikita Danilov @ 2004-01-28 16:43 UTC (permalink / raw)
  To: Andrew Morton, linux-mm

Hello,

shrink_list() checks PageSwapCache() before calling add_to_swap(), this
means that anonymous page that is going to be added to the swap right
now these checks return false and:

 (*) it will be unaccounted for in nr_mapped, and

 (*) it won't be written to the swap if gfp_flags include __GFP_IO but
     not __GFP_FS.

(Both will happen only on the next round of scanning.)

Patch below just moves may_enter_fs initialization down. I am not sure
about (*nr_mapped) increase though.

Comments?

Nikita.
diff -puN -b mm/vmscan.c~check-PageSwapCache-after-add-to-swap mm/vmscan.c
--- i386/mm/vmscan.c~check-PageSwapCache-after-add-to-swap	Wed Jan 28 19:22:14 2004
+++ i386-nikita/mm/vmscan.c	Wed Jan 28 19:36:16 2004
@@ -380,8 +380,6 @@ shrink_list(struct list_head *page_list,
 			(*nr_mapped)++;
 
 		BUG_ON(PageActive(page));
-		may_enter_fs = (gfp_mask & __GFP_FS) ||
-				(PageSwapCache(page) && (gfp_mask & __GFP_IO));
 
 		if (PageWriteback(page))
 			goto keep_locked;
@@ -412,6 +410,9 @@ shrink_list(struct list_head *page_list,
 		}
 #endif /* CONFIG_SWAP */
 
+		may_enter_fs = (gfp_mask & __GFP_FS) ||
+				(PageSwapCache(page) && (gfp_mask & __GFP_IO));
+
 		/*
 		 * The page is mapped into the page tables of one or more
 		 * processes. Try to unmap it here.

_
--
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:"aart@kvack.org"> aart@kvack.org </a>

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

end of thread, other threads:[~2004-02-04  5:11 UTC | newest]

Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2004-01-28 16:43 [PATCH] mm/vmscan.c:shrink_list(): check PageSwapCache() after add_to_swap() Nikita Danilov
2004-01-28 21:44 ` Andrew Morton
2004-01-30  2:53   ` [BENCHMARKS] 2.6 kbuild results (with add_to_swap patch) Nick Piggin
2004-01-30 12:04     ` Rik van Riel
2004-01-31  1:19       ` Nick Piggin
2004-01-31  1:29         ` Andrew Morton
2004-01-31  1:34           ` Nick Piggin
2004-02-04  5:11       ` Nick Piggin

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox