Skip to contentSkip to conversation

iocost: Fix iocost_monitor.py due to helper type mismatch

PATCH New Tejun Heo 1 participant 1 message Jan 17, 2020 cgroup

lore
Share & tools
lore

Tejun Heo

author maintainer
#0 lore raw

PATCH 1/1 iocost: Fix iocost_monitor.py due to helper type mismatch

From 9ea37e24d4a95dd934a0600d65caa25e409705bb Mon Sep 17 00:00:00 2001
From: Tejun Heo <[email protected]>
Date: Fri, 17 Jan 2020 11:54:35 -0800

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.

---
Applied to cgroup/for-5.6.

 tools/cgroup/iocost_monitor.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
tools/cgroup/iocost_monitor.py +2 -2
index f79b23582a1d..7427a5ee761b 100644
@@ -72,7 +72,7 @@ autop_names = {
         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'):
Signature · 1 line
2.17.1