stack state WIP

Author: sdimitro

sdb/commands/linux/stacks.py

@@ -23,6 +23,7 @@
 import drgn
 from drgn.helpers.linux.list import list_for_each_entry
 from drgn.helpers.linux.pid import for_each_task
+from drgn.helpers.linux.sched import task_state_to_char
 
 import sdb
 
@@ -203,22 +204,12 @@ def _init_parser(cls, name: str) -> argparse.ArgumentParser:
         "t": 0x08,
         "X": 0x10,
         "Z": 0x20,
+        "I": 0x402,
     }
 
     @staticmethod
     def task_struct_get_state(task: drgn.Object) -> str:
-        task_struct_type = task.type_.type
-        state = 0
-        if task_struct_type.has_member('__state'):
-            state = task.member_('__state').value_()
-        else:
-            # For kernels older than v5.14
-            state = task.state.value_()
-        if state == 0x402:
-            return "IDLE"
-
-        exit_state = task.exit_state.value_()
-        return KernelStacks.TASK_STATES[(state | exit_state) & 0x7f]
+        return task_state_to_char(task)
 
     @staticmethod
     def resolve_state(tstate: str) -> str:
@@ -381,7 +372,7 @@ def print_stacks(self, objs: Iterable[drgn.Object]) -> None:
         self.print_header()
         for stack_key, tasks in KernelStacks.aggregate_stacks(objs):
             stacktrace_info = ""
-            task_state = stack_key[0]
+            task_state = KernelStacks.resolve_state(stack_key[0])
 
             if self.args.all:
                 for task in tasks:

sdb/commands/linux/threads.py

@@ -78,12 +78,20 @@ class KernelThreads(sdb.Locator, sdb.PrettyPrinter):
     load_on = [sdb.Kernel()]
 
     FIELDS: Dict[str, Callable[[drgn.Object], Union[str, int]]] = {
-        "task": lambda obj: hex(obj.value_()),
-        "state": lambda obj: str(KernelStacks.task_struct_get_state(obj)),
-        "pid": lambda obj: int(obj.pid),
-        "prio": lambda obj: int(obj.prio),
-        "comm": lambda obj: str(obj.comm.string_().decode("utf-8")),
-        "cmdline": _cmdline,
+        "task":
+            lambda obj: hex(obj.value_()),
+        "state":
+            lambda obj: str(
+                KernelStacks.resolve_state(
+                    KernelStacks.task_struct_get_state(obj))),
+        "pid":
+            lambda obj: int(obj.pid),
+        "prio":
+            lambda obj: int(obj.prio),
+        "comm":
+            lambda obj: str(obj.comm.string_().decode("utf-8")),
+        "cmdline":
+            _cmdline,
     }
 
     def pretty_print(self, objs: Iterable[drgn.Object]) -> None: