Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-10 22:21:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

trace-vmscan-postprocess: sync with tracepoints updates

Browse Source 
Both mm_vmscan_lru_shrink_active and mm_vmscan_lru_isolate have changed
so the script needs to be update to reflect those changes

Link: http://lkml.kernel.org/r/20170105151737.GU21618@dhcp22.suse.cz
Signed-off-by: Michal Hocko <mhocko@suse.com>
Acked-by: Hillf Danton <hillf.zj@alibaba-inc.com>
Acked-by: Mel Gorman <mgorman@suse.de>
Acked-by: Vlastimil Babka <vbabka@suse.cz>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Michal Hocko 2017-02-22 15:44:36 -08:00 committed by Linus Torvalds
parent dcec0b60a8
commit 93607e5a55
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
Documentation/trace/postprocess/trace-vmscan-postprocess.pl
View File

@ -112,8 +112,8 @@ my $regex_direct_end_default = 'nr_reclaimed=([0-9]*)';
my $regex_kswapd_wake_default = 'nid=([0-9]*) order=([0-9]*)'; my $regex_kswapd_wake_default = 'nid=([0-9]*) order=([0-9]*)';
my $regex_kswapd_sleep_default = 'nid=([0-9]*)'; my $regex_kswapd_sleep_default = 'nid=([0-9]*)';
my $regex_wakeup_kswapd_default = 'nid=([0-9]*) zid=([0-9]*) order=([0-9]*)'; my $regex_wakeup_kswapd_default = 'nid=([0-9]*) zid=([0-9]*) order=([0-9]*)';
my $regex_lru_isolate_default = 'isolate_mode=([0-9]*) order=([0-9]*) nr_requested=([0-9]*) nr_scanned=([0-9]*) nr_taken=([0-9]*) file=([0-9]*)'; my $regex_lru_isolate_default = 'isolate_mode=([0-9]*) classzone_idx=([0-9]*) order=([0-9]*) nr_requested=([0-9]*) nr_scanned=([0-9]*) nr_skipped=([0-9]*) nr_taken=([0-9]*) lru=([a-z_]*)';
my $regex_lru_shrink_inactive_default = 'nid=([0-9]*) zid=([0-9]*) nr_scanned=([0-9]*) nr_reclaimed=([0-9]*) priority=([0-9]*) flags=([A-Z_|]*)'; my $regex_lru_shrink_inactive_default = 'nid=([0-9]*) nr_scanned=([0-9]*) nr_reclaimed=([0-9]*) nr_dirty=([0-9]*) nr_writeback=([0-9]*) nr_congested=([0-9]*) nr_immediate=([0-9]*) nr_activate=([0-9]*) nr_ref_keep=([0-9]*) nr_unmap_fail=([0-9]*) priority=([0-9]*) flags=([A-Z_|]*)';
my $regex_lru_shrink_active_default = 'lru=([A-Z_]*) nr_scanned=([0-9]*) nr_rotated=([0-9]*) priority=([0-9]*)'; my $regex_lru_shrink_active_default = 'lru=([A-Z_]*) nr_scanned=([0-9]*) nr_rotated=([0-9]*) priority=([0-9]*)';
my $regex_writepage_default = 'page=([0-9a-f]*) pfn=([0-9]*) flags=([A-Z_|]*)'; my $regex_writepage_default = 'page=([0-9a-f]*) pfn=([0-9]*) flags=([A-Z_|]*)';
@ -205,15 +205,15 @@ $regex_wakeup_kswapd = generate_traceevent_regex(
$regex_lru_isolate = generate_traceevent_regex( $regex_lru_isolate = generate_traceevent_regex(
"vmscan/mm_vmscan_lru_isolate", "vmscan/mm_vmscan_lru_isolate",
$regex_lru_isolate_default, $regex_lru_isolate_default,
"isolate_mode", "order", "isolate_mode", "classzone_idx", "order",
"nr_requested", "nr_scanned", "nr_taken", "nr_requested", "nr_scanned", "nr_skipped", "nr_taken",
"file"); "lru");
$regex_lru_shrink_inactive = generate_traceevent_regex( $regex_lru_shrink_inactive = generate_traceevent_regex(
"vmscan/mm_vmscan_lru_shrink_inactive", "vmscan/mm_vmscan_lru_shrink_inactive",
$regex_lru_shrink_inactive_default, $regex_lru_shrink_inactive_default,
"nid", "zid", "nid", "nr_scanned", "nr_reclaimed", "nr_dirty", "nr_writeback",
"nr_scanned", "nr_reclaimed", "priority", "nr_congested", "nr_immediate", "nr_activate", "nr_ref_keep",
"flags"); "nr_unmap_fail", "priority", "flags");
$regex_lru_shrink_active = generate_traceevent_regex( $regex_lru_shrink_active = generate_traceevent_regex(
"vmscan/mm_vmscan_lru_shrink_active", "vmscan/mm_vmscan_lru_shrink_active",
$regex_lru_shrink_active_default, $regex_lru_shrink_active_default,
@ -381,8 +381,8 @@ EVENT_PROCESS:
next; next;
} }
my $isolate_mode = $1; my $isolate_mode = $1;
my $nr_scanned = $4; my $nr_scanned = $5;
my $file = $6; my $file = $8;
# To closer match vmstat scanning statistics, only count isolate_both # To closer match vmstat scanning statistics, only count isolate_both
# and isolate_inactive as scanning. isolate_active is rotation # and isolate_inactive as scanning. isolate_active is rotation
@ -391,7 +391,7 @@ EVENT_PROCESS:
# isolate_both == 3 # isolate_both == 3
if ($isolate_mode != 2) { if ($isolate_mode != 2) {
$perprocesspid{$process_pid}->{HIGH_NR_SCANNED} += $nr_scanned; $perprocesspid{$process_pid}->{HIGH_NR_SCANNED} += $nr_scanned;
if ($file == 1) { if ($file =~ /_file/) {
$perprocesspid{$process_pid}->{HIGH_NR_FILE_SCANNED} += $nr_scanned; $perprocesspid{$process_pid}->{HIGH_NR_FILE_SCANNED} += $nr_scanned;
} else { } else {
$perprocesspid{$process_pid}->{HIGH_NR_ANON_SCANNED} += $nr_scanned; $perprocesspid{$process_pid}->{HIGH_NR_ANON_SCANNED} += $nr_scanned;
@ -406,8 +406,8 @@ EVENT_PROCESS:
next; next;
} }
my $nr_reclaimed = $4; my $nr_reclaimed = $3;
my $flags = $6; my $flags = $12;
my $file = 0; my $file = 0;
if ($flags =~ /RECLAIM_WB_FILE/) { if ($flags =~ /RECLAIM_WB_FILE/) {
$file = 1; $file = 1;