hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

vmscan/trace: Add 'file' info to trace_mm_vmscan_lru_isolate() 

In trace_mm_vmscan_lru_isolate(), we don't output 'file' information to
the trace event and it is a bit inconvenient for the user to get the
real information(like pasted below).  mm_vmscan_lru_isolate:
isolate_mode=2 order=0 nr_requested=32 nr_scanned=32 nr_taken=32
contig_taken=0 contig_dirty=0 contig_failed=0

'active' can be obtained by analyzing mode(Thanks go to Minchan and
Mel), So this patch adds 'file' to the trace event and it now looks
like: mm_vmscan_lru_isolate: isolate_mode=2 order=0 nr_requested=32
nr_scanned=32 nr_taken=32 contig_taken=0 contig_dirty=0 contig_failed=0
file=0

Signed-off-by: Tao Ma <boyu.mt@taobao.com>
Acked-by: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
Reviewed-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Cc: Mel Gorman <mel@csn.ul.ie>
Reviewed-by: Minchan Kim <minchan@kernel.org>
Cc: Rik van Riel <riel@redhat.com>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Tao Ma 2012-01-12 17:19:20 -08:00 committed by Linus Torvalds
parent 45676885b7
commit ea4d349ffa
2 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
include/trace/events/vmscan.h
View File

@ -266,9 +266,10 @@ DECLARE_EVENT_CLASS(mm_vmscan_lru_isolate_template,
unsigned long nr_lumpy_taken, unsigned long nr_lumpy_taken,
unsigned long nr_lumpy_dirty, unsigned long nr_lumpy_dirty,
unsigned long nr_lumpy_failed, unsigned long nr_lumpy_failed,
isolate_mode_t isolate_mode), isolate_mode_t isolate_mode,
int file),
TP_ARGS(order, nr_requested, nr_scanned, nr_taken, nr_lumpy_taken, nr_lumpy_dirty, nr_lumpy_failed, isolate_mode), TP_ARGS(order, nr_requested, nr_scanned, nr_taken, nr_lumpy_taken, nr_lumpy_dirty, nr_lumpy_failed, isolate_mode, file),
TP_STRUCT__entry( TP_STRUCT__entry(
__field(int, order) __field(int, order)
@ -279,6 +280,7 @@ DECLARE_EVENT_CLASS(mm_vmscan_lru_isolate_template,
__field(unsigned long, nr_lumpy_dirty) __field(unsigned long, nr_lumpy_dirty)
__field(unsigned long, nr_lumpy_failed) __field(unsigned long, nr_lumpy_failed)
__field(isolate_mode_t, isolate_mode) __field(isolate_mode_t, isolate_mode)
__field(int, file)
), ),
TP_fast_assign( TP_fast_assign(
@ -290,9 +292,10 @@ DECLARE_EVENT_CLASS(mm_vmscan_lru_isolate_template,
__entry->nr_lumpy_dirty = nr_lumpy_dirty; __entry->nr_lumpy_dirty = nr_lumpy_dirty;
__entry->nr_lumpy_failed = nr_lumpy_failed; __entry->nr_lumpy_failed = nr_lumpy_failed;
__entry->isolate_mode = isolate_mode; __entry->isolate_mode = isolate_mode;
__entry->file = file;
), ),
TP_printk("isolate_mode=%d order=%d nr_requested=%lu nr_scanned=%lu nr_taken=%lu contig_taken=%lu contig_dirty=%lu contig_failed=%lu", TP_printk("isolate_mode=%d order=%d nr_requested=%lu nr_scanned=%lu nr_taken=%lu contig_taken=%lu contig_dirty=%lu contig_failed=%lu file=%d",
__entry->isolate_mode, __entry->isolate_mode,
__entry->order, __entry->order,
__entry->nr_requested, __entry->nr_requested,
@ -300,7 +303,8 @@ DECLARE_EVENT_CLASS(mm_vmscan_lru_isolate_template,
__entry->nr_taken, __entry->nr_taken,
__entry->nr_lumpy_taken, __entry->nr_lumpy_taken,
__entry->nr_lumpy_dirty, __entry->nr_lumpy_dirty,
__entry->nr_lumpy_failed) __entry->nr_lumpy_failed,
__entry->file)
); );
DEFINE_EVENT(mm_vmscan_lru_isolate_template, mm_vmscan_lru_isolate, DEFINE_EVENT(mm_vmscan_lru_isolate_template, mm_vmscan_lru_isolate,
@ -312,9 +316,10 @@ DEFINE_EVENT(mm_vmscan_lru_isolate_template, mm_vmscan_lru_isolate,
unsigned long nr_lumpy_taken, unsigned long nr_lumpy_taken,
unsigned long nr_lumpy_dirty, unsigned long nr_lumpy_dirty,
unsigned long nr_lumpy_failed, unsigned long nr_lumpy_failed,
isolate_mode_t isolate_mode), isolate_mode_t isolate_mode,
int file),
TP_ARGS(order, nr_requested, nr_scanned, nr_taken, nr_lumpy_taken, nr_lumpy_dirty, nr_lumpy_failed, isolate_mode) TP_ARGS(order, nr_requested, nr_scanned, nr_taken, nr_lumpy_taken, nr_lumpy_dirty, nr_lumpy_failed, isolate_mode, file)
); );
@ -327,9 +332,10 @@ DEFINE_EVENT(mm_vmscan_lru_isolate_template, mm_vmscan_memcg_isolate,
unsigned long nr_lumpy_taken, unsigned long nr_lumpy_taken,
unsigned long nr_lumpy_dirty, unsigned long nr_lumpy_dirty,
unsigned long nr_lumpy_failed, unsigned long nr_lumpy_failed,
isolate_mode_t isolate_mode), isolate_mode_t isolate_mode,
int file),
TP_ARGS(order, nr_requested, nr_scanned, nr_taken, nr_lumpy_taken, nr_lumpy_dirty, nr_lumpy_failed, isolate_mode) TP_ARGS(order, nr_requested, nr_scanned, nr_taken, nr_lumpy_taken, nr_lumpy_dirty, nr_lumpy_failed, isolate_mode, file)
); );

2
mm/vmscan.c
View File

@ -1234,7 +1234,7 @@ static unsigned long isolate_lru_pages(unsigned long nr_to_scan,
nr_to_scan, scan, nr_to_scan, scan,
nr_taken, nr_taken,
nr_lumpy_taken, nr_lumpy_dirty, nr_lumpy_failed, nr_lumpy_taken, nr_lumpy_dirty, nr_lumpy_failed,
mode); mode, file);
return nr_taken; return nr_taken;
} }