|
|
@@ -46,7 +46,7 @@ use constant HIGH_KSWAPD_LATENCY => 20;
|
|
|
use constant HIGH_KSWAPD_REWAKEUP => 21;
|
|
|
use constant HIGH_NR_SCANNED => 22;
|
|
|
use constant HIGH_NR_TAKEN => 23;
|
|
|
-use constant HIGH_NR_RECLAIM => 24;
|
|
|
+use constant HIGH_NR_RECLAIMED => 24;
|
|
|
use constant HIGH_NR_CONTIG_DIRTY => 25;
|
|
|
|
|
|
my %perprocesspid;
|
|
|
@@ -58,11 +58,13 @@ my $opt_read_procstat;
|
|
|
my $total_wakeup_kswapd;
|
|
|
my ($total_direct_reclaim, $total_direct_nr_scanned);
|
|
|
my ($total_direct_latency, $total_kswapd_latency);
|
|
|
+my ($total_direct_nr_reclaimed);
|
|
|
my ($total_direct_writepage_file_sync, $total_direct_writepage_file_async);
|
|
|
my ($total_direct_writepage_anon_sync, $total_direct_writepage_anon_async);
|
|
|
my ($total_kswapd_nr_scanned, $total_kswapd_wake);
|
|
|
my ($total_kswapd_writepage_file_sync, $total_kswapd_writepage_file_async);
|
|
|
my ($total_kswapd_writepage_anon_sync, $total_kswapd_writepage_anon_async);
|
|
|
+my ($total_kswapd_nr_reclaimed);
|
|
|
|
|
|
# Catch sigint and exit on request
|
|
|
my $sigint_report = 0;
|
|
|
@@ -104,7 +106,7 @@ my $regex_kswapd_wake_default = 'nid=([0-9]*) order=([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_lru_isolate_default = 'isolate_mode=([0-9]*) order=([0-9]*) nr_requested=([0-9]*) nr_scanned=([0-9]*) nr_taken=([0-9]*) contig_taken=([0-9]*) contig_dirty=([0-9]*) contig_failed=([0-9]*)';
|
|
|
-my $regex_lru_shrink_inactive_default = 'lru=([A-Z_]*) nr_scanned=([0-9]*) nr_reclaimed=([0-9]*) priority=([0-9]*)';
|
|
|
+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_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_|]*)';
|
|
|
|
|
|
@@ -203,8 +205,8 @@ $regex_lru_shrink_inactive = generate_traceevent_regex(
|
|
|
"vmscan/mm_vmscan_lru_shrink_inactive",
|
|
|
$regex_lru_shrink_inactive_default,
|
|
|
"nid", "zid",
|
|
|
- "lru",
|
|
|
- "nr_scanned", "nr_reclaimed", "priority");
|
|
|
+ "nr_scanned", "nr_reclaimed", "priority",
|
|
|
+ "flags");
|
|
|
$regex_lru_shrink_active = generate_traceevent_regex(
|
|
|
"vmscan/mm_vmscan_lru_shrink_active",
|
|
|
$regex_lru_shrink_active_default,
|
|
|
@@ -375,6 +377,16 @@ EVENT_PROCESS:
|
|
|
my $nr_contig_dirty = $7;
|
|
|
$perprocesspid{$process_pid}->{HIGH_NR_SCANNED} += $nr_scanned;
|
|
|
$perprocesspid{$process_pid}->{HIGH_NR_CONTIG_DIRTY} += $nr_contig_dirty;
|
|
|
+ } elsif ($tracepoint eq "mm_vmscan_lru_shrink_inactive") {
|
|
|
+ $details = $5;
|
|
|
+ if ($details !~ /$regex_lru_shrink_inactive/o) {
|
|
|
+ print "WARNING: Failed to parse mm_vmscan_lru_shrink_inactive as expected\n";
|
|
|
+ print " $details\n";
|
|
|
+ print " $regex_lru_shrink_inactive/o\n";
|
|
|
+ next;
|
|
|
+ }
|
|
|
+ my $nr_reclaimed = $4;
|
|
|
+ $perprocesspid{$process_pid}->{HIGH_NR_RECLAIMED} += $nr_reclaimed;
|
|
|
} elsif ($tracepoint eq "mm_vmscan_writepage") {
|
|
|
$details = $5;
|
|
|
if ($details !~ /$regex_writepage/o) {
|
|
|
@@ -464,8 +476,8 @@ sub dump_stats {
|
|
|
|
|
|
# Print out process activity
|
|
|
printf("\n");
|
|
|
- printf("%-" . $max_strlen . "s %8s %10s %8s %8s %8s %8s %8s\n", "Process", "Direct", "Wokeup", "Pages", "Pages", "Pages", "Time");
|
|
|
- printf("%-" . $max_strlen . "s %8s %10s %8s %8s %8s %8s %8s\n", "details", "Rclms", "Kswapd", "Scanned", "Sync-IO", "ASync-IO", "Stalled");
|
|
|
+ printf("%-" . $max_strlen . "s %8s %10s %8s %8s %8s %8s %8s %8s\n", "Process", "Direct", "Wokeup", "Pages", "Pages", "Pages", "Pages", "Time");
|
|
|
+ printf("%-" . $max_strlen . "s %8s %10s %8s %8s %8s %8s %8s %8s\n", "details", "Rclms", "Kswapd", "Scanned", "Rclmed", "Sync-IO", "ASync-IO", "Stalled");
|
|
|
foreach $process_pid (keys %stats) {
|
|
|
|
|
|
if (!$stats{$process_pid}->{MM_VMSCAN_DIRECT_RECLAIM_BEGIN}) {
|
|
|
@@ -475,6 +487,7 @@ sub dump_stats {
|
|
|
$total_direct_reclaim += $stats{$process_pid}->{MM_VMSCAN_DIRECT_RECLAIM_BEGIN};
|
|
|
$total_wakeup_kswapd += $stats{$process_pid}->{MM_VMSCAN_WAKEUP_KSWAPD};
|
|
|
$total_direct_nr_scanned += $stats{$process_pid}->{HIGH_NR_SCANNED};
|
|
|
+ $total_direct_nr_reclaimed += $stats{$process_pid}->{HIGH_NR_RECLAIMED};
|
|
|
$total_direct_writepage_file_sync += $stats{$process_pid}->{MM_VMSCAN_WRITEPAGE_FILE_SYNC};
|
|
|
$total_direct_writepage_anon_sync += $stats{$process_pid}->{MM_VMSCAN_WRITEPAGE_ANON_SYNC};
|
|
|
$total_direct_writepage_file_async += $stats{$process_pid}->{MM_VMSCAN_WRITEPAGE_FILE_ASYNC};
|
|
|
@@ -489,11 +502,12 @@ sub dump_stats {
|
|
|
$index++;
|
|
|
}
|
|
|
|
|
|
- printf("%-" . $max_strlen . "s %8d %10d %8u %8u %8u %8.3f",
|
|
|
+ printf("%-" . $max_strlen . "s %8d %10d %8u %8u %8u %8u %8.3f",
|
|
|
$process_pid,
|
|
|
$stats{$process_pid}->{MM_VMSCAN_DIRECT_RECLAIM_BEGIN},
|
|
|
$stats{$process_pid}->{MM_VMSCAN_WAKEUP_KSWAPD},
|
|
|
$stats{$process_pid}->{HIGH_NR_SCANNED},
|
|
|
+ $stats{$process_pid}->{HIGH_NR_RECLAIMED},
|
|
|
$stats{$process_pid}->{MM_VMSCAN_WRITEPAGE_FILE_SYNC} + $stats{$process_pid}->{MM_VMSCAN_WRITEPAGE_ANON_SYNC},
|
|
|
$stats{$process_pid}->{MM_VMSCAN_WRITEPAGE_FILE_ASYNC} + $stats{$process_pid}->{MM_VMSCAN_WRITEPAGE_ANON_ASYNC},
|
|
|
$this_reclaim_delay / 1000);
|
|
|
@@ -529,8 +543,8 @@ sub dump_stats {
|
|
|
|
|
|
# Print out kswapd activity
|
|
|
printf("\n");
|
|
|
- printf("%-" . $max_strlen . "s %8s %10s %8s %8s %8s %8s\n", "Kswapd", "Kswapd", "Order", "Pages", "Pages", "Pages");
|
|
|
- printf("%-" . $max_strlen . "s %8s %10s %8s %8s %8s %8s\n", "Instance", "Wakeups", "Re-wakeup", "Scanned", "Sync-IO", "ASync-IO");
|
|
|
+ printf("%-" . $max_strlen . "s %8s %10s %8s %8s %8s %8s\n", "Kswapd", "Kswapd", "Order", "Pages", "Pages", "Pages", "Pages");
|
|
|
+ printf("%-" . $max_strlen . "s %8s %10s %8s %8s %8s %8s\n", "Instance", "Wakeups", "Re-wakeup", "Scanned", "Rclmed", "Sync-IO", "ASync-IO");
|
|
|
foreach $process_pid (keys %stats) {
|
|
|
|
|
|
if (!$stats{$process_pid}->{MM_VMSCAN_KSWAPD_WAKE}) {
|
|
|
@@ -539,16 +553,18 @@ sub dump_stats {
|
|
|
|
|
|
$total_kswapd_wake += $stats{$process_pid}->{MM_VMSCAN_KSWAPD_WAKE};
|
|
|
$total_kswapd_nr_scanned += $stats{$process_pid}->{HIGH_NR_SCANNED};
|
|
|
+ $total_kswapd_nr_reclaimed += $stats{$process_pid}->{HIGH_NR_RECLAIMED};
|
|
|
$total_kswapd_writepage_file_sync += $stats{$process_pid}->{MM_VMSCAN_WRITEPAGE_FILE_SYNC};
|
|
|
$total_kswapd_writepage_anon_sync += $stats{$process_pid}->{MM_VMSCAN_WRITEPAGE_ANON_SYNC};
|
|
|
$total_kswapd_writepage_file_async += $stats{$process_pid}->{MM_VMSCAN_WRITEPAGE_FILE_ASYNC};
|
|
|
$total_kswapd_writepage_anon_async += $stats{$process_pid}->{MM_VMSCAN_WRITEPAGE_ANON_ASYNC};
|
|
|
|
|
|
- printf("%-" . $max_strlen . "s %8d %10d %8u %8i %8u",
|
|
|
+ printf("%-" . $max_strlen . "s %8d %10d %8u %8u %8i %8u",
|
|
|
$process_pid,
|
|
|
$stats{$process_pid}->{MM_VMSCAN_KSWAPD_WAKE},
|
|
|
$stats{$process_pid}->{HIGH_KSWAPD_REWAKEUP},
|
|
|
$stats{$process_pid}->{HIGH_NR_SCANNED},
|
|
|
+ $stats{$process_pid}->{HIGH_NR_RECLAIMED},
|
|
|
$stats{$process_pid}->{MM_VMSCAN_WRITEPAGE_FILE_SYNC} + $stats{$process_pid}->{MM_VMSCAN_WRITEPAGE_ANON_SYNC},
|
|
|
$stats{$process_pid}->{MM_VMSCAN_WRITEPAGE_FILE_ASYNC} + $stats{$process_pid}->{MM_VMSCAN_WRITEPAGE_ANON_ASYNC});
|
|
|
|
|
|
@@ -579,6 +595,7 @@ sub dump_stats {
|
|
|
print "\nSummary\n";
|
|
|
print "Direct reclaims: $total_direct_reclaim\n";
|
|
|
print "Direct reclaim pages scanned: $total_direct_nr_scanned\n";
|
|
|
+ print "Direct reclaim pages reclaimed: $total_direct_nr_reclaimed\n";
|
|
|
print "Direct reclaim write file sync I/O: $total_direct_writepage_file_sync\n";
|
|
|
print "Direct reclaim write anon sync I/O: $total_direct_writepage_anon_sync\n";
|
|
|
print "Direct reclaim write file async I/O: $total_direct_writepage_file_async\n";
|
|
|
@@ -588,6 +605,7 @@ sub dump_stats {
|
|
|
print "\n";
|
|
|
print "Kswapd wakeups: $total_kswapd_wake\n";
|
|
|
print "Kswapd pages scanned: $total_kswapd_nr_scanned\n";
|
|
|
+ print "Kswapd pages reclaimed: $total_kswapd_nr_reclaimed\n";
|
|
|
print "Kswapd reclaim write file sync I/O: $total_kswapd_writepage_file_sync\n";
|
|
|
print "Kswapd reclaim write anon sync I/O: $total_kswapd_writepage_anon_sync\n";
|
|
|
print "Kswapd reclaim write file async I/O: $total_kswapd_writepage_file_async\n";
|
|
|
@@ -612,6 +630,7 @@ sub aggregate_perprocesspid() {
|
|
|
$perprocess{$process}->{MM_VMSCAN_WAKEUP_KSWAPD} += $perprocesspid{$process_pid}->{MM_VMSCAN_WAKEUP_KSWAPD};
|
|
|
$perprocess{$process}->{HIGH_KSWAPD_REWAKEUP} += $perprocesspid{$process_pid}->{HIGH_KSWAPD_REWAKEUP};
|
|
|
$perprocess{$process}->{HIGH_NR_SCANNED} += $perprocesspid{$process_pid}->{HIGH_NR_SCANNED};
|
|
|
+ $perprocess{$process}->{HIGH_NR_RECLAIMED} += $perprocesspid{$process_pid}->{HIGH_NR_RECLAIMED};
|
|
|
$perprocess{$process}->{MM_VMSCAN_WRITEPAGE_FILE_SYNC} += $perprocesspid{$process_pid}->{MM_VMSCAN_WRITEPAGE_FILE_SYNC};
|
|
|
$perprocess{$process}->{MM_VMSCAN_WRITEPAGE_ANON_SYNC} += $perprocesspid{$process_pid}->{MM_VMSCAN_WRITEPAGE_ANON_SYNC};
|
|
|
$perprocess{$process}->{MM_VMSCAN_WRITEPAGE_FILE_ASYNC} += $perprocesspid{$process_pid}->{MM_VMSCAN_WRITEPAGE_FILE_ASYNC};
|
Mel Gorman