Commit 493d4eec authored by Andrew Morton's avatar Andrew Morton
Browse files

revert "scripts/gdb/symbols: add specific ko module load command" 



Revert 11f95653 ("scripts/gdb/symbols: add specific ko module load
command") due to breakage identified by Johannes Berg in [1].

Fixes: 11f95653 ("scripts/gdb/symbols: add specific ko module load command")
Reported-by: default avatarJohannes Berg <johannes@sipsolutions.net>
Closes: https://lkml.kernel.org/r/c44b748307a074d0c250002cdcfe209b8cce93c9.camel@sipsolutions.net

 [1]
Cc: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
Cc: Chinwen Chang <chinwen.chang@mediatek.com>
Cc: Jan Kiszka <jan.kiszka@siemens.com>
Cc: Kieran Bingham <kbingham@kernel.org>
Cc: Kuan-Ying Lee <Kuan-Ying.Lee@mediatek.com>
Cc: Matthias Brugger <matthias.bgg@gmail.com>
Cc: Qun-Wei Lin <qun-wei.lin@mediatek.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent c652df8a

scripts/gdb/linux/symbols.py

+2 −21
Original line number Diff line number Diff line
@@ -111,11 +111,10 @@ lx-symbols command.""" 
        return "{textaddr} {sections}".format(

            textaddr=textaddr, sections="".join(args))



    def load_module_symbols(self, module, module_file=None):

    def load_module_symbols(self, module):

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

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



        if not module_file:

        module_file = self._get_module_file(module_name)

        if not module_file and not self.module_files_updated:

            self._update_module_files()
@@ -139,19 +138,6 @@ lx-symbols command.""" 
        else:

            gdb.write("no module object found for '{0}'\n".format(module_name))



    def load_ko_symbols(self, mod_path):

        self.loaded_modules = []

        module_list = modules.module_list()



        for module in module_list:

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

            module_pattern = ".*/{0}\.ko(?:.debug)?$".format(

                module_name.replace("_", r"[_\-]"))

            if re.match(module_pattern, mod_path) and os.path.exists(mod_path):

                self.load_module_symbols(module, mod_path)

                return

        raise gdb.GdbError("%s is not a valid .ko\n" % mod_path)



    def load_all_symbols(self):

        gdb.write("loading vmlinux\n")
@@ -190,11 +176,6 @@ lx-symbols command.""" 
        self.module_files = []

        self.module_files_updated = False



        argv = gdb.string_to_argv(arg)

        if len(argv) == 1:

            self.load_ko_symbols(argv[0])

            return



        self.load_all_symbols()



        if hasattr(gdb, 'Breakpoint'):