iocost: Fix iocost_monitor.py due to helper type mismatch

9ea37e24 · Tejun Heo <[email protected]> · 2020-01-17 11:54:35 -08:00

iocost_monitor.py broke with recent versions of drgn due to helper
being stricter about types.  Fix it so that it uses the correct type.

Signed-off-by: Tejun Heo <[email protected]>
Suggested-by: Omar Sandoval <[email protected]>

Commit: 9ea37e24d4a95dd934a0600d65caa25e409705bb
Parents: 3bc0bb36

Changes

1 files changed · +2 −2

File	Status	Add	Del	Content
tools/cgroup/iocost_monitor.py	modified	+2	−2	View file

tools/cgroup/iocost_monitor.py

View file

diff --git a/tools/cgroup/iocost_monitor.py b/tools/cgroup/iocost_monitor.py
index f79b235..7427a5e 100644
--- a/tools/cgroup/iocost_monitor.py
+++ b/tools/cgroup/iocost_monitor.py
@@ -72,7 +72,7 @@ class BlkgIterator:
         name = BlkgIterator.blkcg_name(blkcg)
         path = parent_path + '/' + name if parent_path else name
         blkg = drgn.Object(prog, 'struct blkcg_gq',
-                           address=radix_tree_lookup(blkcg.blkg_tree, q_id))
+                           address=radix_tree_lookup(blkcg.blkg_tree.address_of_(), q_id))
         if not blkg.address_:
             return
 
@@ -228,7 +228,7 @@ q_id = None
 root_iocg = None
 ioc = None
 
-for i, ptr in radix_tree_for_each(blkcg_root.blkg_tree):
+for i, ptr in radix_tree_for_each(blkcg_root.blkg_tree.address_of_()):
     blkg = drgn.Object(prog, 'struct blkcg_gq', address=ptr)
     try:
         if devname == blkg.q.kobj.parent.name.string_().decode('utf-8'):