linux-mm.kvack.org archive mirror
 help / color / mirror / Atom feed
* [PATCH v2] fix mlocked page counter mistmatch
@ 2009-02-03  4:24 MinChan Kim
  2009-02-03 16:44 ` KOSAKI Motohiro
  0 siblings, 1 reply; 13+ messages in thread
From: MinChan Kim @ 2009-02-03  4:24 UTC (permalink / raw)
  To: Andrew Morton, linux mm
  Cc: KOSAKI Motohiro, linux kernel, Nick Piggin, Rik van Riel


When I tested following program, I found that mlocked counter
is strange.
It couldn't free some mlocked pages of test program.
It is caused that try_to_unmap_file don't check real
page mapping in vmas. 

That's because goal of address_space for file is to find all processes
into which the file's specific interval is mapped.
What I mean is that it's not related page but file's interval.

Even if the page isn't really mapping at the vma, it returns
SWAP_MLOCK since the vma have VM_LOCKED, then calls
try_to_mlock_page. After all, mlocked counter is increased again.

COWed anon page in a file-backed vma could be a such case.
This patch resolves it. 

This patch is based on 2.6.28-rc2-mm1.

-- my test program --

int main()
{
       mlockall(MCL_CURRENT);
       return 0;
}

-- before --

root@barrios-target-linux:~# cat /proc/meminfo | egrep 'Mlo|Unev'
Unevictable:           0 kB
Mlocked:               0 kB

-- after --

root@barrios-target-linux:~# cat /proc/meminfo | egrep 'Mlo|Unev'
Unevictable:           8 kB
Mlocked:               8 kB

Signed-off-by: MinChan Kim <minchan.kim@gmail.com>
Acked-by: Lee Schermerhorn <lee.schermerhorn@hp.com>
Tested-by: Lee Schermerhorn <lee.schermerhorn@hp.com>

---
 mm/rmap.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/mm/rmap.c b/mm/rmap.c
index 1099394..bd24b55 100644
--- a/mm/rmap.c
+++ b/mm/rmap.c
@@ -1080,7 +1080,8 @@ static int try_to_unmap_file(struct page *page, int unlock, int migration)
 	spin_lock(&mapping->i_mmap_lock);
 	vma_prio_tree_foreach(vma, &iter, &mapping->i_mmap, pgoff, pgoff) {
 		if (MLOCK_PAGES && unlikely(unlock)) {
-			if (!(vma->vm_flags & VM_LOCKED))
+			if (!((vma->vm_flags & VM_LOCKED) &&
+						page_mapped_in_vma(page, vma)))
 				continue;	/* must visit all vmas */
 			ret = SWAP_MLOCK;
 		} else {
-- 
1.5.4.3

-- 
Kinds Regards
MinChan Kim

--
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	[flat|nested] 13+ messages in thread

end of thread, other threads:[~2009-02-05  2:32 UTC | newest]

Thread overview: 13+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2009-02-03  4:24 [PATCH v2] fix mlocked page counter mistmatch MinChan Kim
2009-02-03 16:44 ` KOSAKI Motohiro
2009-02-03 23:44   ` MinChan Kim
2009-02-04  2:12     ` KOSAKI Motohiro
2009-02-04  2:44       ` MinChan Kim
2009-02-04  2:51         ` KOSAKI Motohiro
2009-02-04  4:57           ` MinChan Kim
2009-02-04 10:28             ` KOSAKI Motohiro
2009-02-04 14:07               ` Lee Schermerhorn
2009-02-04 23:38                 ` MinChan Kim
2009-02-04 23:35               ` MinChan Kim
2009-02-05  2:17                 ` KOSAKI Motohiro
2009-02-05  2:32                   ` MinChan Kim

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