linux-kernel - Re: [PATCH 2/3] scripts/gdb: fix lx-timerlist for Python3

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <TYCP286MB2146BEA44B0B645B08372D24C67B9@TYCP286MB2146.JPNP286.PROD.OUTLOOK.COM>
Date:   Thu, 1 Sep 2022 10:29:44 +0800
From:   Peng Liu <pngliu@...mail.com>
To:     Jan Kiszka <jan.kiszka@...mens.com>, kbingham@...nel.org,
        Stephen Boyd <swboyd@...omium.org>
Cc:     linux-kernel@...r.kernel.org, Peng Liu <liupeng17@...ovo.com>
Subject: Re: [PATCH 2/3] scripts/gdb: fix lx-timerlist for Python3


On 2022/8/31 23:01, Jan Kiszka wrote:
> On 20.07.22 14:27, pngliu@...mail.com wrote:
>> From: Peng Liu <liupeng17@...ovo.com>
>>
>> Below incompatibilities between Python2 and Python3 made lx-timerlist
>> fail to run under Python3.
>>
>> o xrange() is replaced by range() in Python3
>> o bytes and str are different types in Python3
>> o the return value of Inferior.read_memory() is memoryview object in
>>    Python3
> Means this only ever worked with Python2? And we now hard-switch it to
> Python3? Not voting against this, just confused if it was like this so far.
>
> Jan
I think so. I tried the other gdb scripts and they worked for both python2
and python3. I guess timerlist.py was initially tested only with a gdb
with python2 support built in but not one with python3 support built in.
>> Signed-off-by: Peng Liu <liupeng17@...ovo.com>
>> ---
>>   scripts/gdb/linux/timerlist.py | 4 +++-
>>   scripts/gdb/linux/utils.py     | 5 ++++-
>>   2 files changed, 7 insertions(+), 2 deletions(-)
>>
>> diff --git a/scripts/gdb/linux/timerlist.py b/scripts/gdb/linux/timerlist.py
>> index 44e39dc3eb64..8281da068c5b 100644
>> --- a/scripts/gdb/linux/timerlist.py
>> +++ b/scripts/gdb/linux/timerlist.py
>> @@ -72,7 +72,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])
>>   
>> @@ -157,6 +157,8 @@ def pr_cpumask(mask):
>>       num_bytes = (nr_cpu_ids + 7) / 8
>>       buf = utils.read_memoryview(inf, bits, num_bytes).tobytes()
>>       buf = binascii.b2a_hex(buf)
>> +    if type(buf) is not str:
>> +        buf=buf.decode()
>>   
>>       chunks = []
>>       i = num_bytes
>> diff --git a/scripts/gdb/linux/utils.py b/scripts/gdb/linux/utils.py
>> index ff7c1799d588..db59f986c7fd 100644
>> --- a/scripts/gdb/linux/utils.py
>> +++ b/scripts/gdb/linux/utils.py
>> @@ -89,7 +89,10 @@ def get_target_endianness():
>>   
>>   
>>   def read_memoryview(inf, start, length):
>> -    return memoryview(inf.read_memory(start, length))
>> +    m = inf.read_memory(start, length)
>> +    if type(m) is memoryview:
>> +        return m
>> +    return memoryview(m)
>>   
>>   
>>   def read_u16(buffer, offset):