tools/sched_ext: Fix scx_show_state per-scheduler state reads
scx_show_state.py still reads scx_aborting and scx_bypass_depth as global symbols. Those symbols no longer exist after the state was moved into struct scx_sched, so the drgn script fails when it reaches either field. Read aborting and bypass_depth from scx_root instead. This preserves the script's current root-scheduler view: with sub-scheduler support, the reported values are for the root scheduler and sub-schedulers are not enumerated. Fixes:5c8d98a1b4("sched_ext: Move bypass state into scx_sched") Fixes:c1743da43c("sched_ext: Move aborting flag to per-scheduler field") Signed-off-by: Zicheng Qu <quzicheng@huawei.com> Reviewed-by: Andrea Righi <arighi@nvidia.com> Signed-off-by: Tejun Heo <tj@kernel.org>
This commit is contained in:
parent
0c1a9dce20
commit
b565a73bae
1 changed files with 13 additions and 6 deletions
|
|
@ -27,18 +27,25 @@ def read_static_key(name):
|
|||
def state_str(state):
|
||||
return prog['scx_enable_state_str'][state].string_().decode()
|
||||
|
||||
def read_root_ops_name():
|
||||
if root:
|
||||
return root.ops.name.string_().decode()
|
||||
return ''
|
||||
|
||||
def read_root_field(name, default):
|
||||
if root:
|
||||
return getattr(root, name).value_()
|
||||
return default
|
||||
|
||||
root = prog['scx_root']
|
||||
enable_state = read_atomic("scx_enable_state_var")
|
||||
|
||||
if root:
|
||||
print(f'ops : {root.ops.name.string_().decode()}')
|
||||
else:
|
||||
print('ops : ')
|
||||
print(f'ops : {read_root_ops_name()}')
|
||||
print(f'enabled : {read_static_key("__scx_enabled")}')
|
||||
print(f'switching_all : {read_int("scx_switching_all")}')
|
||||
print(f'switched_all : {read_static_key("__scx_switched_all")}')
|
||||
print(f'enable_state : {state_str(enable_state)} ({enable_state})')
|
||||
print(f'aborting : {prog["scx_aborting"].value_()}')
|
||||
print(f'bypass_depth : {prog["scx_bypass_depth"].value_()}')
|
||||
print(f'aborting : {read_root_field("aborting", False)}')
|
||||
print(f'bypass_depth : {read_root_field("bypass_depth", 0)}')
|
||||
print(f'nr_rejected : {read_atomic("scx_nr_rejected")}')
|
||||
print(f'enable_seq : {read_atomic("scx_enable_seq")}')
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue