Commit 6283c2ce authored by Vlastimil Babka's avatar Vlastimil Babka Committed by Zhao Mengmeng
Browse files

trace-vmscan-postprocess: sync with tracepoints updates 

mainline inclusion
from mainline-v6.7-rc1
commit 83121580f2eb487b7510fb892674c28412e7c73e
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I9O1OT
CVE: NA

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=83121580f2eb487b7510fb892674c28412e7c73e

--------------------------------

The script has fallen behind tracepoint changes for a while, fix it up.

Most changes are mechanical (renames, removal of tracepoint parameters
that are not used by the script).  More notable change involves
mm_vmscan_lru_isolate which is relying on the isolate_mode to determine if
the inactive list is being scanned.  However the parameter currently only
indicates ISOLATE_UNMAPPED.  We can use the lru parameter instead to
determine which list is scanned, and stop checking isolate_mode.

Link: https://lkml.kernel.org/r/20230914131637.12204-3-vbabka@suse.cz


Signed-off-by: default avatarVlastimil Babka <vbabka@suse.cz>
Cc: Hugh Dickins <hughd@google.com>
Cc: Mel Gorman <mgorman@techsingularity.net>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarZhao Mengmeng <zhaomengmeng@kylinos.cn>
parent a00ba8b5

Documentation/trace/postprocess/trace-vmscan-postprocess.pl

+17 −23
Original line number Diff line number Diff line
@@ -107,14 +107,14 @@ GetOptions( 
);



# Defaults for dynamically discovered regex's

my $regex_direct_begin_default = 'order=([0-9]*) may_writepage=([0-9]*) gfp_flags=([A-Z_|]*)';

my $regex_direct_begin_default = 'order=([0-9]*) gfp_flags=([A-Z_|]*)';

my $regex_direct_end_default = 'nr_reclaimed=([0-9]*)';

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]*) gfp_flags=([A-Z_|]*)';

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_wakeup_kswapd_default = 'nid=([0-9]*) order=([0-9]*) gfp_flags=([A-Z_|]*)';

my $regex_lru_isolate_default = 'isolate_mode=([0-9]*) classzone=([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]*) 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_anon=([0-9]*) nr_activate_file=([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_taken=([0-9]*) nr_active=([0-9]*) nr_deactivated=([0-9]*) nr_referenced=([0-9]*) priority=([0-9]*) flags=([A-Z_|]*)' ;

my $regex_writepage_default = 'page=([0-9a-f]*) pfn=([0-9]*) flags=([A-Z_|]*)';



# Dyanically discovered regex
@@ -184,8 +184,7 @@ sub generate_traceevent_regex { 
$regex_direct_begin = generate_traceevent_regex(

			"vmscan/mm_vmscan_direct_reclaim_begin",

			$regex_direct_begin_default,

			"order", "may_writepage",

			"gfp_flags");

			"order", "gfp_flags");

$regex_direct_end = generate_traceevent_regex(

			"vmscan/mm_vmscan_direct_reclaim_end",

			$regex_direct_end_default,
@@ -201,11 +200,11 @@ $regex_kswapd_sleep = generate_traceevent_regex( 
$regex_wakeup_kswapd = generate_traceevent_regex(

			"vmscan/mm_vmscan_wakeup_kswapd",

			$regex_wakeup_kswapd_default,

			"nid", "zid", "order", "gfp_flags");

			"nid", "order", "gfp_flags");

$regex_lru_isolate = generate_traceevent_regex(

			"vmscan/mm_vmscan_lru_isolate",

			$regex_lru_isolate_default,

			"isolate_mode", "classzone_idx", "order",

			"isolate_mode", classzone", "order",

			"nr_requested", "nr_scanned", "nr_skipped", "nr_taken",

			"lru");

$regex_lru_shrink_inactive = generate_traceevent_regex(
@@ -218,11 +217,10 @@ $regex_lru_shrink_inactive = generate_traceevent_regex( 
$regex_lru_shrink_active = generate_traceevent_regex(

			"vmscan/mm_vmscan_lru_shrink_active",

			$regex_lru_shrink_active_default,

			"nid", "zid",

			"lru",

			"nr_scanned", "nr_rotated", "priority");

			"nid", "nr_taken", "nr_active", "nr_deactivated", "nr_referenced",

			"priority", "flags");

$regex_writepage = generate_traceevent_regex(

			"vmscan/mm_vmscan_writepage",

			"vmscan/mm_vmscan_write_folio",

			$regex_writepage_default,

			"page", "pfn", "flags");
@@ -371,7 +369,7 @@ EVENT_PROCESS: 
				print "         $regex_wakeup_kswapd\n";

				next;

			}

			my $order = $3;

			my $order = $2;

			$perprocesspid{$process_pid}->{MM_VMSCAN_WAKEUP_KSWAPD_PERORDER}[$order]++;

		} elsif ($tracepoint eq "mm_vmscan_lru_isolate") {

			$details = $6;
@@ -381,18 +379,14 @@ EVENT_PROCESS: 
				print "         $regex_lru_isolate/o\n";

				next;

			}

			my $isolate_mode = $1;

			my $nr_scanned = $5;

			my $file = $8;



			# To closer match vmstat scanning statistics, only count isolate_both

			# and isolate_inactive as scanning. isolate_active is rotation

			# isolate_inactive == 1

			# isolate_active   == 2

			# isolate_both     == 3

			if ($isolate_mode != 2) {

			my $lru = $8;



			# To closer match vmstat scanning statistics, only count

			# inactive lru as scanning

			if ($lru =~ /inactive_/) {

				$perprocesspid{$process_pid}->{HIGH_NR_SCANNED} += $nr_scanned;

				if ($file =~ /_file/) {

				if ($lru =~ /_file/) {

					$perprocesspid{$process_pid}->{HIGH_NR_FILE_SCANNED} += $nr_scanned;

				} else {

					$perprocesspid{$process_pid}->{HIGH_NR_ANON_SCANNED} += $nr_scanned;