Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1374959 > unrolled thread

[PATCH 4.4 153/210] scripts/gdb: account for changes in module data structure

Back to article view | Back to linux.kernel

This discussion starts older than the indexed window; earlier articles aren't shown. The article labeled Started by below is the oldest one visible, not the original post.

Contents

  [PATCH 4.4 153/210] scripts/gdb: account for changes in module data structure Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2016-04-10 21:20 +0200
    Re: [PATCH 4.4 153/210] scripts/gdb: account for changes in module  data structure Jan Kiszka <jan.kiszka@siemens.com> - 2016-04-11 06:10 +0200
      Re: [PATCH 4.4 153/210] scripts/gdb: account for changes in module  data structure Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2016-04-12 16:20 +0200

#1374959 — [PATCH 4.4 153/210] scripts/gdb: account for changes in module data structure

4.4-stable review patch.  If anyone has any objections, please let me know.

------------------

From: Jan Kiszka <jan.kiszka@siemens.com>

commit ad4db3b24a93e52a92ad8f9b0273a9416f202c23 upstream.

Commit 7523e4dc5057 ("module: use a structure to encapsulate layout.")
factored out the module_layout structure.  Adjust the symbol loader and
the lsmod command to this.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
Reviewed-by: Kieran Bingham <kieran.bingham@linaro.org>
Tested-by: Kieran Bingham <kieran.bingham@linaro.org> (qemu-{ARM,x86})
Cc: Rusty Russell <rusty@rustcorp.com.au>
Cc: Jiri Kosina <jkosina@suse.cz>
Cc: Jason Wessel <jason.wessel@windriver.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

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

--- a/scripts/gdb/linux/modules.py
+++ b/scripts/gdb/linux/modules.py
@@ -73,10 +73,11 @@ class LxLsmod(gdb.Command):
                 "        " if utils.get_long_type().sizeof == 8 else ""))
 
         for module in module_list():
+            layout = module['core_layout']
             gdb.write("{address} {name:<19} {size:>8}  {ref}".format(
-                address=str(module['module_core']).split()[0],
+                address=str(layout['base']).split()[0],
                 name=module['name'].string(),
-                size=str(module['core_size']),
+                size=str(layout['size']),
                 ref=str(module['refcnt']['counter'])))
 
             source_list = module['source_list']
--- a/scripts/gdb/linux/symbols.py
+++ b/scripts/gdb/linux/symbols.py
@@ -108,7 +108,7 @@ lx-symbols command."""
 
     def load_module_symbols(self, module):
         module_name = module['name'].string()
-        module_addr = str(module['module_core']).split()[0]
+        module_addr = str(module['core_layout']['base']).split()[0]
 
         module_file = self._get_module_file(module_name)
         if not module_file and not self.module_files_updated:

[toc] | [next] | [standalone]

#1375468 — Re: [PATCH 4.4 153/210] scripts/gdb: account for changes in module data structure

On 2016-04-10 11:36, Greg Kroah-Hartman wrote:
> 4.4-stable review patch.  If anyone has any objections, please let me know.
> 
> ------------------
> 
> From: Jan Kiszka <jan.kiszka@siemens.com>
> 
> commit ad4db3b24a93e52a92ad8f9b0273a9416f202c23 upstream.
> 
> Commit 7523e4dc5057 ("module: use a structure to encapsulate layout.")
> factored out the module_layout structure.  Adjust the symbol loader and
> the lsmod command to this.

Unless the referenced commit is also in the 4.4 queue (seems unlikely,
though), this patch must not go to that stable branch as it only
addresses a 4.5 change. So please drop.

Thanks,
Jan

-- 
Siemens AG, Corporate Technology, CT RDA ITP SES-DE
Corporate Competence Center Embedded Linux

[toc] | [prev] | [next] | [standalone]

#1376837 — Re: [PATCH 4.4 153/210] scripts/gdb: account for changes in module data structure

On Sun, Apr 10, 2016 at 09:01:39PM -0700, Jan Kiszka wrote:
> On 2016-04-10 11:36, Greg Kroah-Hartman wrote:
> > 4.4-stable review patch.  If anyone has any objections, please let me know.
> > 
> > ------------------
> > 
> > From: Jan Kiszka <jan.kiszka@siemens.com>
> > 
> > commit ad4db3b24a93e52a92ad8f9b0273a9416f202c23 upstream.
> > 
> > Commit 7523e4dc5057 ("module: use a structure to encapsulate layout.")
> > factored out the module_layout structure.  Adjust the symbol loader and
> > the lsmod command to this.
> 
> Unless the referenced commit is also in the 4.4 queue (seems unlikely,
> though), this patch must not go to that stable branch as it only
> addresses a 4.5 change. So please drop.

Odd, it was told to be backported to 4.4, I guess the authors messed up
:(

Now dropped, thanks.

greg k-h

[toc] | [prev] | [standalone]

Back to top | Article view | linux.kernel

csiph-web