Commit c340010e4bf824d969a89fa192ecc7a526c0cd24
Committed by
Linus Torvalds
1 parent
b57b98d147
Exists in
master
and in
7 other branches
[PATCH] shrink_list(): skip anon pages if not may_swap
Martin Hicks' page cache reclaim patch added the 'may_swap' flag to the scan_control struct; and modified shrink_list() not to add anon pages to the swap cache if may_swap is not asserted. Ref: http://marc.theaimsgroup.com/?l=linux-mm&m=111461480725322&w=4 However, further down, if the page is mapped, shrink_list() calls try_to_unmap() which will call try_to_unmap_one() via try_to_unmap_anon (). try_to_unmap_one() will BUG_ON() an anon page that is NOT in the swap cache. Martin says he never encountered this path in his testing, but agrees that it might happen. This patch modifies shrink_list() to skip anon pages that are not already in the swap cache when !may_swap, rather than just not adding them to the cache. Signed-off-by: Lee Schermerhorn <lee.schermerhorn@hp.com> Cc: Hugh Dickins <hugh@veritas.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Showing 1 changed file with 3 additions and 1 deletions Side-by-side Diff
mm/vmscan.c
... | ... | @@ -417,7 +417,9 @@ |
417 | 417 | * Anonymous process memory has backing store? |
418 | 418 | * Try to allocate it some swap space here. |
419 | 419 | */ |
420 | - if (PageAnon(page) && !PageSwapCache(page) && sc->may_swap) { | |
420 | + if (PageAnon(page) && !PageSwapCache(page)) { | |
421 | + if (!sc->may_swap) | |
422 | + goto keep_locked; | |
421 | 423 | if (!add_to_swap(page)) |
422 | 424 | goto activate_locked; |
423 | 425 | } |