From: Tejun Heo tj@kernel.org
mainline inclusion from mainline-5.6-rc1 commit 9ea37e24d4a95dd934a0600d65caa25e409705bb category: feature bugzilla: 38688 CVE: NA
---------------------------
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 tj@kernel.org Suggested-by: Omar Sandoval osandov@fb.com Signed-off-by: Yu Kuai yukuai3@huawei.com Reviewed-by: Hou Tao houtao1@huawei.com Signed-off-by: Yang Yingliang yangyingliang@huawei.com --- tools/cgroup/iocost_monitor.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/tools/cgroup/iocost_monitor.py b/tools/cgroup/iocost_monitor.py index f79b23582a1d0..7427a5ee761b3 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'):