linux-mm.kvack.org archive mirror
 help / color / mirror / Atom feed
* [PATCH RFC 1/3] proc/smaps: carefully handle migration entries
@ 2012-04-30 11:29 Konstantin Khlebnikov
  2012-04-30 11:29 ` [PATCH RFC 2/3] proc/smaps: show amount of nonlinear ptes in vma Konstantin Khlebnikov
  2012-04-30 11:29 ` [PATCH RFC 3/3] proc/smaps: show amount of hwpoison pages Konstantin Khlebnikov
  0 siblings, 2 replies; 11+ messages in thread
From: Konstantin Khlebnikov @ 2012-04-30 11:29 UTC (permalink / raw)
  To: linux-mm, linux-kernel; +Cc: Andrew Morton

Currently smaps reports migration entries as "swap",
as result "swap" can appears in shared mapping.

This patch converts migration entries into pages and handles them as usual.

Signed-off-by: Konstantin Khlebnikov <khlebnikov@openvz.org>
---
 fs/proc/task_mmu.c |   18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c
index b073971..acee5fd 100644
--- a/fs/proc/task_mmu.c
+++ b/fs/proc/task_mmu.c
@@ -402,18 +402,20 @@ static void smaps_pte_entry(pte_t ptent, unsigned long addr,
 {
 	struct mem_size_stats *mss = walk->private;
 	struct vm_area_struct *vma = mss->vma;
-	struct page *page;
+	struct page *page = NULL;
 	int mapcount;
 
-	if (is_swap_pte(ptent)) {
-		mss->swap += ptent_size;
-		return;
-	}
+	if (pte_present(ptent)) {
+		page = vm_normal_page(vma, addr, ptent);
+	} else if (is_swap_pte(ptent)) {
+		swp_entry_t swpent = pte_to_swp_entry(ptent);
 
-	if (!pte_present(ptent))
-		return;
+		if (!non_swap_entry(swpent))
+			mss->swap += ptent_size;
+		else if (is_migration_entry(swpent))
+			page = migration_entry_to_page(swpent);
+	}
 
-	page = vm_normal_page(vma, addr, ptent);
 	if (!page)
 		return;
 

--
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/ .
Fight unfair telecom internet charges in Canada: sign http://stopthemeter.ca/
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>

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

end of thread, other threads:[~2012-05-31 20:12 UTC | newest]

Thread overview: 11+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-04-30 11:29 [PATCH RFC 1/3] proc/smaps: carefully handle migration entries Konstantin Khlebnikov
2012-04-30 11:29 ` [PATCH RFC 2/3] proc/smaps: show amount of nonlinear ptes in vma Konstantin Khlebnikov
2012-05-01 17:39   ` KOSAKI Motohiro
2012-05-01 17:56     ` Konstantin Khlebnikov
2012-05-01 18:08       ` KOSAKI Motohiro
2012-04-30 11:29 ` [PATCH RFC 3/3] proc/smaps: show amount of hwpoison pages Konstantin Khlebnikov
2012-05-01 17:35   ` KOSAKI Motohiro
2012-05-01 18:05     ` Konstantin Khlebnikov
2012-05-01 18:14       ` KOSAKI Motohiro
2012-05-31 20:12         ` Andrew Morton
2012-05-01 18:29   ` Andi Kleen

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