diff mbox series

scripts/gdb: fix 'lx-lsmod' show the wrong size

Message ID 20230620094834.14688-1-Kuan-Ying.Lee@mediatek.com (mailing list archive)
State New, archived
Headers show
Series scripts/gdb: fix 'lx-lsmod' show the wrong size | expand

Commit Message

Kuan-Ying Lee (李冠穎) June 20, 2023, 9:48 a.m. UTC
'lsmod' shows total core layout size, so we need to
sum up all the sections in core layout in gdb scripts.

/ # lsmod
kasan_test 200704 0 - Live 0xffff80007f640000

Before patch:
(gdb) lx-lsmod
Address            Module                  Size  Used by
0xffff80007f640000 kasan_test             36864  0

After patch:
(gdb) lx-lsmod
Address            Module                  Size  Used by
0xffff80007f640000 kasan_test            200704  0

Fixes: b4aff7513df3 ("scripts/gdb: use mem instead of core_layout to get the module address")
Signed-off-by: Kuan-Ying Lee <Kuan-Ying.Lee@mediatek.com>
---
 scripts/gdb/linux/constants.py.in |  3 +++
 scripts/gdb/linux/modules.py      | 12 +++++++++---
 2 files changed, 12 insertions(+), 3 deletions(-)

Comments

Kuan-Ying Lee (李冠穎) June 30, 2023, 1:01 a.m. UTC | #1
Kindly ping, any comment?

Cc linux-modules.

Thanks,
Kuan-Ying Lee

On Tue, 2023-06-20 at 17:48 +0800, Kuan-Ying Lee wrote:
> 'lsmod' shows total core layout size, so we need to
> sum up all the sections in core layout in gdb scripts.
> 
> / # lsmod
> kasan_test 200704 0 - Live 0xffff80007f640000
> 
> Before patch:
> (gdb) lx-lsmod
> Address            Module                  Size  Used by
> 0xffff80007f640000 kasan_test             36864  0
> 
> After patch:
> (gdb) lx-lsmod
> Address            Module                  Size  Used by
> 0xffff80007f640000 kasan_test            200704  0
> 
> Fixes: b4aff7513df3 ("scripts/gdb: use mem instead of core_layout to
> get the module address")
> Signed-off-by: Kuan-Ying Lee <Kuan-Ying.Lee@mediatek.com>
> ---
>  scripts/gdb/linux/constants.py.in |  3 +++
>  scripts/gdb/linux/modules.py      | 12 +++++++++---
>  2 files changed, 12 insertions(+), 3 deletions(-)
> 
> diff --git a/scripts/gdb/linux/constants.py.in
> b/scripts/gdb/linux/constants.py.in
> index 50a92c4e9984..fab74ca9df6f 100644
> --- a/scripts/gdb/linux/constants.py.in
> +++ b/scripts/gdb/linux/constants.py.in
> @@ -64,6 +64,9 @@ LX_GDBPARSED(IRQ_HIDDEN)
>  
>  /* linux/module.h */
>  LX_GDBPARSED(MOD_TEXT)
> +LX_GDBPARSED(MOD_DATA)
> +LX_GDBPARSED(MOD_RODATA)
> +LX_GDBPARSED(MOD_RO_AFTER_INIT)
>  
>  /* linux/mount.h */
>  LX_VALUE(MNT_NOSUID)
> diff --git a/scripts/gdb/linux/modules.py
> b/scripts/gdb/linux/modules.py
> index 261f28640f4c..84933c4c1083 100644
> --- a/scripts/gdb/linux/modules.py
> +++ b/scripts/gdb/linux/modules.py
> @@ -73,11 +73,17 @@ class LxLsmod(gdb.Command):
>                  "        " if utils.get_long_type().sizeof == 8 else
> ""))
>  
>          for module in module_list():
> -            layout = module['mem'][constants.LX_MOD_TEXT]
> +            total_size = 0
> +            for i in range(constants.LX_MOD_TEXT,
> constants.LX_MOD_RO_AFTER_INIT + 1):
> +                layout = module['mem'][i]
> +                if i == constants.LX_MOD_TEXT:
> +                    text_addr = str(layout['base']).split()[0]
> +                total_size += layout['size']
> +
>              gdb.write("{address} {name:<19}
> {size:>8}  {ref}".format(
> -                address=str(layout['base']).split()[0],
> +                address=text_addr,
>                  name=module['name'].string(),
> -                size=str(layout['size']),
> +                size=str(total_size),
>                  ref=str(module['refcnt']['counter'] - 1)))
>  
>              t = self._module_use_type.get_type().pointer()
> -- 
> 2.18.0
>
Pankaj Raghav July 4, 2023, 12:11 p.m. UTC | #2
> 'lsmod' shows total core layout size, so we need to
> sum up all the sections in core layout in gdb scripts.
> 
> / # lsmod
> kasan_test 200704 0 - Live 0xffff80007f640000
> 
> Before patch:
> (gdb) lx-lsmod
> Address            Module                  Size  Used by
> 0xffff80007f640000 kasan_test             36864  0
> 
> After patch:
> (gdb) lx-lsmod
> Address            Module                  Size  Used by
> 0xffff80007f640000 kasan_test            200704  0
> 
> Fixes: b4aff7513df3 ("scripts/gdb: use mem instead of core_layout to get the module address")
> Signed-off-by: Kuan-Ying Lee <Kuan-Ying.Lee@mediatek.com>
> ---

Just one minor comment, but apart from that, feel free to add:

Reviewed-by: Pankaj Raghav <p.raghav@samsung.com>

> diff --git a/scripts/gdb/linux/modules.py b/scripts/gdb/linux/modules.py
> index 261f28640f4c..84933c4c1083 100644
> --- a/scripts/gdb/linux/modules.py
> +++ b/scripts/gdb/linux/modules.py
> @@ -73,11 +73,17 @@ class LxLsmod(gdb.Command):
>                  "        " if utils.get_long_type().sizeof == 8 else ""))
>  
>          for module in module_list():
> -            layout = module['mem'][constants.LX_MOD_TEXT]
> +            total_size = 0
> +            for i in range(constants.LX_MOD_TEXT, constants.LX_MOD_RO_AFTER_INIT + 1):
> +                layout = module['mem'][i]
> +                if i == constants.LX_MOD_TEXT:
> +                    text_addr = str(layout['base']).split()[0]
> +                total_size += layout['size']
> +
>              gdb.write("{address} {name:<19} {size:>8}  {ref}".format(
> -                address=str(layout['base']).split()[0],
> +                address=text_addr,
>                  name=module['name'].string(),
> -                size=str(layout['size']),
> +                size=str(total_size),
>                  ref=str(module['refcnt']['counter'] - 1)))
>  
>              t = self._module_use_type.get_type().pointer()

We could slightly modify the code to remove the special condition with `i == constants.LX_MOD_TEXT`:

(I made changes on top of your patch)

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

         for module in module_list():
+            text = module['mem'][constants.LX_MOD_TEXT]
+            text_addr = str(text['base']).split()[0]
             total_size = 0
+
             for i in range(constants.LX_MOD_TEXT, constants.LX_MOD_RO_AFTER_INIT + 1):
-                layout = module['mem'][i]
-                if i == constants.LX_MOD_TEXT:
-                    text_addr = str(layout['base']).split()[0]
-                total_size += layout['size']
+                total_size += module['mem'][i]['size']

             gdb.write("{address} {name:<19} {size:>8}  {ref}".format(
                 address=text_addr,
Kuan-Ying Lee (李冠穎) July 10, 2023, 8:51 a.m. UTC | #3
On Tue, 2023-07-04 at 14:11 +0200, Pankaj Raghav wrote:
>  	 
> External email : Please do not click links or open attachments until
> you have verified the sender or the content.
>  > 'lsmod' shows total core layout size, so we need to
> > sum up all the sections in core layout in gdb scripts.
> > 
> > / # lsmod
> > kasan_test 200704 0 - Live 0xffff80007f640000
> > 
> > Before patch:
> > (gdb) lx-lsmod
> > Address            Module                  Size  Used by
> > 0xffff80007f640000 kasan_test             36864  0
> > 
> > After patch:
> > (gdb) lx-lsmod
> > Address            Module                  Size  Used by
> > 0xffff80007f640000 kasan_test            200704  0
> > 
> > Fixes: b4aff7513df3 ("scripts/gdb: use mem instead of core_layout
> to get the module address")
> > Signed-off-by: Kuan-Ying Lee <Kuan-Ying.Lee@mediatek.com>
> > ---
> 
> Just one minor comment, but apart from that, feel free to add:
> 
> Reviewed-by: Pankaj Raghav <p.raghav@samsung.com>
> 
> > diff --git a/scripts/gdb/linux/modules.py
> b/scripts/gdb/linux/modules.py
> > index 261f28640f4c..84933c4c1083 100644
> > --- a/scripts/gdb/linux/modules.py
> > +++ b/scripts/gdb/linux/modules.py
> > @@ -73,11 +73,17 @@ class LxLsmod(gdb.Command):
> >                  "        " if utils.get_long_type().sizeof == 8
> else ""))
> >  
> >          for module in module_list():
> > -            layout = module['mem'][constants.LX_MOD_TEXT]
> > +            total_size = 0
> > +            for i in range(constants.LX_MOD_TEXT,
> constants.LX_MOD_RO_AFTER_INIT + 1):
> > +                layout = module['mem'][i]
> > +                if i == constants.LX_MOD_TEXT:
> > +                    text_addr = str(layout['base']).split()[0]
> > +                total_size += layout['size']
> > +
> >              gdb.write("{address} {name:<19}
> {size:>8}  {ref}".format(
> > -                address=str(layout['base']).split()[0],
> > +                address=text_addr,
> >                  name=module['name'].string(),
> > -                size=str(layout['size']),
> > +                size=str(total_size),
> >                  ref=str(module['refcnt']['counter'] - 1)))
> >  
> >              t = self._module_use_type.get_type().pointer()
> 
> We could slightly modify the code to remove the special condition
> with `i == constants.LX_MOD_TEXT`:
> 
> (I made changes on top of your patch)

Thanks for your suggestion.
I will upload v2.

> 
> diff --git a/scripts/gdb/linux/modules.py
> b/scripts/gdb/linux/modules.py
> index 84933c4c1083..f76a43bfa15f 100644
> --- a/scripts/gdb/linux/modules.py
> +++ b/scripts/gdb/linux/modules.py
> @@ -73,12 +73,12 @@ class LxLsmod(gdb.Command):
>                  "        " if utils.get_long_type().sizeof == 8 else
> ""))
> 
>          for module in module_list():
> +            text = module['mem'][constants.LX_MOD_TEXT]
> +            text_addr = str(text['base']).split()[0]
>              total_size = 0
> +
>              for i in range(constants.LX_MOD_TEXT,
> constants.LX_MOD_RO_AFTER_INIT + 1):
> -                layout = module['mem'][i]
> -                if i == constants.LX_MOD_TEXT:
> -                    text_addr = str(layout['base']).split()[0]
> -                total_size += layout['size']
> +                total_size += module['mem'][i]['size']
> 
>              gdb.write("{address} {name:<19}
> {size:>8}  {ref}".format(
>                  address=text_addr,
diff mbox series

Patch

diff --git a/scripts/gdb/linux/constants.py.in b/scripts/gdb/linux/constants.py.in
index 50a92c4e9984..fab74ca9df6f 100644
--- a/scripts/gdb/linux/constants.py.in
+++ b/scripts/gdb/linux/constants.py.in
@@ -64,6 +64,9 @@  LX_GDBPARSED(IRQ_HIDDEN)
 
 /* linux/module.h */
 LX_GDBPARSED(MOD_TEXT)
+LX_GDBPARSED(MOD_DATA)
+LX_GDBPARSED(MOD_RODATA)
+LX_GDBPARSED(MOD_RO_AFTER_INIT)
 
 /* linux/mount.h */
 LX_VALUE(MNT_NOSUID)
diff --git a/scripts/gdb/linux/modules.py b/scripts/gdb/linux/modules.py
index 261f28640f4c..84933c4c1083 100644
--- a/scripts/gdb/linux/modules.py
+++ b/scripts/gdb/linux/modules.py
@@ -73,11 +73,17 @@  class LxLsmod(gdb.Command):
                 "        " if utils.get_long_type().sizeof == 8 else ""))
 
         for module in module_list():
-            layout = module['mem'][constants.LX_MOD_TEXT]
+            total_size = 0
+            for i in range(constants.LX_MOD_TEXT, constants.LX_MOD_RO_AFTER_INIT + 1):
+                layout = module['mem'][i]
+                if i == constants.LX_MOD_TEXT:
+                    text_addr = str(layout['base']).split()[0]
+                total_size += layout['size']
+
             gdb.write("{address} {name:<19} {size:>8}  {ref}".format(
-                address=str(layout['base']).split()[0],
+                address=text_addr,
                 name=module['name'].string(),
-                size=str(layout['size']),
+                size=str(total_size),
                 ref=str(module['refcnt']['counter'] - 1)))
 
             t = self._module_use_type.get_type().pointer()