Skip to content

Commit

Permalink
revert "scripts/gdb/symbols: add specific ko module load command"
Browse files Browse the repository at this point in the history
Revert 11f9565 ("scripts/gdb/symbols: add specific ko module load
command") due to breakage identified by Johannes Berg in [1].

Fixes: 11f9565 ("scripts/gdb/symbols: add specific ko module load command")
Reported-by: Johannes Berg <[email protected]>
Closes: https://lkml.kernel.org/r/[email protected] [1]
Cc: AngeloGioacchino Del Regno <[email protected]>
Cc: Chinwen Chang <[email protected]>
Cc: Jan Kiszka <[email protected]>
Cc: Kieran Bingham <[email protected]>
Cc: Kuan-Ying Lee <[email protected]>
Cc: Matthias Brugger <[email protected]>
Cc: Qun-Wei Lin <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
  • Loading branch information
akpm00 committed Sep 19, 2023
1 parent c652df8 commit 493d4ee
Showing 1 changed file with 2 additions and 21 deletions.
23 changes: 2 additions & 21 deletions scripts/gdb/linux/symbols.py
Original file line number Diff line number Diff line change
Expand Up @@ -111,12 +111,11 @@ def _section_arguments(self, module, module_addr):
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)
module_file = self._get_module_file(module_name)
if not module_file and not self.module_files_updated:
self._update_module_files()
module_file = self._get_module_file(module_name)
Expand All @@ -139,19 +138,6 @@ def load_module_symbols(self, module, module_file=None):
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")

Expand Down Expand Up @@ -190,11 +176,6 @@ def invoke(self, arg, from_tty):
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'):
Expand Down

0 comments on commit 493d4ee

Please sign in to comment.