Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932853AbdLRH32 (ORCPT ); Mon, 18 Dec 2017 02:29:28 -0500 Received: from mail.kernel.org ([198.145.29.99]:60422 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932126AbdLRH30 (ORCPT ); Mon, 18 Dec 2017 02:29:26 -0500 DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 52AAE21896 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=mhiramat@kernel.org From: Masami Hiramatsu To: Arnaldo Carvalho de Melo Cc: Masami Hiramatsu , linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org Subject: [PATCH 1/2] perf-probe: Ensure debuginfo's build-id is correct Date: Mon, 18 Dec 2017 16:29:03 +0900 Message-Id: <151358214328.25261.6660021248431426149.stgit@devbox> X-Mailer: git-send-email 2.13.6 In-Reply-To: <151358211494.25261.16134489192749792799.stgit@devbox> References: <151358211494.25261.16134489192749792799.stgit@devbox> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2245 Lines: 68 Ensure that the build-id of debuginfo is correctly matched to target build-id, if not, it warns user to check the system debuginfo package is correctly installed. E.g. on such environment, you will see below warning. ====== # perf probe -l WARN: There is a build-id mismatch between /usr/lib/debug/usr/lib64/libc-2.25.so.debug and /usr/lib64/libc-2.25.so Please check your system's debuginfo files for mismatches, e.g. check the versions for the target package and debuginfo package. probe_libc:malloc_get_state (on malloc_get_state@GLIBC_2.2.5 in /us r/lib64/libc-2.25.so) ====== Signed-off-by: Masami Hiramatsu --- tools/perf/util/probe-finder.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/tools/perf/util/probe-finder.c b/tools/perf/util/probe-finder.c index a5731de0e5eb..5bb71e056b21 100644 --- a/tools/perf/util/probe-finder.c +++ b/tools/perf/util/probe-finder.c @@ -119,9 +119,11 @@ enum dso_binary_type distro_dwarf_types[] = { struct debuginfo *debuginfo__new(const char *path) { + u8 bid[BUILD_ID_SIZE], bid2[BUILD_ID_SIZE]; enum dso_binary_type *type; char buf[PATH_MAX], nil = '\0'; struct dso *dso; + bool have_build_id = false; struct debuginfo *dinfo = NULL; /* Try to open distro debuginfo files */ @@ -129,12 +131,28 @@ struct debuginfo *debuginfo__new(const char *path) if (!dso) goto out; + if (filename__read_build_id(path, bid, BUILD_ID_SIZE) > 0) + have_build_id = true; + for (type = distro_dwarf_types; !dinfo && *type != DSO_BINARY_TYPE__NOT_FOUND; type++) { if (dso__read_binary_type_filename(dso, *type, &nil, buf, PATH_MAX) < 0) continue; + + if (have_build_id) { + /* This can be fail because the file doesn't exist */ + if (filename__read_build_id(buf, bid2, + BUILD_ID_SIZE) < 0) + continue; + if (memcmp(bid, bid2, BUILD_ID_SIZE)) { + pr_warning("WARN: There is a build-id mismatch between\n %s\n and\n %s\n" + "Please check your system's debuginfo files for mismatches, e.g. check the " + "versions for the target package and debuginfo package.\n", buf, path); + continue; + } + } dinfo = __debuginfo__new(buf); } dso__put(dso);