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=-11.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS 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 B32FBC43461 for ; Sun, 13 Sep 2020 21:06:36 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 695062098B for ; Sun, 13 Sep 2020 21:06:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1600031196; bh=oaKe8uUBR6w2b22egGQbmPsAZrjWnfd4ESe5X/vlanc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=DNDuVhbY+7jRd6zyCJVN2GbhNiIFYYmPB/yKrGDonm5Jrdvp1swtVIyYVu0bBVO3C 4m5jBDUE2jCKptIY4ST2OcMEyfCBAYsuB1ZdpO7HIaZAJox+gC+9NeU9qhyUr73VAM oYVDmTpcTLk/mLvBPlI+kDZWurmIk1SUrUM7dBXg= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726140AbgIMVGe convert rfc822-to-8bit (ORCPT ); Sun, 13 Sep 2020 17:06:34 -0400 Received: from us-smtp-delivery-44.mimecast.com ([207.211.30.44]:37861 "EHLO us-smtp-delivery-44.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726060AbgIMVFG (ORCPT ); Sun, 13 Sep 2020 17:05:06 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-56-ptSxF1tZNJO5KmHrmddyQQ-1; Sun, 13 Sep 2020 17:03:52 -0400 X-MC-Unique: ptSxF1tZNJO5KmHrmddyQQ-1 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 4F4D4185A0E5; Sun, 13 Sep 2020 21:03:50 +0000 (UTC) Received: from krava.redhat.com (ovpn-112-4.ams2.redhat.com [10.36.112.4]) by smtp.corp.redhat.com (Postfix) with ESMTP id D6D2D10021AA; Sun, 13 Sep 2020 21:03:46 +0000 (UTC) From: Jiri Olsa To: Arnaldo Carvalho de Melo Cc: lkml , Peter Zijlstra , Ingo Molnar , Mark Rutland , Namhyung Kim , Alexander Shishkin , Michael Petlan , Song Liu , "Frank Ch. Eigler" , Ian Rogers , Stephane Eranian , Alexey Budankov , Andi Kleen , Adrian Hunter Subject: [PATCH 06/26] perf tools: Add support to read build id from compressed elf Date: Sun, 13 Sep 2020 23:02:53 +0200 Message-Id: <20200913210313.1985612-7-jolsa@kernel.org> In-Reply-To: <20200913210313.1985612-1-jolsa@kernel.org> References: <20200913210313.1985612-1-jolsa@kernel.org> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=jolsa@kernel.org X-Mimecast-Spam-Score: 0.001 X-Mimecast-Originator: kernel.org Content-Type: text/plain; charset=WINDOWS-1252 Content-Transfer-Encoding: 8BIT Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Adding support to decompress file before reading build id. Adding filename__read_build_id and change its current versions to read_build_id. Signed-off-by: Jiri Olsa --- tools/perf/util/symbol-elf.c | 37 ++++++++++++++++++++++++++++++++++-- 1 file changed, 35 insertions(+), 2 deletions(-) diff --git a/tools/perf/util/symbol-elf.c b/tools/perf/util/symbol-elf.c index 94a156df22d5..6770572620f3 100644 --- a/tools/perf/util/symbol-elf.c +++ b/tools/perf/util/symbol-elf.c @@ -534,7 +534,7 @@ static int elf_read_build_id(Elf *elf, void *bf, size_t size) #ifdef HAVE_LIBBFD_BUILDID_SUPPORT -int filename__read_build_id(const char *filename, void *bf, size_t size) +static int read_build_id(const char *filename, void *bf, size_t size) { int err = -1; bfd *abfd; @@ -562,7 +562,7 @@ int filename__read_build_id(const char *filename, void *bf, size_t size) #else // HAVE_LIBBFD_BUILDID_SUPPORT -int filename__read_build_id(const char *filename, void *bf, size_t size) +static int read_build_id(const char *filename, void *bf, size_t size) { int fd, err = -1; Elf *elf; @@ -591,6 +591,39 @@ int filename__read_build_id(const char *filename, void *bf, size_t size) #endif // HAVE_LIBBFD_BUILDID_SUPPORT +int filename__read_build_id(const char *filename, void *bf, size_t size) +{ + struct kmod_path m = { .name = NULL, }; + char path[PATH_MAX]; + int err; + + if (!filename) + return -EFAULT; + + err = kmod_path__parse(&m, filename); + if (err) + return -1; + + if (m.comp) { + int error = 0, fd; + + fd = filename__decompress(filename, path, sizeof(path), m.comp, &error); + if (fd < 0) { + pr_debug("Failed to decompress (error %d) %s\n", + error, filename); + return -1; + } + close(fd); + filename = path; + } + + err = read_build_id(filename, bf, size); + + if (m.comp) + unlink(filename); + return err; +} + int sysfs__read_build_id(const char *filename, void *build_id, size_t size) { int fd, err = -1; -- 2.26.2