From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.2 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3C44DFA372A for ; Thu, 17 Oct 2019 14:12:33 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 17A0620854 for ; Thu, 17 Oct 2019 14:12:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2439867AbfJQOMc (ORCPT ); Thu, 17 Oct 2019 10:12:32 -0400 Received: from thoth.sbs.de ([192.35.17.2]:46843 "EHLO thoth.sbs.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727429AbfJQOMb (ORCPT ); Thu, 17 Oct 2019 10:12:31 -0400 Received: from mail2.sbs.de (mail2.sbs.de [192.129.41.66]) by thoth.sbs.de (8.15.2/8.15.2) with ESMTPS id x9HECJuL004263 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 17 Oct 2019 16:12:19 +0200 Received: from [139.25.68.37] ([139.25.68.37]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id x9HECJNG019630; Thu, 17 Oct 2019 16:12:19 +0200 Subject: Re: [PATCH v2] scripts/gdb: fix debugging modules on s390 From: Jan Kiszka To: Ilya Leoshkevich , Kieran Bingham , linux-kernel@vger.kernel.org, linux-s390@vger.kernel.org, Andrew Morton Cc: Heiko Carstens , Vasily Gorbik References: <20191017085917.81791-1-iii@linux.ibm.com> Message-ID: Date: Thu, 17 Oct 2019 16:12:18 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.1.1 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 17.10.19 16:11, Jan Kiszka wrote: > On 17.10.19 10:59, Ilya Leoshkevich wrote: >> Currently lx-symbols assumes that module text is always located at >> module->core_layout->base, but s390 uses the following layout: >> >> +------+ <- module->core_layout->base >> | GOT | >> +------+ <- module->core_layout->base + module->arch->plt_offset >> | PLT | >> +------+ <- module->core_layout->base + module->arch->plt_offset + >> | TEXT | module->arch->plt_size >> +------+ >> >> Therefore, when trying to debug modules on s390, all the symbol >> addresses are skewed by plt_offset + plt_size. >> >> Fix by adding plt_offset + plt_size to module_addr in >> load_module_symbols(). >> >> Signed-off-by: Ilya Leoshkevich >> --- >> >> v1 -> v2: print the adjusted address. >> >> scripts/gdb/linux/symbols.py | 8 +++++++- >> 1 file changed, 7 insertions(+), 1 deletion(-) >> >> diff --git a/scripts/gdb/linux/symbols.py b/scripts/gdb/linux/symbols.py >> index f0d8f2ecfde7..df4c810de663 100644 >> --- a/scripts/gdb/linux/symbols.py >> +++ b/scripts/gdb/linux/symbols.py >> @@ -15,7 +15,7 @@ import gdb >> import os >> import re >> >> -from linux import modules >> +from linux import modules, utils >> >> >> if hasattr(gdb, 'Breakpoint'): >> @@ -111,6 +111,12 @@ lx-symbols command.""" >> module_file = self._get_module_file(module_name) >> >> if module_file: >> + if utils.is_target_arch('s390'): >> + # Module text is preceded by PLT stubs on s390. >> + module_arch = module['arch'] >> + plt_offset = int(module_arch['plt_offset']) >> + plt_size = int(module_arch['plt_size']) >> + module_addr = hex(int(module_addr, 0) + plt_offset + plt_size) >> gdb.write("loading @{addr}: {filename}\n".format( >> addr=module_addr, filename=module_file)) >> cmdline = "add-symbol-file {filename} {addr}{sections}".format( >> > > Reviewed-by: Jan Kiszka > > Thanks, > Jan > Sorry, forgot to CC Andrew for pickup. Jan -- Siemens AG, Corporate Technology, CT RDA IOT SES-DE Corporate Competence Center Embedded Linux