Received: by 2002:a25:8b12:0:0:0:0:0 with SMTP id i18csp1080721ybl; Wed, 14 Aug 2019 10:22:54 -0700 (PDT) X-Google-Smtp-Source: APXvYqwS9Xv4A24HKIq1X06mZfB4pjdIlP/Co4MdwJPE6CM2d1G4Y2zQQXROAY8YAk3fkNIqA/uE X-Received: by 2002:aa7:8746:: with SMTP id g6mr973442pfo.191.1565803374166; Wed, 14 Aug 2019 10:22:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1565803374; cv=none; d=google.com; s=arc-20160816; b=wYSSjzssPL4XJeOF9GuG3BNtUHmMYA2+2JEYJ66LoTlRg7TMWoEsi69m7tvVD4q/wH DmTM4FqeAC8ZJA4Wr3A7KAmIEXn7wvv+aLBzHSEg8G4AaBI+lB3YFQk54+Yug3qp4cZ7 AtUrDvFXP/N7ASalfXEpMChdCSzjdjQfb+bA9VZ5HFcIzPCftjQoPQbtN2Gu2148YD5p qWpFXjjYz/rH8M104X+cVDH81e7tPI519Tz7IckVVys5wam7Nvla7IUrUuXKxCMaibWe UTwRsofhbF86wK40vy5lUXiwjdex0oJ6iunYfRA3AOHCbMbW1XZgCsYwLtzyX+7ijBPr IyGw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=aNUXLWxB8mZvWc13ZcjkHFQ7YWDghC4WIm88Dw7cwXI=; b=j5itfkH3K+/4q9qCZtVmBH5MJgvUbnaKnWyqnKwH6MkYLrGndgomRLioNj2Hfe/r5v B3d/0tdEPoGa+1zjmvVuyBr4j1hrYBK1bt2wldBGUjUYrG0Kv1tL+crGD/APmbDRSd7A KYkM5b/u/ykhMAs4YtHgLO52TO0rwMThVJv5KhqtNQVrDsXoiTR6iMoICl7m22sOWWvz Ucf/Ncjz0KAv+l5t1U9MT0U+kZee3xeHF5NG4pqunxXH7Kd0aOQi7l+AhcfKna7U+nQH aLH5kwHGe2gNgw/+Xf6QgKpmudRwggem92Y802hSeYewOH6+q7qmXmdqAAzZrNQ/r6Ok JlVw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=hBMD1+Rq; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 1si84647pfe.271.2019.08.14.10.22.37; Wed, 14 Aug 2019 10:22:54 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=hBMD1+Rq; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729707AbfHNRJI (ORCPT + 99 others); Wed, 14 Aug 2019 13:09:08 -0400 Received: from mail.kernel.org ([198.145.29.99]:59350 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730261AbfHNRJF (ORCPT ); Wed, 14 Aug 2019 13:09:05 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 90E0B2084D; Wed, 14 Aug 2019 17:09:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1565802544; bh=Uwe+dtt/0iBpNzLmzdON8En8wRrrxYjX+o1mHPdpdtQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=hBMD1+RqUAgR/2HfgCcxqf/TbXQZhJg+YhKUCe31hl81kXkSbGfUjIQ228J1RxQ+1 hjrT1IVIHw7Li/pGnyL+sUCoOwdDSJ/cgHqmC7Q29EKw1PAM+cYKAOnio246zDx8or m29R06W44L2297Gb3VWspQBA1HxYjPVRL38+AWHA= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Stefan Liebler , Thomas Richter , Heiko Carstens , Hendrik Brueckner , Vasily Gorbik , Arnaldo Carvalho de Melo Subject: [PATCH 4.19 22/91] perf record: Fix module size on s390 Date: Wed, 14 Aug 2019 19:00:45 +0200 Message-Id: <20190814165750.660266790@linuxfoundation.org> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190814165748.991235624@linuxfoundation.org> References: <20190814165748.991235624@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Thomas Richter commit 12a6d2940b5f02b4b9f71ce098e3bb02bc24a9ea upstream. On s390 the modules loaded in memory have the text segment located after the GOT and Relocation table. This can be seen with this output: [root@m35lp76 perf]# fgrep qeth /proc/modules qeth 151552 1 qeth_l2, Live 0x000003ff800b2000 ... [root@m35lp76 perf]# cat /sys/module/qeth/sections/.text 0x000003ff800b3990 [root@m35lp76 perf]# There is an offset of 0x1990 bytes. The size of the qeth module is 151552 bytes (0x25000 in hex). The location of the GOT/relocation table at the beginning of a module is unique to s390. commit 203d8a4aa6ed ("perf s390: Fix 'start' address of module's map") adjusts the start address of a module in the map structures, but does not adjust the size of the modules. This leads to overlapping of module maps as this example shows: [root@m35lp76 perf] # ./perf report -D 0 0 0xfb0 [0xa0]: PERF_RECORD_MMAP -1/0: [0x3ff800b3990(0x25000) @ 0]: x /lib/modules/.../qeth.ko.xz 0 0 0x1050 [0xb0]: PERF_RECORD_MMAP -1/0: [0x3ff800d85a0(0x8000) @ 0]: x /lib/modules/.../ip6_tables.ko.xz The module qeth.ko has an adjusted start address modified to b3990, but its size is unchanged and the module ends at 0x3ff800d8990. This end address overlaps with the next modules start address of 0x3ff800d85a0. When the size of the leading GOT/Relocation table stored in the beginning of the text segment (0x1990 bytes) is subtracted from module qeth end address, there are no overlaps anymore: 0x3ff800d8990 - 0x1990 = 0x0x3ff800d7000 which is the same as 0x3ff800b2000 + 0x25000 = 0x0x3ff800d7000. To fix this issue, also adjust the modules size in function arch__fix_module_text_start(). Add another function parameter named size and reduce the size of the module when the text segment start address is changed. Output after: 0 0 0xfb0 [0xa0]: PERF_RECORD_MMAP -1/0: [0x3ff800b3990(0x23670) @ 0]: x /lib/modules/.../qeth.ko.xz 0 0 0x1050 [0xb0]: PERF_RECORD_MMAP -1/0: [0x3ff800d85a0(0x7a60) @ 0]: x /lib/modules/.../ip6_tables.ko.xz Reported-by: Stefan Liebler Signed-off-by: Thomas Richter Acked-by: Heiko Carstens Cc: Hendrik Brueckner Cc: Vasily Gorbik Cc: stable@vger.kernel.org Fixes: 203d8a4aa6ed ("perf s390: Fix 'start' address of module's map") Link: http://lkml.kernel.org/r/20190724122703.3996-1-tmricht@linux.ibm.com Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: Greg Kroah-Hartman --- tools/perf/arch/s390/util/machine.c | 14 +++++++++++++- tools/perf/util/machine.c | 3 ++- tools/perf/util/machine.h | 2 +- 3 files changed, 16 insertions(+), 3 deletions(-) --- a/tools/perf/arch/s390/util/machine.c +++ b/tools/perf/arch/s390/util/machine.c @@ -8,7 +8,7 @@ #include "debug.h" #include "symbol.h" -int arch__fix_module_text_start(u64 *start, const char *name) +int arch__fix_module_text_start(u64 *start, u64 *size, const char *name) { u64 m_start = *start; char path[PATH_MAX]; @@ -18,6 +18,18 @@ int arch__fix_module_text_start(u64 *sta if (sysfs__read_ull(path, (unsigned long long *)start) < 0) { pr_debug2("Using module %s start:%#lx\n", path, m_start); *start = m_start; + } else { + /* Successful read of the modules segment text start address. + * Calculate difference between module start address + * in memory and module text segment start address. + * For example module load address is 0x3ff8011b000 + * (from /proc/modules) and module text segment start + * address is 0x3ff8011b870 (from file above). + * + * Adjust the module size and subtract the GOT table + * size located at the beginning of the module. + */ + *size -= (*start - m_start); } return 0; --- a/tools/perf/util/machine.c +++ b/tools/perf/util/machine.c @@ -1295,6 +1295,7 @@ static int machine__set_modules_path(str return map_groups__set_modules_path_dir(&machine->kmaps, modules_path, 0); } int __weak arch__fix_module_text_start(u64 *start __maybe_unused, + u64 *size __maybe_unused, const char *name __maybe_unused) { return 0; @@ -1306,7 +1307,7 @@ static int machine__create_module(void * struct machine *machine = arg; struct map *map; - if (arch__fix_module_text_start(&start, name) < 0) + if (arch__fix_module_text_start(&start, &size, name) < 0) return -1; map = machine__findnew_module_map(machine, start, name); --- a/tools/perf/util/machine.h +++ b/tools/perf/util/machine.h @@ -219,7 +219,7 @@ struct symbol *machine__find_kernel_symb struct map *machine__findnew_module_map(struct machine *machine, u64 start, const char *filename); -int arch__fix_module_text_start(u64 *start, const char *name); +int arch__fix_module_text_start(u64 *start, u64 *size, const char *name); int machine__load_kallsyms(struct machine *machine, const char *filename);