On Tue, 2023-08-08 at 16:30 +0800, Kuan-Ying Lee wrote:
> Add lx-symbols <ko_path> command to support add specific
> ko module.
I'm not sure how this was supposed to work? It should have updated the
documentation, but more importantly, it shouldn't have broken the
documented usage of this command:
The kernel (vmlinux) is taken from the current working directly. Modules (.ko)
are scanned recursively, starting in the same directory. Optionally, the module
search path can be extended by a space separated list of paths passed to the
lx-symbols command.
Note how that talks about a "space separated list of paths" for which
clearly a single path seems like it should be accepted?
> @@ -138,6 +139,19 @@ 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")
>
> @@ -176,6 +190,11 @@ 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
But this obviously breaks it, since passing a single path will go into
the if, then complain "some/folder/ is not a valid .ko" and exit.
But I'm not even sure how you intended this to work _at all_, because in
the context before this if, we have:
self.module_paths = [os.path.abspath(os.path.expanduser(p))
for p in arg.split()]
self.module_paths.append(os.getcwd())
so you first add the (file!) to the list of paths, and then try to load
the file by finding modules in the paths, and filtering by the specified
file? That seems ... very roundabout, and can even only work if the file
can be found via os.getcwd(), so you could never specify an absolute
filename?
All that seems counter to what the patch was meant to do.
I suspect that really you need to individually check "is it a file or a
directory" before handling any of this, and if it's actually a file,
don't use it as a _filter_ as you do in load_ko_symbols() now but
directly use it as is with load_module_symbols()?
@Jan, can we revert this? I came up with the following trivial fix that
makes it at least not break the original use case of passing a single-
entry directory list, but it really doesn't seem right one way or the
other.
--- a/scripts/gdb/linux/symbols.py
+++ b/scripts/gdb/linux/symbols.py
@@ -191,7 +191,7 @@ lx-symbols command."""
self.module_files_updated = False
argv = gdb.string_to_argv(arg)
- if len(argv) == 1:
+ if len(argv) == 1 and os.path.isfile(argv[0]):
self.load_ko_symbols(argv[0])
return
johannes
