Commit b4aff751 authored by Pankaj Raghav's avatar Pankaj Raghav Committed by Luis Chamberlain
Browse files

scripts/gdb: use mem instead of core_layout to get the module address 



commit ac3b4328 ("module: replace module_layout with module_memory")
changed the struct module data structure from module_layout to
module_memory. The core_layout member which is used while loading
modules are not available anymore leading to the following error while
running gdb:

(gdb) lx-symbols
loading vmlinux
Python Exception <class 'gdb.error'>: There is no member named core_layout.
Error occurred in Python: There is no member named core_layout.

Replace core_layout with its new counterpart mem[MOD_TEXT].

Fixes: ac3b4328 ("module: replace module_layout with module_memory")
Signed-off-by: default avatarPankaj Raghav <p.raghav@samsung.com>
Signed-off-by: default avatarLuis Chamberlain <mcgrof@kernel.org>
parent 560db7cc

scripts/gdb/linux/constants.py.in

+3 −0
Original line number Diff line number Diff line
@@ -54,6 +54,9 @@ LX_VALUE(SB_NODIRATIME) 
/* linux/htimer.h */

LX_GDBPARSED(hrtimer_resolution)



/* linux/module.h */

LX_GDBPARSED(MOD_TEXT)



/* linux/mount.h */

LX_VALUE(MNT_NOSUID)

LX_VALUE(MNT_NODEV)

scripts/gdb/linux/modules.py

+2 −2
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ 


import gdb



from linux import cpus, utils, lists

from linux import cpus, utils, lists, constants





module_type = utils.CachedType("struct module")
@@ -73,7 +73,7 @@ class LxLsmod(gdb.Command): 
                "        " if utils.get_long_type().sizeof == 8 else ""))



        for module in module_list():

            layout = module['core_layout']

            layout = module['mem'][constants.LX_MOD_TEXT]

            gdb.write("{address} {name:<19} {size:>8}  {ref}".format(

                address=str(layout['base']).split()[0],

                name=module['name'].string(),

scripts/gdb/linux/symbols.py

+2 −2
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ import gdb 
import os

import re



from linux import modules, utils

from linux import modules, utils, constants





if hasattr(gdb, 'Breakpoint'):
@@ -109,7 +109,7 @@ lx-symbols command.""" 


    def load_module_symbols(self, module):

        module_name = module['name'].string()

        module_addr = str(module['core_layout']['base']).split()[0]

        module_addr = str(module['mem'][constants.LX_MOD_TEXT]['base']).split()[0]



        module_file = self._get_module_file(module_name)

        if not module_file and not self.module_files_updated: