damo 3.2.2__tar.gz → 3.2.4__tar.gz

{damo-3.2.2 → damo-3.2.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: damo
-Version: 3.2.2
+Version: 3.2.4
 Summary: DAMON user-space tool
 Home-page: https://github.com/damonitor/damo
 Author: SeongJae Park
@@ -71,7 +71,7 @@ The second and last commands will show the access pattern of your workload,
 like below:
 
 ![masim_stairs_snapshot](images/masim_stairs_snapshot.png)
-![masim stairs heatmap in ascii](https://raw.githubusercontent.com/damonitor/damo/v3.2.2/images/masim_stairs_heatmap_ascii.png)
+![masim stairs heatmap in ascii](https://raw.githubusercontent.com/damonitor/damo/v3.2.4/images/masim_stairs_heatmap_ascii.png)
 
 
 FAQs
@@ -90,7 +90,7 @@ Where can I get more detailed usage?
 ------------------------------------
 
 The below sections provide quick introductions for `damo`'s major features.
-For more detailed usage, please refer to [USAGE.md](https://github.com/damonitor/damo/blob/v3.2.2/USAGE.md) file.
+For more detailed usage, please refer to [USAGE.md](https://github.com/damonitor/damo/blob/v3.2.4/USAGE.md) file.
 
 
 What does the version numbers mean?
@@ -115,7 +115,7 @@ We try our best to make `damo` stable and doesn't introduce regressions to
 users.  However, nothing goes forever.  Sometimes, some features will be
 deprecated.  Some features will have longer support more than others.
 
-In short, features that documented on [USAGE.md](https://github.com/damonitor/damo/blob/v3.2.2/USAGE.md) and not explicitly
+In short, features that documented on [USAGE.md](https://github.com/damonitor/damo/blob/v3.2.4/USAGE.md) and not explicitly
 marked as experimental will be better supported, and provides at least three
 months of deprecation grace period.  Within the grace period, users can ask
 extension of the support.  Even after the grace period, please reach out to
@@ -138,7 +138,7 @@ Quick Intro for Major Features
 ==============================
 
 Below are quick introductions for `damo`'s major features.
-For more detailed usage, please refer to [USAGE.md](https://github.com/damonitor/damo/blob/v3.2.2/USAGE.md) file.
+For more detailed usage, please refer to [USAGE.md](https://github.com/damonitor/damo/blob/v3.2.4/USAGE.md) file.
 
 
 Snapshot Data Access Pattern

{damo-3.2.2 → damo-3.2.4}/README.md

@@ -47,7 +47,7 @@ The second and last commands will show the access pattern of your workload,
 like below:
 
 ![masim_stairs_snapshot](images/masim_stairs_snapshot.png)
-![masim stairs heatmap in ascii](https://raw.githubusercontent.com/damonitor/damo/v3.2.2/images/masim_stairs_heatmap_ascii.png)
+![masim stairs heatmap in ascii](https://raw.githubusercontent.com/damonitor/damo/v3.2.4/images/masim_stairs_heatmap_ascii.png)
 
 
 FAQs
@@ -66,7 +66,7 @@ Where can I get more detailed usage?
 ------------------------------------
 
 The below sections provide quick introductions for `damo`'s major features.
-For more detailed usage, please refer to [USAGE.md](https://github.com/damonitor/damo/blob/v3.2.2/USAGE.md) file.
+For more detailed usage, please refer to [USAGE.md](https://github.com/damonitor/damo/blob/v3.2.4/USAGE.md) file.
 
 
 What does the version numbers mean?
@@ -91,7 +91,7 @@ We try our best to make `damo` stable and doesn't introduce regressions to
 users.  However, nothing goes forever.  Sometimes, some features will be
 deprecated.  Some features will have longer support more than others.
 
-In short, features that documented on [USAGE.md](https://github.com/damonitor/damo/blob/v3.2.2/USAGE.md) and not explicitly
+In short, features that documented on [USAGE.md](https://github.com/damonitor/damo/blob/v3.2.4/USAGE.md) and not explicitly
 marked as experimental will be better supported, and provides at least three
 months of deprecation grace period.  Within the grace period, users can ask
 extension of the support.  Even after the grace period, please reach out to
@@ -114,7 +114,7 @@ Quick Intro for Major Features
 ==============================
 
 Below are quick introductions for `damo`'s major features.
-For more detailed usage, please refer to [USAGE.md](https://github.com/damonitor/damo/blob/v3.2.2/USAGE.md) file.
+For more detailed usage, please refer to [USAGE.md](https://github.com/damonitor/damo/blob/v3.2.4/USAGE.md) file.
 
 
 Snapshot Data Access Pattern

{damo-3.2.2 → damo-3.2.4}/src/damo/_damon.py

@@ -16,6 +16,84 @@ import _damo_fmt_str
 
 # Core data structures
 
+class DamonFilter:
+    filter_type = None  # anon, memcg
+    matching = None
+    allow = None
+    path = None
+
+    def __init__(self, filter_type, matching, allow=False, path=None):
+        self.filter_type = filter_type
+        self.matching = _damo_fmt_str.text_to_bool(matching)
+        self.allow = _damo_fmt_str.text_to_bool(allow)
+        self.path = path
+
+    def to_str(self, raw):
+        words = []
+        if self.allow:
+            words.append('allow')
+        else:
+            words.append('reject')
+        if self.matching is False:
+            words.append('non')
+        words.append(self.filter_type)
+        if self.filter_type in ['anon']:
+            return ' '.join(words)
+        if self.filter_type == 'memcg':
+            return ' '.join(words + [self.path])
+
+    def __str__(self):
+        return self.to_str(False)
+
+    def __eq__(self, other):
+        return type(self) == type(other) and \
+                self.filter_type == other.filter_type and \
+                self.matching == other.matching and \
+                self.allow == other.allow and self.path == other.path
+
+    @classmethod
+    def from_kvpairs(cls, kv):
+        return DamonFilter(
+                filter_type=kv['filter_type'], matching=kv['matching'],
+                allow=kv['allow'], path=kv['path'])
+
+    def to_kvpairs(self, raw=False):
+        return collections.OrderedDict([
+            ('filter_type', self.filter_type),
+            ('matching', self.matching),
+            ('allow', self.allow),
+            ('path', self.path),
+            ])
+
+class DamonProbe:
+    filters = None
+
+    def __init__(self, filters):
+        if type(filters) is not list:
+            raise Exception('filters for DamonProbe() is not a list')
+        self.filters = filters
+
+    def to_str(self, raw):
+        return ', '.join([f.to_str(raw) for f in self.filters])
+
+    def __str__(self):
+        return self.to_str(False)
+
+    def __eq__(self, other):
+        return type(self) == type(other) and \
+                self.filters == other.filters
+
+    @classmethod
+    def from_kvpairs(cls, kv):
+        return DamonProbe(filters=[
+                DamonFilter.from_kvpairs(filter_kv)
+                for filter_kv in kv['filters']])
+
+    def to_kvpairs(self, raw=False):
+        return collections.OrderedDict([
+            ('filters', [f.to_kvpairs(raw) for f in self.filters]),
+            ])
+
 class OpsAttrs:
     use_reports = None
     write_only = None
@@ -449,12 +527,13 @@ class DamonRegion:
     end = None
     # nr_accesses and age could be None
     nr_accesses = None
+    probe_hits = None   # list of integers
     age = None
     sz_filter_passed = None
     scheme = None # non-None if tried region
 
     def __init__(self, start, end, nr_accesses=None, nr_accesses_unit=None,
-            age=None, age_unit=None, sz_filter_passed=0):
+            age=None, age_unit=None, sz_filter_passed=0, probe_hits=None):
         self.start = _damo_fmt_str.text_to_bytes(start)
         self.end = _damo_fmt_str.text_to_bytes(end)
 
@@ -463,6 +542,9 @@ class DamonRegion:
         self.nr_accesses = DamonNrAccesses(nr_accesses, nr_accesses_unit)
         self.age = DamonAge(age, age_unit)
         self.sz_filter_passed = sz_filter_passed
+        if probe_hits is None:
+            probe_hits = []
+        self.probe_hits = probe_hits
 
     def to_str(self, raw, intervals=None):
         if self.nr_accesses == None:
@@ -482,6 +564,9 @@ class DamonRegion:
                 _damo_fmt_str.format_addr_range(self.start, self.end, raw),
                 self.nr_accesses.to_str(nr_accesses_unit, raw),
                 self.age.to_str(age_unit, raw))
+        if self.probe_hits:
+            str += ', probe_hits: %s' % ' '.join(
+                    ['%d' % h for h in self.probe_hits])
         if self.sz_filter_passed is not None:
             str += ', filter_passed: %s' % _damo_fmt_str.format_sz(
                     self.sz_filter_passed, raw)
@@ -505,6 +590,7 @@ class DamonRegion:
         region = DamonRegion(kvpairs['start'], kvpairs['end'])
         region.nr_accesses = DamonNrAccesses.from_kvpairs(
                 kvpairs['nr_accesses'])
+        region.probe_hits = kvpairs.get('probe_hits', [])
         region.age = DamonAge.from_kvpairs(kvpairs['age'])
         if 'sz_filter_passed' in kvpairs:
             region.sz_filter_passed = _damo_fmt_str.text_to_bytes(
@@ -523,6 +609,7 @@ class DamonRegion:
             ('end', _damo_fmt_str.format_nr(self.end, raw)),
             ('nr_accesses', self.nr_accesses.to_kvpairs(raw)),
             ('age', self.age.to_kvpairs(raw)),
+            ('probe_hits', self.probe_hits),
             ('sz_filter_passed', _damo_fmt_str.format_sz(
                 self.sz_filter_passed, raw)),
             ])
@@ -724,10 +811,13 @@ qgoal_node_memcg_used_bp = 'node_memcg_used_bp'
 qgoal_node_memcg_free_bp = 'node_memcg_free_bp'
 qgoal_active_mem_bp = 'active_mem_bp'
 qgoal_inactive_mem_bp = 'inactive_mem_bp'
+qgoal_node_eligible_mem_bp = 'node_eligible_mem_bp'
 qgoal_metrics = [qgoal_user_input, qgoal_some_mem_psi_us,
                  qgoal_node_mem_used_bp, qgoal_node_mem_free_bp,
                  qgoal_node_memcg_used_bp, qgoal_node_memcg_free_bp,
-                 qgoal_active_mem_bp, qgoal_inactive_mem_bp]
+                 qgoal_active_mem_bp, qgoal_inactive_mem_bp,
+                 qgoal_node_eligible_mem_bp,
+                 ]
 
 class DamosQuotaGoal:
     metric = None
@@ -1193,30 +1283,33 @@ class DamosStats:
                    max_nr_snapshots=max_nr_snapshots)
 
 # TODO: check support of pageout and lru_(de)prio
+
+damos_action_willneed = 'willneed'
+damos_action_cold = 'cold'
+damos_action_pageout = 'pageout'
+damos_action_hugepage = 'hugepage'
+damos_action_collapse = 'collapse'
+damos_action_nohugepage = 'nohugepage'
+damos_action_lru_prio = 'lru_prio'
+damos_action_lru_deprio = 'lru_deprio'
+damos_action_migrate_hot = 'migrate_hot'
+damos_action_migrate_cold = 'migrate_cold'
+damos_action_stat = 'stat'
+
 damos_actions = [
-        'willneed',
-        'cold',
-        'pageout',
-        'hugepage',
-        'nohugepage',
-        'lru_prio',
-        'lru_deprio',
-        'migrate_hot',
-        'migrate_cold',
-        'stat',
+        damos_action_willneed,
+        damos_action_cold,
+        damos_action_pageout,
+        damos_action_hugepage,
+        damos_action_collapse,
+        damos_action_nohugepage,
+        damos_action_lru_prio,
+        damos_action_lru_deprio,
+        damos_action_migrate_hot,
+        damos_action_migrate_cold,
+        damos_action_stat,
         ]
 
-damos_action_willneed = damos_actions[0]
-damos_action_cold = damos_actions[1]
-damos_action_pageout = damos_actions[2]
-damos_action_hugepage = damos_actions[3]
-damos_action_nohugepage = damos_actions[4]
-damos_action_lru_prio = damos_actions[5]
-damos_action_lru_deprio = damos_actions[6]
-damos_action_migrate_hot = damos_actions[7]
-damos_action_migrate_cold = damos_actions[8]
-damos_action_stat = damos_actions[9]
-
 def is_damos_migrate_action(action):
     if action == damos_action_migrate_hot or \
        action == damos_action_migrate_cold:
@@ -1393,6 +1486,7 @@ class DamonCtx:
     targets = None
     intervals = None
     nr_regions = None
+    probes = None
     sample_control = None
     pause = None
     schemes = None
@@ -1400,7 +1494,7 @@ class DamonCtx:
 
     def __init__(self, ops='paddr', targets=None, intervals=None,
                  nr_regions=None, schemes=None, ops_attrs=None,
-                 sample_control=None, addr_unit=None, pause=None):
+                 sample_control=None, addr_unit=None, pause=None, probes=None):
         self.ops = ops
         self.ops_attrs = ops_attrs if ops_attrs is not None else OpsAttrs()
         if addr_unit is None:
@@ -1414,6 +1508,9 @@ class DamonCtx:
                           if intervals is not None else DamonIntervals())
         self.nr_regions = (nr_regions if nr_regions is not None
                            else DamonNrRegionsRange())
+        if probes is None:
+            probes = []
+        self.probes = probes
         if sample_control is None:
             sample_control = DamonSampleControl()
         self.sample_control = sample_control
@@ -1424,6 +1521,16 @@ class DamonCtx:
         for scheme in self.schemes:
             scheme.context = self
 
+    def add_probes_str(self, lines, raw):
+        if len(self.probes) == 0:
+            return
+        if len(self.probes) == 1:
+            lines.append('probe %s' % self.probes[0].to_str(raw))
+            return
+        lines.append('probes')
+        for idx, probe in enumerate(self.probes):
+            lines.append('- %s' % probe.to_str(raw))
+
     def to_str(self, raw, params_only=False, omit_damos_tried_regions=False):
         ops_line_tokens = ['ops: %s' % self.ops]
         if self.ops_attrs.use_reports:
@@ -1437,6 +1544,7 @@ class DamonCtx:
                     'addr_unit %s' % _damo_fmt_str.format_sz_accurate(
                         self.addr_unit, raw))
         lines = [' '.join(ops_line_tokens)]
+        self.add_probes_str(lines, raw)
         if self.pause is True:
             lines.append('pause: True')
         for idx, target in enumerate(self.targets):
@@ -1476,6 +1584,8 @@ class DamonCtx:
             sample_control = DamonSampleControl()
         addr_unit = kv.get('addr_unit', 1)
         pause = _damo_fmt_str.text_to_bool(kv.get('pause', False))
+        probes = [DamonProbe.from_kvpairs(probe_kv)
+                  for probe_kv in kv.get('probes', [])]
         ctx = DamonCtx(
                 kv['ops'],
                 [DamonTarget.from_kvpairs(t) for t in kv['targets']],
@@ -1485,6 +1595,7 @@ class DamonCtx:
                     if 'nr_regions' in kv else DamonNrRegionsRange(),
                 [Damos.from_kvpairs(s) for s in kv['schemes']]
                     if 'schemes' in kv else [],
+                probes=probes,
                 sample_control=sample_control,
                 addr_unit=addr_unit,
                 pause=pause)
@@ -1499,6 +1610,7 @@ class DamonCtx:
             kv['intervals'] = self.intervals.to_kvpairs(raw)
         if not omit_defaults or self.nr_regions != DamonNrRegionsRange():
             kv['nr_regions'] = self.nr_regions.to_kvpairs(raw)
+        kv['probes'] = [probe.to_kvpairs(raw) for probe in self.probes]
         kv['sample_control'] = self.sample_control.to_kvpairs(raw)
         kv['pause'] = self.pause
         kv['schemes'] = [s.to_kvpairs(raw, omit_defaults, params_only)

{damo-3.2.2 → damo-3.2.4}/src/damo/_damon_args.py

@@ -641,8 +641,8 @@ def damon_ctx_for(args, idx):
 
 def get_nr_ctxs(args):
     candidates = []
-    for v in [args.ops, args.sample, args.aggr, args.updr, args.minr,
-              args.maxr, args.monitoring_intervals,
+    for v in [args.ops, args.nr_probes, args.sample, args.aggr, args.updr,
+              args.minr, args.maxr, args.monitoring_intervals,
               args.monitoring_intervals_goal,
               args.monitoring_nr_regions_range]:
         if v is not None:
@@ -752,6 +752,90 @@ def gen_assign_schemes(ctxs, args):
         scheme_idx += nr
     return None
 
+def probe_filter_for(filter_arg_fields):
+    fields = filter_arg_fields
+    if len(fields) < 2:
+        return None, 'expected >=2 fields but %d' % len(fields)
+    if not fields[0] in ['allow', 'reject']:
+        return None, 'expected allow|reject but %s' % fields[0]
+    allow = fields[0] == 'allow'
+    fields = fields[1:]
+    matching = True
+    if fields[0] == 'non':
+        matching = False
+        fields = fields[1:]
+    if len(fields) < 1:
+        return None, 'filter type is not given'
+    filter_type = fields[0]
+    fields = fields[1:]
+    path = None
+    if filter_type == 'memcg':
+        if len(fields) < 1:
+            return None, 'memcg path is not given'
+        path = fields[0]
+    try:
+        filter = _damon.DamonFilter(filter_type=filter_type, matching=matching,
+                                    allow=allow, path=path)
+    except Exception as e:
+        return None, 'filter creation fail (%s)' % e
+    return filter, None
+
+def probe_filters_for(filters_args):
+    filters = []
+    for filter_args in filters_args:
+        filter, err = probe_filter_for(filter_args)
+        if err is not None:
+            return None, err
+        filters.append(filter)
+    return filters, None
+
+def probes_for(args):
+    filters, err = probe_filters_for(args.probe_filter)
+    if err is not None:
+        return None, err
+    if len(filters) == 0:
+        return [], None
+    probes = []
+    filter_idx = 0
+    if args.nr_probe_filters is None:
+        args.nr_probe_filters = [len(args.probe_filter)]
+    if sum(args.nr_probe_filters) != len(filters):
+        return None, \
+                '--nr_probe_filters mismatches --probe_filter (%d != %d)' % (
+                        sum(args.nr_probe_filters), len(filters))
+    for nr in args.nr_probe_filters:
+        filters_for_probe = filters[filter_idx:filter_idx + nr]
+        try:
+            probe = _damon.DamonProbe(filters=filters_for_probe)
+        except Exception as e:
+            return None, 'probe creation fail (%s)' % e
+        probes.append(probe)
+        filter_idx += nr
+    return probes, None
+
+def gen_assign_probes(ctxs, args):
+    probes, err = probes_for(args)
+    if err is not None:
+        return err
+    if args.nr_probes is None:
+        if len(ctxs) != 1 and len(probes) > 0:
+            return '--nr_probes is required'
+        args.nr_probes = [len(probes)]
+        args.nr_probes += [0] * (len(ctxs) - 1)
+    if sum(args.nr_probes) != len(probes):
+        return '--nr_probes mismatches number of probes (%d != %d)' % (
+                sum(args.nr_probes), len(probes))
+    if len(args.nr_probes) != len(ctxs):
+        return '--nr_probes mismatches number of contexts (%d != %d)' % (
+                len(args.nr_probes), len(ctxs))
+    ctx_idx = 0
+    probe_idx = 0
+    for nr in args.nr_probes:
+        ctxs[ctx_idx].probes = probes[probe_idx:probe_idx + nr]
+        ctx_idx += 1
+        probe_idx += nr
+    return None
+
 def damon_ctxs_for(args):
     fillup_none_ctx_args(args)
     fillup_none_target_args(args)
@@ -770,6 +854,10 @@ def damon_ctxs_for(args):
     if err is not None:
         return None, err
 
+    err = gen_assign_probes(ctxs, args)
+    if err is not None:
+        return None, err
+
     return ctxs, err
 
 def kdamonds_from_json_arg(arg):
@@ -854,7 +942,7 @@ def deduce_target_update_args(args):
 def warn_for(arg, feature):
     if _damo_sysinfo.damon_feature_available(feature):
         return
-    sys.stderr.write('%s is passed but %s DAMON feature is not available' %
+    sys.stderr.write('%s is passed but %s DAMON feature is not available\n' %
                      (arg, feature))
 
 def warn_for_features(arg, features):
@@ -862,7 +950,7 @@ def warn_for_features(arg, features):
         if _damo_sysinfo.damon_feature_available(feature):
             return
     sys.stderr.write(
-            '%s is passed but any of %s DAMON features is not available' %
+            '%s is passed but any of %s DAMON features is not available\n' %
             (arg, ', '.join(features)))
 
 def warn_unsupported_damon_features_for(args):
@@ -870,6 +958,19 @@ def warn_unsupported_damon_features_for(args):
     if args.sample_primitives is not None:
         warn_for('--sample_primitives', 'sysfs/damon_sample_control')
 
+    if args.probe_filter != []:
+        warn_for('--probe_filter', 'sysfs/attrs_monitoring')
+
+    # 7.2
+    if _damon.damos_action_collapse in args.damos_action:
+        warn_for('--damos_action collapse', 'sysfs/damos_action_collapse')
+    for quota_goal in args.damos_quota_goal:
+        metric = quota_goal[0]
+        if metric == _damon.qgoal_node_eligible_mem_bp:
+            warn_for('--damos_quota_goal %s' % metric,
+                     'sysfs/damos_quota_goal_node_eligible_mem_bp')
+
+    # 7.1
     if args.damos_quota_goal_tuner != []:
         warn_for('--damos_quota_goal_tuner', 'sysfs/damos_quota_goal_tuner')
     if args.pause_ctx is not None:
@@ -1273,6 +1374,21 @@ def set_monitoring_damos_common_args(parser, hide_help=False):
                         action='append',
                         help='monitoring operations set'
                         if not hide_help else argparse.SUPPRESS)
+
+    parser.add_argument('--probe_filter', nargs='+', action='append',
+                        default=[],
+                        metavar='<<allow|reject> [non] <type> [option]...>',
+                        help='data attribute monitoring probe filter'
+                        if not hide_help else argparse.SUPPRESS)
+    parser.add_argument(
+            '--nr_probe_filters', type=int, nargs='+', metavar='<integer>',
+            help='number of filters for each probe (in order)'
+            if not hide_help else argparse.SUPPRESS)
+    parser.add_argument(
+            '--nr_probes', type=int, nargs='+', metavar='<integer>',
+            help='number of probes for each context (in order)'
+            if not hide_help else argparse.SUPPRESS)
+
     parser.add_argument(
             '--pause_ctx', type=int, nargs='+', metavar='<context index>',
             help='contexts to pause')

{damo-3.2.2 → damo-3.2.4}/src/damo/_damon_features.py

@@ -327,15 +327,26 @@ features_list = [
                      upstream_status='merged in v7.0-rc1 (4835e2871321f)',
                      upstreamed_version='7.0'),
 
+        # v7.1-rc1 release: Sun Apr 26 14:19:00 2026 -0700
         DamonFeature(name='sysfs/damos_quota_goal_tuner',
+                     upstream_status='merged in v7.1-rc1 (8719c59c4b928)',
+                     upstreamed_version='7.1'),
+
+        DamonFeature(name='sysfs/damos_action_collapse',
+                     upstream_status='merged in mm.git',
+                     upstreamed_version='none'),
+        DamonFeature(name='sysfs/damos_quota_goal_node_eligible_mem_bp',
                      upstream_status='merged in mm.git',
                      upstreamed_version='none'),
-
         DamonFeature(name='sysfs/ctx_pause',
-                     upstream_status='wip on damon/next',
+                     upstream_status='merged in mm.git',
                      upstreamed_version='none'),
         DamonFeature(name='sysfs/damos_quota_fail_charge_ratio',
-                     upstream_status='wip on damon/next',
+                     upstream_status='merged in mm.git',
+                     upstreamed_version='none'),
+
+        DamonFeature(name='sysfs/attrs_monitoring',
+                     upstream_status='hacking on damon/next',
                      upstreamed_version='none'),
 
         DamonFeature(name='sysfs/damon_sample_control',

{damo-3.2.2 → damo-3.2.4}/src/damo/_damon_sysfs.py

@@ -570,6 +570,52 @@ def write_ops_attrs_dir(dir_path, ops_attrs):
     if err is not None:
         return err
 
+def write_probe_filter_dir(dir_path, filter):
+    err = _damo_fs.write_file(
+            os.path.join(dir_path, 'type'), filter.filter_type)
+    if err is not None:
+        return err
+    err = _damo_fs.write_file(os.path.join(dir_path, 'matching'),
+                              'Y' if filter.matching else 'N')
+    if err is not None:
+        return err
+    err = _damo_fs.write_file(os.path.join(dir_path, 'allow'),
+                              'Y' if filter.allow else 'N')
+    if err is not None:
+        return err
+    if filter.filter_type == 'memcg':
+        err = _damo_fs.write_file(os.path.join(dir_path, 'path'), filter.path)
+        if err is not None:
+            return err
+    return None
+
+def write_probe_dir(dir_path, probe):
+    filters_dir = os.path.join(dir_path, 'filters')
+    err = ensure_nr_file_for(os.path.join(filters_dir, 'nr_filters'),
+                             probe.filters)
+    if err is not None:
+        return err
+
+    for idx, filter in enumerate(probe.filters):
+        err = write_probe_filter_dir(
+                os.path.join(filters_dir, '%d' % idx), filter)
+        if err is not None:
+            return err
+    return None
+
+def write_probes_dir(dir_path, probes):
+    if not os.path.isdir(dir_path):
+        return None
+    err = ensure_nr_file_for(os.path.join(dir_path, 'nr_probes'), probes)
+    if err is not None:
+        return err
+
+    for idx, probe in enumerate(probes):
+        err = write_probe_dir(os.path.join(dir_path, '%d' % idx), probe)
+        if err is not None:
+            return err
+    return None
+
 def write_sample_filter_dir(dir_path, sample_filter):
     err = _damo_fs.write_file(
             os.path.join(dir_path, 'type'), sample_filter.filter_type)
@@ -672,6 +718,11 @@ def write_monitoring_attrs_dir(dir_path, context):
     if err is not None:
         return err
 
+    err = write_probes_dir(
+            os.path.join(dir_path, 'probes'), context.probes)
+    if err is not None:
+        return err
+
     return write_sample_control_dir(
             os.path.join(dir_path, 'sample'), context.sample_control)
 
@@ -930,14 +981,28 @@ def files_content_to_damos_stats(files_content):
             int(files_content['qt_exceeds']),
             nr_snapshots=nr_snapshots, max_nr_snapshots=max_nr_snapshots)
 
+def files_content_to_probe_hits(files_content):
+    hits = []
+    for kv in number_sorted_dirs(files_content):
+        hits.append(int(kv['hits']))
+    return hits
+
 def files_content_to_damos_tried_regions(files_content):
-    return [_damon.DamonRegion(
-            int(kv['start']), int(kv['end']),
-            int(kv['nr_accesses']), _damon.unit_samples,
-            int(kv['age']), _damon.unit_aggr_intervals,
-            int(kv['sz_filter_passed'])
-            if 'sz_filter_passed' in kv else None,
-            ) for kv in number_sorted_dirs(files_content)]
+    regions = []
+    for kv in number_sorted_dirs(files_content):
+        if 'probes' in kv:
+            probe_hits = files_content_to_probe_hits(kv['probes'])
+        else:
+            probe_hits = []
+        regions.append(
+                _damon.DamonRegion(
+                    int(kv['start']), int(kv['end']),
+                    int(kv['nr_accesses']), _damon.unit_samples,
+                    int(kv['age']), _damon.unit_aggr_intervals,
+                    int(kv['sz_filter_passed'])
+                    if 'sz_filter_passed' in kv else None,
+                    probe_hits=probe_hits))
+    return regions
 
 def files_content_to_damos_dest(files_content):
     return _damon.DamosDest(
@@ -985,6 +1050,29 @@ def files_content_to_target(files_content):
     regions = files_content_to_regions(files_content['regions'])
     return _damon.DamonTarget(pid, regions, obsolete=obsolete)
 
+def files_content_to_damon_filter(files_content):
+    path = None
+    if 'path' in files_content:
+        files_content.get('path').strip()
+    return _damon.DamonFilter(
+        filter_type=files_content['type'].strip(),
+        matching=files_content['matching'].strip(),
+        allow=files_content['allow'].strip(), path=path)
+
+def files_content_to_probe(files_content):
+    filters_content = files_content['filters']
+    filters = []
+    for kv in number_sorted_dirs(filters_content):
+        filter = files_content_to_damon_filter(kv)
+        filters.append(filter)
+    return _damon.DamonProbe(filters=filters)
+
+def files_content_to_probes(files_content):
+    probes = []
+    for kv in number_sorted_dirs(files_content):
+        probes.append(files_content_to_probe(kv))
+    return probes
+
 def files_content_to_sample_filter(files_content):
     filter_type = files_content['type'].strip()
     matching = files_content['matching'].strip()
@@ -1037,6 +1125,11 @@ def files_content_to_context(files_content):
     nr_regions = _damon.DamonNrRegionsRange(
             int(nr_regions_content['min']),
             int(nr_regions_content['max']))
+    if 'probes' in files_content['monitoring_attrs']:
+        probes = files_content_to_probes(
+                files_content['monitoring_attrs']['probes'])
+    else:
+        probes = []
     if 'sample' in mon_attrs_content:
         sample_control = files_content_to_sample_control(
                 mon_attrs_content['sample'])
@@ -1066,7 +1159,7 @@ def files_content_to_context(files_content):
 
     return _damon.DamonCtx(ops, targets, intervals, nr_regions, schemes,
                            ops_attrs=ops_attrs, sample_control=sample_control,
-                           pause=pause, addr_unit=addr_unit)
+                           pause=pause, addr_unit=addr_unit, probes=probes)
 
 def files_content_to_kdamond(files_content):
     contexts_content = files_content['contexts']
@@ -1339,6 +1432,14 @@ def mk_feature_supports_map():
             os.path.join(scheme_dir_of(0, 0, 0), 'quotas',
                          'fail_charge_denom')):
         supports_map['sysfs/damos_quota_fail_charge_ratio'] = True
+        # damos_collapse and damos_node_eligible_mem_bp will be upstreamed
+        # together.
+        supports_map['sysfs/damos_action_collapse'] = True
+        supports_map['sysfs/damos_quota_goal_node_eligible_mem_bp'] = True
+
+    if os.path.isdir(
+            os.path.join(ctx_dir_of(0, 0), 'monitoring_attrs', 'probes')):
+        supports_map['sysfs/attrs_monitoring'] = True
 
     if os.path.isdir(os.path.join(ctx_dir_of(0, 0), 'operations_attrs')):
         supports_map['sysfs/ops_attrs'] = True

{damo-3.2.2 → damo-3.2.4}/src/damo/damo_report_access.py

@@ -246,6 +246,11 @@ region_formatters = [
             lambda index, region, snapshot, record, fmt:
             temperature_str(region, fmt.raw_number, fmt),
             'access temperature of the region'),
+        Formatter(
+            '<probe hits>',
+            lambda index, region, snapshot, record, fmt:
+            ' '.join(['%d' % h for h in region.probe_hits]),
+            'data attributese probe hit counts'),
         Formatter(
             '<filters passed bytes>',
             lambda index, region, snapshot, record, fmt:

{damo-3.2.2 → damo-3.2.4}/src/damo/damo_version.py

@@ -3,7 +3,7 @@
 import os
 import subprocess
 
-__version__ = '3.2.2'
+__version__ = '3.2.4'
 
 def get_release_version():
     return __version__

{damo-3.2.2 → damo-3.2.4}/src/damo.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: damo
-Version: 3.2.2
+Version: 3.2.4
 Summary: DAMON user-space tool
 Home-page: https://github.com/damonitor/damo
 Author: SeongJae Park
@@ -71,7 +71,7 @@ The second and last commands will show the access pattern of your workload,
 like below:
 
 ![masim_stairs_snapshot](images/masim_stairs_snapshot.png)
-![masim stairs heatmap in ascii](https://raw.githubusercontent.com/damonitor/damo/v3.2.2/images/masim_stairs_heatmap_ascii.png)
+![masim stairs heatmap in ascii](https://raw.githubusercontent.com/damonitor/damo/v3.2.4/images/masim_stairs_heatmap_ascii.png)
 
 
 FAQs
@@ -90,7 +90,7 @@ Where can I get more detailed usage?
 ------------------------------------
 
 The below sections provide quick introductions for `damo`'s major features.
-For more detailed usage, please refer to [USAGE.md](https://github.com/damonitor/damo/blob/v3.2.2/USAGE.md) file.
+For more detailed usage, please refer to [USAGE.md](https://github.com/damonitor/damo/blob/v3.2.4/USAGE.md) file.
 
 
 What does the version numbers mean?
@@ -115,7 +115,7 @@ We try our best to make `damo` stable and doesn't introduce regressions to
 users.  However, nothing goes forever.  Sometimes, some features will be
 deprecated.  Some features will have longer support more than others.
 
-In short, features that documented on [USAGE.md](https://github.com/damonitor/damo/blob/v3.2.2/USAGE.md) and not explicitly
+In short, features that documented on [USAGE.md](https://github.com/damonitor/damo/blob/v3.2.4/USAGE.md) and not explicitly
 marked as experimental will be better supported, and provides at least three
 months of deprecation grace period.  Within the grace period, users can ask
 extension of the support.  Even after the grace period, please reach out to
@@ -138,7 +138,7 @@ Quick Intro for Major Features
 ==============================
 
 Below are quick introductions for `damo`'s major features.
-For more detailed usage, please refer to [USAGE.md](https://github.com/damonitor/damo/blob/v3.2.2/USAGE.md) file.
+For more detailed usage, please refer to [USAGE.md](https://github.com/damonitor/damo/blob/v3.2.4/USAGE.md) file.
 
 
 Snapshot Data Access Pattern