diff options
author | chrisrd <[email protected]> | 2018-02-24 03:50:06 +1100 |
---|---|---|
committer | Brian Behlendorf <[email protected]> | 2018-02-23 08:50:06 -0800 |
commit | e9a77290081b578144e9a911ad734f67274df82f (patch) | |
tree | 29036268b80f1a2695867d079e2a4facf916a616 /scripts | |
parent | 7088545d0166aa05b2c783f18aa821d95a1f023d (diff) |
Fix free memory calculation on v3.14+
Provide infrastructure to auto-configure to enum and API changes in the
global page stats used for our free memory calculations.
arc_free_memory has been broken since an API change in Linux v3.14:
2016-07-28 v4.8 599d0c95 mm, vmscan: move LRU lists to node
2016-07-28 v4.8 75ef7184 mm, vmstat: add infrastructure for per-node
vmstats
These commits moved some of global_page_state() into
global_node_page_state(). The API change was particularly egregious as,
instead of breaking the old code, it silently did the wrong thing and we
continued using global_page_state() where we should have been using
global_node_page_state(), thus indexing into the wrong array via
NR_SLAB_RECLAIMABLE et al.
There have been further API changes along the way:
2017-07-06 v4.13 385386cf mm: vmstat: move slab statistics from zone to
node counters
2017-09-06 v4.14 c41f012a mm: rename global_page_state to
global_zone_page_state
...and various (incomplete, as it turns out) attempts to accomodate
these changes in ZoL:
2017-08-24 2209e409 Linux 4.8+ compatibility fix for vm stats
2017-09-16 787acae0 Linux 3.14 compat: IO acct, global_page_state, etc
2017-09-19 661907e6 Linux 4.14 compat: IO acct, global_page_state, etc
The config infrastructure provided here resolves these issues going back
to the original API change in v3.14 and is robust against further Linux
changes in this area.
Reviewed-by: Giuseppe Di Natale <[email protected]>
Reviewed-by: Brian Behlendorf <[email protected]>
Reviewed-by: George Melikov <[email protected]>
Signed-off-by: Chris Dunlop <[email protected]>
Closes #7170
Diffstat (limited to 'scripts')
-rw-r--r-- | scripts/Makefile.am | 1 | ||||
-rwxr-xr-x | scripts/enum-extract.pl | 58 |
2 files changed, 59 insertions, 0 deletions
diff --git a/scripts/Makefile.am b/scripts/Makefile.am index 65d7d6662..57b9cfbf6 100644 --- a/scripts/Makefile.am +++ b/scripts/Makefile.am @@ -12,6 +12,7 @@ EXTRA_DIST = \ commitcheck.sh \ dkms.mkconf \ dkms.postbuild \ + enum-extract.pl \ kmodtool \ paxcheck.sh \ zfs2zol-patch.sed \ diff --git a/scripts/enum-extract.pl b/scripts/enum-extract.pl new file mode 100755 index 000000000..5112cc807 --- /dev/null +++ b/scripts/enum-extract.pl @@ -0,0 +1,58 @@ +#!/usr/bin/perl -w + +my $usage = <<EOT; +usage: config-enum enum [file ...] + +Returns the elements from an enum declaration. + +"Best effort": we're not building an entire C interpreter here! +EOT + +use warnings; +use strict; +use Getopt::Std; + +my %opts; + +if (!getopts("", \%opts) || @ARGV < 1) { + print $usage; + exit 2; +} + +my $enum = shift; + +my $in_enum = 0; + +while (<>) { + # comments + s/\/\*.*\*\///; + if (m/\/\*/) { + while ($_ .= <>) { + last if s/\/\*.*\*\///s; + } + } + + # preprocessor stuff + next if /^#/; + + # find our enum + $in_enum = 1 if s/^\s*enum\s+${enum}(?:\s|$)//; + next unless $in_enum; + + # remove explicit values + s/\s*=[^,]+,/,/g; + + # extract each identifier + while (m/\b([a-z_][a-z0-9_]*)\b/ig) { + print $1, "\n"; + } + + # + # don't exit: there may be multiple versions of the same enum, e.g. + # inside different #ifdef blocks. Let's explicitly return all of + # them and let external tooling deal with it. + # + $in_enum = 0 if m/}\s*;/; +} + +exit 0; |