The patch titled Subject: scripts/gdb: fix lx-timerlist for Python3 has been added to the -mm mm-nonmm-unstable branch. Its filename is scripts-gdb-fix-lx-timerlist-for-python3.patch
This patch will shortly appear at https://git.kernel.org/pub/scm/linux/kernel/git/akpm/25-new.git/tree/patches...
This patch will later appear in the mm-nonmm-unstable branch at git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/process/submit-checklist.rst when testing your code ***
The -mm tree is included into linux-next via the mm-everything branch at git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm and is updated there every 2-3 working days
------------------------------------------------------ From: Peng Liu liupeng17@lenovo.com Subject: scripts/gdb: fix lx-timerlist for Python3 Date: Tue, 21 Mar 2023 14:19:29 +0800
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
akpm: cc stable so that older kernels are properly debuggable under newer Python.
Link: https://lkml.kernel.org/r/TYCP286MB2146EE1180A4D5176CBA8AB2C6819@TYCP286MB21... Signed-off-by: Peng Liu liupeng17@lenovo.com Reviewed-by: Jan Kiszka jan.kiszka@siemens.com Cc: Florian Fainelli f.fainelli@gmail.com Cc: Kieran Bingham kbingham@kernel.org Cc: stable@vger.kernel.org Signed-off-by: Andrew Morton akpm@linux-foundation.org ---
scripts/gdb/linux/timerlist.py | 4 +++- scripts/gdb/linux/utils.py | 5 ++++- 2 files changed, 7 insertions(+), 2 deletions(-)
--- a/scripts/gdb/linux/timerlist.py~scripts-gdb-fix-lx-timerlist-for-python3 +++ a/scripts/gdb/linux/timerlist.py @@ -72,7 +72,7 @@ def print_cpu(hrtimer_bases, cpu, max_cl 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 --- a/scripts/gdb/linux/utils.py~scripts-gdb-fix-lx-timerlist-for-python3 +++ a/scripts/gdb/linux/utils.py @@ -88,7 +88,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): _
Patches currently in -mm which might be from liupeng17@lenovo.com are
scripts-gdb-fix-lx-timerlist-for-struct-timequeue_head-change.patch scripts-gdb-fix-lx-timerlist-for-python3.patch scripts-gdb-fix-lx-timerlist-for-hrtimer_max_clock_bases-printing.patch