[PATCH v2] scripts/gdb: Fix loading of modules information

From: Daniel Wagner
Date: Tue Mar 29 2016 - 02:58:44 EST


From: Daniel Wagner <daniel.wagner@xxxxxxxxxxxx>

The module_core symbols is not available due to

7523e4dc5057 ("module: use a structure to encapsulate layout.")

The base address of the module is now stored inside
struct module_layout.

Signed-off-by: Daniel Wagner <daniel.wagner@xxxxxxxxxxxx>
Cc: Jiri Kosina <jkosina@xxxxxxx>
Cc: Rusty Russell <rusty@xxxxxxxxxxxxxxx>
---
Obviously, it's too early to send patches. This times it even works.

scripts/gdb/linux/modules.py | 3 ++-
scripts/gdb/linux/symbols.py | 3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/scripts/gdb/linux/modules.py b/scripts/gdb/linux/modules.py
index 25db8cf..a1ec0f3 100644
--- a/scripts/gdb/linux/modules.py
+++ b/scripts/gdb/linux/modules.py
@@ -73,8 +73,9 @@ class LxLsmod(gdb.Command):
" " if utils.get_long_type().sizeof == 8 else ""))

for module in module_list():
+ module_layout=module['core_layout']
gdb.write("{address} {name:<19} {size:>8} {ref}".format(
- address=str(module['module_core']).split()[0],
+ address=str(module_layout['base']),
name=module['name'].string(),
size=str(module['core_size']),
ref=str(module['refcnt']['counter'])))
diff --git a/scripts/gdb/linux/symbols.py b/scripts/gdb/linux/symbols.py
index 627750c..8650ede 100644
--- a/scripts/gdb/linux/symbols.py
+++ b/scripts/gdb/linux/symbols.py
@@ -108,7 +108,8 @@ lx-symbols command."""

def load_module_symbols(self, module):
module_name = module['name'].string()
- module_addr = str(module['module_core']).split()[0]
+ module_layout = module['core_layout']
+ module_addr = str(module_layout['base'])

module_file = self._get_module_file(module_name)
if not module_file and not self.module_files_updated:
--
2.5.5