lkml.org 
[lkml]   [2008]   [Jul]   [4]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
Subject[RFC patch 05/12] LTTng instrumentation mm
Memory management core events.

Added tracepoints :

mm_filemap_wait_end
mm_filemap_wait_start
mm_handle_fault_entry
mm_handle_fault_exit
mm_huge_page_alloc
mm_huge_page_free
mm_page_alloc
mm_page_free
mm_swap_file_close
mm_swap_file_open
mm_swap_in
mm_swap_out

Changelog:
- Use page_to_pfn for swap out instrumentation, wait_on_page_bit, do_swap_page,
page alloc/free.
- add missing free_hot_cold_page instrumentation.
- add hugetlb page_alloc page_free instrumentation.
- Add write_access to mm fault.
- Add page bit_nr waited for by wait_on_page_bit.
- Move page alloc instrumentation to __aloc_pages so we cover the alloc zeroed
page path.
- Add swap file used for swap in and swap out events.
- Dump the swap files, instrument swapon and swapoff.
- Move to tracepoints

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca>
CC: linux-mm@kvack.org
CC: Dave Hansen <haveblue@us.ibm.com>
CC: 'Peter Zijlstra' <peterz@infradead.org>
CC: "Frank Ch. Eigler" <fche@redhat.com>
CC: 'Ingo Molnar' <mingo@elte.hu>
CC: 'Hideo AOKI' <haoki@redhat.com>
CC: Takashi Nishiie <t-nishiie@np.css.fujitsu.com>
CC: 'Steven Rostedt' <rostedt@goodmis.org>
CC: Masami Hiramatsu <mhiramat@redhat.com>
---
mm/filemap.c | 3 +++
mm/hugetlb.c | 3 +++
mm/memory.c | 34 +++++++++++++++++++++++++---------
mm/mm-trace.h | 46 ++++++++++++++++++++++++++++++++++++++++++++++
mm/page_alloc.c | 6 ++++++
mm/page_io.c | 2 ++
mm/swapfile.c | 3 +++
7 files changed, 88 insertions(+), 9 deletions(-)
Index: linux-2.6-lttng/mm/filemap.c
===================================================================
--- linux-2.6-lttng.orig/mm/filemap.c 2008-07-04 18:26:02.000000000 -0400
+++ linux-2.6-lttng/mm/filemap.c 2008-07-04 18:26:37.000000000 -0400
@@ -33,6 +33,7 @@
#include <linux/cpuset.h>
#include <linux/hardirq.h> /* for BUG_ON(!in_atomic()) only */
#include <linux/memcontrol.h>
+#include "mm-trace.h"
#include "internal.h"

/*
@@ -540,9 +541,11 @@ void wait_on_page_bit(struct page *page,
{
DEFINE_WAIT_BIT(wait, &page->flags, bit_nr);

+ trace_mm_filemap_wait_start(page, bit_nr);
if (test_bit(bit_nr, &page->flags))
__wait_on_bit(page_waitqueue(page), &wait, sync_page,
TASK_UNINTERRUPTIBLE);
+ trace_mm_filemap_wait_end(page, bit_nr);
}
EXPORT_SYMBOL(wait_on_page_bit);

Index: linux-2.6-lttng/mm/memory.c
===================================================================
--- linux-2.6-lttng.orig/mm/memory.c 2008-07-04 18:26:02.000000000 -0400
+++ linux-2.6-lttng/mm/memory.c 2008-07-04 18:26:37.000000000 -0400
@@ -51,6 +51,7 @@
#include <linux/init.h>
#include <linux/writeback.h>
#include <linux/memcontrol.h>
+#include "mm-trace.h"

#include <asm/pgalloc.h>
#include <asm/uaccess.h>
@@ -2201,6 +2202,7 @@ static int do_swap_page(struct mm_struct
/* Had to read the page from swap area: Major fault */
ret = VM_FAULT_MAJOR;
count_vm_event(PGMAJFAULT);
+ trace_mm_swap_in(page, entry);
}

if (mem_cgroup_charge(page, mm, GFP_KERNEL)) {
@@ -2650,30 +2652,44 @@ unlock:
int handle_mm_fault(struct mm_struct *mm, struct vm_area_struct *vma,
unsigned long address, int write_access)
{
+ int res;
pgd_t *pgd;
pud_t *pud;
pmd_t *pmd;
pte_t *pte;

+ trace_mm_handle_fault_entry(address, write_access);
+
__set_current_state(TASK_RUNNING);

count_vm_event(PGFAULT);

- if (unlikely(is_vm_hugetlb_page(vma)))
- return hugetlb_fault(mm, vma, address, write_access);
+ if (unlikely(is_vm_hugetlb_page(vma))) {
+ res = hugetlb_fault(mm, vma, address, write_access);
+ goto end;
+ }

pgd = pgd_offset(mm, address);
pud = pud_alloc(mm, pgd, address);
- if (!pud)
- return VM_FAULT_OOM;
+ if (!pud) {
+ res = VM_FAULT_OOM;
+ goto end;
+ }
pmd = pmd_alloc(mm, pud, address);
- if (!pmd)
- return VM_FAULT_OOM;
+ if (!pmd) {
+ res = VM_FAULT_OOM;
+ goto end;
+ }
pte = pte_alloc_map(mm, pmd, address);
- if (!pte)
- return VM_FAULT_OOM;
+ if (!pte) {
+ res = VM_FAULT_OOM;
+ goto end;
+ }

- return handle_pte_fault(mm, vma, address, pte, pmd, write_access);
+ res = handle_pte_fault(mm, vma, address, pte, pmd, write_access);
+end:
+ trace_mm_handle_fault_exit();
+ return res;
}

#ifndef __PAGETABLE_PUD_FOLDED
Index: linux-2.6-lttng/mm/page_alloc.c
===================================================================
--- linux-2.6-lttng.orig/mm/page_alloc.c 2008-07-04 18:26:02.000000000 -0400
+++ linux-2.6-lttng/mm/page_alloc.c 2008-07-04 18:26:37.000000000 -0400
@@ -46,6 +46,7 @@
#include <linux/page-isolation.h>
#include <linux/memcontrol.h>
#include <linux/debugobjects.h>
+#include "mm-trace.h"

#include <asm/tlbflush.h>
#include <asm/div64.h>
@@ -510,6 +511,8 @@ static void __free_pages_ok(struct page
int i;
int reserved = 0;

+ trace_mm_page_free(page, order);
+
for (i = 0 ; i < (1 << order) ; ++i)
reserved += free_pages_check(page + i);
if (reserved)
@@ -966,6 +969,8 @@ static void free_hot_cold_page(struct pa
struct per_cpu_pages *pcp;
unsigned long flags;

+ trace_mm_page_free(page, 0);
+
if (PageAnon(page))
page->mapping = NULL;
if (free_pages_check(page))
@@ -1630,6 +1635,7 @@ nopage:
show_mem();
}
got_pg:
+ trace_mm_page_alloc(page, order);
return page;
}

Index: linux-2.6-lttng/mm/page_io.c
===================================================================
--- linux-2.6-lttng.orig/mm/page_io.c 2008-07-04 18:26:02.000000000 -0400
+++ linux-2.6-lttng/mm/page_io.c 2008-07-04 18:26:37.000000000 -0400
@@ -17,6 +17,7 @@
#include <linux/bio.h>
#include <linux/swapops.h>
#include <linux/writeback.h>
+#include "mm-trace.h"
#include <asm/pgtable.h>

static struct bio *get_swap_bio(gfp_t gfp_flags, pgoff_t index,
@@ -114,6 +115,7 @@ int swap_writepage(struct page *page, st
rw |= (1 << BIO_RW_SYNC);
count_vm_event(PSWPOUT);
set_page_writeback(page);
+ trace_mm_swap_out(page);
unlock_page(page);
submit_bio(rw, bio);
out:
Index: linux-2.6-lttng/mm/hugetlb.c
===================================================================
--- linux-2.6-lttng.orig/mm/hugetlb.c 2008-07-04 18:26:02.000000000 -0400
+++ linux-2.6-lttng/mm/hugetlb.c 2008-07-04 18:26:37.000000000 -0400
@@ -14,6 +14,7 @@
#include <linux/mempolicy.h>
#include <linux/cpuset.h>
#include <linux/mutex.h>
+#include "mm-trace.h"

#include <asm/page.h>
#include <asm/pgtable.h>
@@ -141,6 +142,7 @@ static void free_huge_page(struct page *
int nid = page_to_nid(page);
struct address_space *mapping;

+ trace_mm_huge_page_free(page);
mapping = (struct address_space *) page_private(page);
set_page_private(page, 0);
BUG_ON(page_count(page));
@@ -509,6 +511,7 @@ static struct page *alloc_huge_page(stru
if (!IS_ERR(page)) {
set_page_refcounted(page);
set_page_private(page, (unsigned long) mapping);
+ trace_mm_huge_page_alloc(page);
}
return page;
}
Index: linux-2.6-lttng/mm/swapfile.c
===================================================================
--- linux-2.6-lttng.orig/mm/swapfile.c 2008-07-04 18:26:02.000000000 -0400
+++ linux-2.6-lttng/mm/swapfile.c 2008-07-04 18:26:37.000000000 -0400
@@ -32,6 +32,7 @@
#include <asm/pgtable.h>
#include <asm/tlbflush.h>
#include <linux/swapops.h>
+#include "mm-trace.h"

DEFINE_SPINLOCK(swap_lock);
unsigned int nr_swapfiles;
@@ -1310,6 +1311,7 @@ asmlinkage long sys_swapoff(const char _
swap_map = p->swap_map;
p->swap_map = NULL;
p->flags = 0;
+ trace_mm_swap_file_close(swap_file);
spin_unlock(&swap_lock);
mutex_unlock(&swapon_mutex);
vfree(swap_map);
@@ -1695,6 +1697,7 @@ asmlinkage long sys_swapon(const char __
} else {
swap_info[prev].next = p - swap_info;
}
+ trace_mm_swap_file_open(swap_file, name);
spin_unlock(&swap_lock);
mutex_unlock(&swapon_mutex);
error = 0;
Index: linux-2.6-lttng/mm/mm-trace.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ linux-2.6-lttng/mm/mm-trace.h 2008-07-04 18:26:37.000000000 -0400
@@ -0,0 +1,46 @@
+#ifndef _MM_TRACE_H
+#define _MM_TRACE_H
+
+#include <linux/swap.h>
+#include <linux/tracepoint.h>
+
+DEFINE_TRACE(mm_filemap_wait_start,
+ TPPROTO(struct page *page, int bit_nr),
+ TPARGS(page, bit_nr));
+DEFINE_TRACE(mm_filemap_wait_end,
+ TPPROTO(struct page *page, int bit_nr),
+ TPARGS(page, bit_nr));
+DEFINE_TRACE(mm_swap_in,
+ TPPROTO(struct page *page, swp_entry_t entry),
+ TPARGS(page, entry));
+DEFINE_TRACE(mm_handle_fault_entry,
+ TPPROTO(unsigned long address, int write_access),
+ TPARGS(address, write_access));
+DEFINE_TRACE(mm_handle_fault_exit,
+ TPPROTO(void),
+ TPARGS());
+DEFINE_TRACE(mm_page_free,
+ TPPROTO(struct page *page, unsigned int order),
+ TPARGS(page, order));
+/*
+ * mm_page_alloc : page can be NULL.
+ */
+DEFINE_TRACE(mm_page_alloc,
+ TPPROTO(struct page *page, unsigned int order),
+ TPARGS(page, order));
+DEFINE_TRACE(mm_swap_out,
+ TPPROTO(struct page *page),
+ TPARGS(page));
+DEFINE_TRACE(mm_huge_page_free,
+ TPPROTO(struct page *page),
+ TPARGS(page));
+DEFINE_TRACE(mm_huge_page_alloc,
+ TPPROTO(struct page *page),
+ TPARGS(page));
+DEFINE_TRACE(mm_swap_file_close,
+ TPPROTO(struct file *file),
+ TPARGS(file));
+DEFINE_TRACE(mm_swap_file_open,
+ TPPROTO(struct file *file, char *filename),
+ TPARGS(file, filename));
+#endif
--
Mathieu Desnoyers
Computer Engineering Ph.D. Student, Ecole Polytechnique de Montreal
OpenPGP key fingerprint: 8CD5 52C3 8E3C 4140 715F BA06 3F25 A8FE 3BAE 9A68


\
 
 \ /
  Last update: 2008-07-05 02:01    [from the cache]
©2003-2011 Jasper Spaans