[PATCH 0/3] scripts/gdb: timerlist: fix rb_node access and python errors

[PATCH 0/3] scripts/gdb: timerlist: fix rb_node access and python errors

[Amjad Ouled-Ameur]

This patchset fixes use of lx-timerlist with kgdb.

It has been tested on Amlogic libretech-cc s905X and works fine [0]

[0]: https://pastebin.com/RAhQYh6L

Amjad Ouled-Ameur (3):
  scripts/gdb: timerlist: use range instead of xrange
  scripts/gdb: timerlist: fix rb_node access
  scripts/gdb: timerlist: convert int chunks to str

 scripts/gdb/linux/timerlist.py | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

-- 
2.37.1

[PATCH 1/3] scripts/gdb: timerlist: use range instead of xrange

[Amjad Ouled-Ameur]

xrange has been renamed to range in Python 3. Therefore,
timerlist currently fails with NameError exception:

Python Exception <class 'NameError'> name 'xrange' is not defined.

Use range instead of xrange.

Signed-off-by: Amjad Ouled-Ameur <aouledameur@baylibre.com>
---
 scripts/gdb/linux/timerlist.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/gdb/linux/timerlist.py b/scripts/gdb/linux/timerlist.py
index 071d0dd5a634..fac951236dc4 100644
--- a/scripts/gdb/linux/timerlist.py
+++ b/scripts/gdb/linux/timerlist.py
@@ -73,7 +73,7 @@ def print_cpu(hrtimer_bases, cpu, max_clock_bases):
     ts = cpus.per_cpu(tick_sched_ptr, cpu)
 
     text = "cpu: {}\n".format(cpu)
-    for i in xrange(max_clock_bases):
+    for i in range(max_clock_bases):
         text += " clock {}:\n".format(i)
         text += print_base(cpu_base['clock_base'][i])
 
-- 
2.37.1

[PATCH 2/3] scripts/gdb: timerlist: fix rb_node access

[Amjad Ouled-Ameur]

"strcut timerqueue_head" no longer has "next" member since v5.4-rc1:
commit 511885d7061e ("lib/timerqueue: Rely on rbtree semantics for next
timer")

Therefore, access "rb_node" through active->rb_root->rb_root->rb_node.

Moreoever, remove  curr.address.cast() on rb_node as this breaks the code
and is not necessary.

Signed-off-by: Amjad Ouled-Ameur <aouledameur@baylibre.com>
---
 scripts/gdb/linux/timerlist.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/scripts/gdb/linux/timerlist.py b/scripts/gdb/linux/timerlist.py
index fac951236dc4..d16909f8df35 100644
--- a/scripts/gdb/linux/timerlist.py
+++ b/scripts/gdb/linux/timerlist.py
@@ -43,8 +43,7 @@ def print_timer(rb_node, idx):
 
 
 def print_active_timers(base):
-    curr = base['active']['next']['node']
-    curr = curr.address.cast(rbtree.rb_node_type.get_type().pointer())
+    curr = base['active']['rb_root']['rb_root']['rb_node']
     idx = 0
     while curr:
         yield print_timer(curr, idx)
-- 
2.37.1

[PATCH 3/3] scripts/gdb: timerlist: convert int chunks to str

[Amjad Ouled-Ameur]

join() expects strings but integers are given.

Convert chunks list to strings before passing it to join()

Signed-off-by: Amjad Ouled-Ameur <aouledameur@baylibre.com>
---
 scripts/gdb/linux/timerlist.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/gdb/linux/timerlist.py b/scripts/gdb/linux/timerlist.py
index d16909f8df35..98bb9a239283 100644
--- a/scripts/gdb/linux/timerlist.py
+++ b/scripts/gdb/linux/timerlist.py
@@ -172,7 +172,7 @@ def pr_cpumask(mask):
     if 0 < extra <= 4:
         chunks[0] = chunks[0][0]  # Cut off the first 0
 
-    return "".join(chunks)
+    return "".join(str(chunks))
 
 
 class LxTimerList(gdb.Command):
-- 
2.37.1

Re: [PATCH 0/3] scripts/gdb: timerlist: fix rb_node access and python errors

[Florian Fainelli]

Hi Amjad, Jan,

On 7/27/2022 7:14 AM, Amjad Ouled-Ameur wrote:
> This patchset fixes use of lx-timerlist with kgdb.
> 
> It has been tested on Amlogic libretech-cc s905X and works fine [0]
> 
> [0]: https://pastebin.com/RAhQYh6L

Was right about to submit similar fixes. The whole series is:

Tested-by: Florian Fainelli <f.fainelli@gmail.com>

Jan, it would appear there were earlier attempts at fixing timerlist.py, 
however as of 6.3-rc3, none of those patches have been merged, can you 
take them? Thanks!
-- 
Florian

Re: [PATCH 0/3] scripts/gdb: timerlist: fix rb_node access and python errors

[Amjad Ouled-Ameur]

Hi Florian,

Thank you for testing the series.


Regards,

Amjad

On 3/24/23 14:03, Florian Fainelli wrote:
> Hi Amjad, Jan,
>
> On 7/27/2022 7:14 AM, Amjad Ouled-Ameur wrote:
>> This patchset fixes use of lx-timerlist with kgdb.
>>
>> It has been tested on Amlogic libretech-cc s905X and works fine [0]
>>
>> [0]: https://pastebin.com/RAhQYh6L
>
> Was right about to submit similar fixes. The whole series is:
>
> Tested-by: Florian Fainelli <f.fainelli@gmail.com>
>
> Jan, it would appear there were earlier attempts at fixing timerlist.py, however as of 6.3-rc3, none of those patches have been merged, can you take them? Thanks!