diff mbox series

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

Message ID 20230412111508.892296-1-p.raghav@samsung.com
State New
Headers
Series scripts/gdb: use mem instead of core_layout to get the module address |

Commit Message

Pankaj Raghav April 12, 2023, 11:15 a.m. UTC 
  commit ac3b43283923 ("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: ac3b43283923 ("module: replace module_layout with module_memory")
Signed-off-by: Pankaj Raghav <p.raghav@samsung.com>
---
 scripts/gdb/linux/modules.py | 2 +-
 scripts/gdb/linux/symbols.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

Comments

Luis Chamberlain April 12, 2023, 5:06 p.m. UTC | #1 
On Wed, Apr 12, 2023 at 01:15:08PM +0200, Pankaj Raghav wrote:
> commit ac3b43283923 ("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: ac3b43283923 ("module: replace module_layout with module_memory")
> Signed-off-by: Pankaj Raghav <p.raghav@samsung.com>
> ---

Jan, Kieran,

That commit is in my modules-next tree, so I can take that fix in
through my tree. Let me know if that is OK, and if you ACK the patch.

Pankaj, thanks!

  Luis
Florian Fainelli April 12, 2023, 5:52 p.m. UTC | #2 
On 4/12/23 04:26, Pankaj Raghav wrote:
> On 2023-04-12 13:15, Pankaj Raghav wrote:
>> commit ac3b43283923 ("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: ac3b43283923 ("module: replace module_layout with module_memory")
>> Signed-off-by: Pankaj Raghav <p.raghav@samsung.com>
>> ---
> 
> I had one question:
> - Is there a way to import enum? I currently hard code 0 but it will better if we can
> use the MOD_TEXT enum instead.

You should be able to with updating constants.py.in and using LX_GDBPARSED()
Pankaj Raghav April 12, 2023, 8:06 p.m. UTC | #3 
>>> Replace core_layout with its new counterpart mem[MOD_TEXT].
>>>
>>> Fixes: ac3b43283923 ("module: replace module_layout with module_memory")
>>> Signed-off-by: Pankaj Raghav <p.raghav@samsung.com>
>>> ---
>>
>> I had one question:
>> - Is there a way to import enum? I currently hard code 0 but it will better if we can
>> use the MOD_TEXT enum instead.
> 
> You should be able to with updating constants.py.in and using LX_GDBPARSED()

Thanks a lot. This helps.
diff mbox series

Patch

diff --git a/scripts/gdb/linux/modules.py b/scripts/gdb/linux/modules.py
index 441b23239896..6ec51e913070 100644
--- a/scripts/gdb/linux/modules.py
+++ b/scripts/gdb/linux/modules.py
@@ -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'][0]
             gdb.write("{address} {name:<19} {size:>8}  {ref}".format(
                 address=str(layout['base']).split()[0],
                 name=module['name'].string(),
diff --git a/scripts/gdb/linux/symbols.py b/scripts/gdb/linux/symbols.py
index dc07b6d12e30..3a7976401e00 100644
--- a/scripts/gdb/linux/symbols.py
+++ b/scripts/gdb/linux/symbols.py
@@ -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'][0]['base']).split()[0]
 
         module_file = self._get_module_file(module_name)
         if not module_file and not self.module_files_updated: