From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754167AbcCMT1r (ORCPT ); Sun, 13 Mar 2016 15:27:47 -0400 Received: from mout.web.de ([212.227.17.12]:55834 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752163AbcCMT1i (ORCPT ); Sun, 13 Mar 2016 15:27:38 -0400 To: Andrew Morton , Linux Kernel Mailing List Cc: Kieran Bingham From: Jan Kiszka Subject: [PATCH] scripts/gdb: Account for changes in module data structure Message-ID: <56E5BF25.3030403@web.de> Date: Sun, 13 Mar 2016 20:27:33 +0100 User-Agent: Mozilla/5.0 (X11; U; Linux i686 (x86_64); de; rv:1.8.1.12) Gecko/20080226 SUSE/2.0.0.12-1.1 Thunderbird/2.0.0.12 Mnenhy/0.7.5.666 MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-15 Content-Transfer-Encoding: 7bit X-Provags-ID: V03:K0:oUuAQ6btl+JH7j8Fmc51oOYnjjWgtZ8TAxqFWG4XnU7cOo1FeyA ivPbjhS/eqYTK2Xnv61TibuixTbtLzuxJcWmttNV+JYvF+Vg3+AR69q5j1glfLF3xJp9ovP Go5Nh7jmY395Y762bsIylgq2AzTnzx3LXp1DjzUpKzQPhqJ2tbolAd66oyGrBY4p/qYOlNP 1vlNOCkUoZsl0izegiWGw== X-UI-Out-Filterresults: notjunk:1;V01:K0:5ZwTPIY+fJs=:oCyR7EI2rEgz9HBd/D2+GR yj/QFPI/psvsrM5s/mj1h7FTJPBHoCielrgOMrySXXJUsP3DePXQH1omxJQOANsAkr7ToE+mK mFLhcc2ckucC+7DtcgHR6uO0gPNp1ohkzAafDJIth5nBX2vXT78hRUv2mg4uy8deqQ309omwM eb7ZiWL2Ed7LHLYM79J9ngzWuYLPwLM4d4ILfUr52tpfusqbolRhc/e3x8TtA8Fz86s60Yp63 Yf6YDlzzged08D4WoYXgUZSPOSUyDXXc6BINyNGwmVrKCQx7KkN8B//xHLD27SwiNdOeMyI84 DG3Fsmnd32j0xvJBa7+woXJPbEt3LC5BBTZXCiPVRcylsqwaroLAWeTJGn9fGaqvlqYaLnHLP 9287pb2beTwkRYibyjBF9TKltxgPCKpdF1i4RSfjkq8V/lnbrIAgfy9epDppTb0upmSlj/FBP gB+EHBOLgHjrSy1tg53/77fVqcz1dSFRXYSi5gVf9CuLg80y466z0GWEyXuGytBd9EcxQBMwK LtfbobN1RXClgtaBtAMblfnA900we6E0IjZRqC/ntUf/dHr4sI6ewW1G2lY6JsjdTWK9176BW vS8KbeAscVeCXyV6uo+JFePBSEhz6NIYxUS2N2avqOrl/HGExBd8MPNFp9S1qqptZgMuoZ774 0VCyamjBeCtPXWjVSwsd0huHgg0dQNQn4BSJNhSlQd8C7JfHSivwDHUhCXiXX7DgC/aekylxf Bs13bjn4k83SRgmMrV0jex9YHpHs+4FRzT5T0EuQHvFqIRyGR1UFMnpAdJi824jFMrVnDtDlf F/5l0PH Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Jan Kiszka Commit 7523e4dc50 factored out the module_layout structure. Adjust the symbol loader and the lsmod command to this. Signed-off-by: Jan Kiszka --- Probably too late for 4.5, still a regression. scripts/gdb/linux/modules.py | 5 +++-- scripts/gdb/linux/symbols.py | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/scripts/gdb/linux/modules.py b/scripts/gdb/linux/modules.py index 25db8cf..0a35d6d 100644 --- 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'] diff --git a/scripts/gdb/linux/symbols.py b/scripts/gdb/linux/symbols.py index 627750c..9a0f892 100644 --- 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: -- 2.1.4