On Wed, Feb 07, 2024 at 03:59:29PM -0800, Andrew Morton wrote: > On Wed, 7 Feb 2024 15:56:23 -0800 Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> wrote: > > > > [1] https://lore.kernel.org/linux-mm/20240102184633.748113-1-urezki@xxxxxxxxx/ > > > > vmap_area_list was removed by https://lkml.kernel.org/r/20240102184633.748113-6-urezki@xxxxxxxxx > > > > So I think this patch is actually a fix against mm.git:mm-unstable's > > mm-vmalloc-remove-vmap_area_list.patch? > > > > However this gdb function was probably probably broken earlier in that > > series, so perhaps this patch would be best staged as a predecessor to > > Ulad's vmalloc series. > > ie, this: > > > From: Kuan-Ying Lee <Kuan-Ying.Lee@xxxxxxxxxxxx> > Subject: scripts/gdb/vmalloc: fix vmallocinfo error > Date: Wed, 7 Feb 2024 16:58:51 +0800 > > The patch series "Mitigate a vmap lock contention" removes vmap_area_list, > which will break the gdb vmallocinfo command: > > (gdb) lx-vmallocinfo > Python Exception <class 'gdb.error'>: No symbol "vmap_area_list" in current context. > Error occurred in Python: No symbol "vmap_area_list" in current context. > > So we can instead use vmap_nodes to iterate all vmallocinfo. > > Link: https://lkml.kernel.org/r/20240207085856.11190-1-Kuan-Ying.Lee@xxxxxxxxxxxx > Signed-off-by: Kuan-Ying Lee <Kuan-Ying.Lee@xxxxxxxxxxxx> > Cc: Casper Li <casper.li@xxxxxxxxxxxx> > Cc: AngeloGioacchino Del Regno <angelogioacchino.delregno@xxxxxxxxxxxxx> > Cc: Chinwen Chang <chinwen.chang@xxxxxxxxxxxx> > Cc: Jan Kiszka <jan.kiszka@xxxxxxxxxxx> > Cc: Kieran Bingham <kbingham@xxxxxxxxxx> > Cc: Matthias Brugger <matthias.bgg@xxxxxxxxx> > Cc: Qun-Wei Lin <qun-wei.lin@xxxxxxxxxxxx> > Cc: Uladzislau Rezki (Sony) <urezki@xxxxxxxxx> > Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> > --- > > scripts/gdb/linux/vmalloc.py | 56 +++++++++++++++++---------------- > 1 file changed, 29 insertions(+), 27 deletions(-) > > --- a/scripts/gdb/linux/vmalloc.py~scripts-gdb-vmalloc-fix-vmallocinfo-error > +++ a/scripts/gdb/linux/vmalloc.py > @@ -29,32 +29,34 @@ class LxVmallocInfo(gdb.Command): > if not constants.LX_CONFIG_MMU: > raise gdb.GdbError("Requires MMU support") > > - vmap_area_list = gdb.parse_and_eval('vmap_area_list') > - for vmap_area in lists.list_for_each_entry(vmap_area_list, vmap_area_ptr_type, "list"): > - if not vmap_area['vm']: > - gdb.write("0x%x-0x%x %10d vm_map_ram\n" % (vmap_area['va_start'], vmap_area['va_end'], > - vmap_area['va_end'] - vmap_area['va_start'])) > - continue > - v = vmap_area['vm'] > - gdb.write("0x%x-0x%x %10d" % (v['addr'], v['addr'] + v['size'], v['size'])) > - if v['caller']: > - gdb.write(" %s" % str(v['caller']).split(' ')[-1]) > - if v['nr_pages']: > - gdb.write(" pages=%d" % v['nr_pages']) > - if v['phys_addr']: > - gdb.write(" phys=0x%x" % v['phys_addr']) > - if v['flags'] & constants.LX_VM_IOREMAP: > - gdb.write(" ioremap") > - if v['flags'] & constants.LX_VM_ALLOC: > - gdb.write(" vmalloc") > - if v['flags'] & constants.LX_VM_MAP: > - gdb.write(" vmap") > - if v['flags'] & constants.LX_VM_USERMAP: > - gdb.write(" user") > - if v['flags'] & constants.LX_VM_DMA_COHERENT: > - gdb.write(" dma-coherent") > - if is_vmalloc_addr(v['pages']): > - gdb.write(" vpages") > - gdb.write("\n") > + nr_vmap_nodes = gdb.parse_and_eval('nr_vmap_nodes') > + for i in range(0, nr_vmap_nodes): > + vn = gdb.parse_and_eval('&vmap_nodes[%d]' % i) > + for vmap_area in lists.list_for_each_entry(vn['busy']['head'], vmap_area_ptr_type, "list"): > + if not vmap_area['vm']: > + gdb.write("0x%x-0x%x %10d vm_map_ram\n" % (vmap_area['va_start'], vmap_area['va_end'], > + vmap_area['va_end'] - vmap_area['va_start'])) > + continue > + v = vmap_area['vm'] > + gdb.write("0x%x-0x%x %10d" % (v['addr'], v['addr'] + v['size'], v['size'])) > + if v['caller']: > + gdb.write(" %s" % str(v['caller']).split(' ')[-1]) > + if v['nr_pages']: > + gdb.write(" pages=%d" % v['nr_pages']) > + if v['phys_addr']: > + gdb.write(" phys=0x%x" % v['phys_addr']) > + if v['flags'] & constants.LX_VM_IOREMAP: > + gdb.write(" ioremap") > + if v['flags'] & constants.LX_VM_ALLOC: > + gdb.write(" vmalloc") > + if v['flags'] & constants.LX_VM_MAP: > + gdb.write(" vmap") > + if v['flags'] & constants.LX_VM_USERMAP: > + gdb.write(" user") > + if v['flags'] & constants.LX_VM_DMA_COHERENT: > + gdb.write(" dma-coherent") > + if is_vmalloc_addr(v['pages']): > + gdb.write(" vpages") > + gdb.write("\n") > > LxVmallocInfo() > _ > Thanks for fixing and helping! -- Uladzislau Rezki
