LKML Archive on lore.kernel.org
 help / color / Atom feed
From: Namhyung Kim <namhyung@kernel.org>
To: Arnaldo Carvalho de Melo <acme@kernel.org>
Cc: Ingo Molnar <mingo@kernel.org>,
	Peter Zijlstra <a.p.zijlstra@chello.nl>,
	Jiri Olsa <jolsa@kernel.org>, LKML <linux-kernel@vger.kernel.org>,
	kernel-team@lge.com, David Ahern <dsahern@gmail.com>,
	Adrian Hunter <adrian.hunter@intel.com>,
	Wang Nan <wangnan0@huawei.com>
Subject: [PATCH v4 4/9] perf annotate: Use dso__decompress_kmodule_path()
Date: Thu,  8 Jun 2017 16:31:04 +0900
Message-ID: <20170608073109.30699-5-namhyung@kernel.org> (raw)
In-Reply-To: <20170608073109.30699-1-namhyung@kernel.org>

Convert open-coded decompress routine to use the function.

Signed-off-by: Namhyung Kim <namhyung@kernel.org>
---
 tools/perf/util/annotate.c | 27 +++------------------------
 1 file changed, 3 insertions(+), 24 deletions(-)

diff --git a/tools/perf/util/annotate.c b/tools/perf/util/annotate.c
index df4486c3a2fa..ddbd56df9187 100644
--- a/tools/perf/util/annotate.c
+++ b/tools/perf/util/annotate.c
@@ -1431,31 +1431,10 @@ int symbol__disassemble(struct symbol *sym, struct map *map, const char *arch_na
 				sizeof(symfs_filename));
 		}
 	} else if (dso__needs_decompress(dso)) {
-		char tmp[PATH_MAX];
-		struct kmod_path m;
-		int fd;
-		bool ret;
+		char tmp[KMOD_DECOMP_LEN];
 
-		if (kmod_path__parse_ext(&m, symfs_filename))
-			goto out;
-
-		snprintf(tmp, PATH_MAX, "/tmp/perf-kmod-XXXXXX");
-
-		fd = mkstemp(tmp);
-		if (fd < 0) {
-			free(m.ext);
-			goto out;
-		}
-
-		ret = decompress_to_file(m.ext, symfs_filename, fd);
-
-		if (ret)
-			pr_err("Cannot decompress %s %s\n", m.ext, symfs_filename);
-
-		free(m.ext);
-		close(fd);
-
-		if (!ret)
+		if (dso__decompress_kmodule_path(dso, symfs_filename,
+						 tmp, sizeof(tmp)) < 0)
 			goto out;
 
 		strcpy(symfs_filename, tmp);
-- 
2.13.1

  parent reply index

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-06-08  7:31 [PATCHSET 0/9] perf tools: Fix for compressed kernel modules (v4) Namhyung Kim
2017-06-08  7:31 ` [PATCH v4 1/9] perf annotate: Fix symbolic link of build-id cache Namhyung Kim
2017-06-08 22:49   ` [tip:perf/urgent] " tip-bot for Namhyung Kim
2017-06-08  7:31 ` [PATCH v4 2/9] perf tools: Fix a memory leak in __open_dso() Namhyung Kim
2017-06-08 22:50   ` [tip:perf/urgent] " tip-bot for Namhyung Kim
2017-06-08  7:31 ` [PATCH v4 3/9] perf tools: Introduce dso__decompress_kmodule_{fd,path} Namhyung Kim
2017-06-08 22:50   ` [tip:perf/urgent] " tip-bot for Namhyung Kim
2017-06-08  7:31 ` Namhyung Kim [this message]
2017-06-08 22:51   ` [tip:perf/urgent] perf annotate: Use dso__decompress_kmodule_path() tip-bot for Namhyung Kim
2017-06-08  7:31 ` [PATCH v4 5/9] perf tools: Decompress kernel module when reading DSO data Namhyung Kim
2017-06-08 22:51   ` [tip:perf/urgent] " tip-bot for Namhyung Kim
2017-06-08  7:31 ` [PATCH v4 6/9] perf tools: Consolidate error path in __open_dso() Namhyung Kim
2017-06-08 22:52   ` [tip:perf/urgent] " tip-bot for Namhyung Kim
2017-06-08  7:31 ` [PATCH v4 7/9] perf test: Decompress kernel module before objdump Namhyung Kim
2017-06-08  7:34   ` Adrian Hunter
2017-06-08 22:52   ` [tip:perf/urgent] perf tests: " tip-bot for Namhyung Kim
2017-06-08  7:31 ` [PATCH v4 8/9] perf symbols: Keep DSO->symtab_type after decompress Namhyung Kim
2017-06-08 22:53   ` [tip:perf/urgent] " tip-bot for Namhyung Kim
2017-06-08  7:31 ` [PATCH v4 9/9] perf symbols: Kill dso__build_id_is_kmod() Namhyung Kim
2017-06-08 22:53   ` [tip:perf/urgent] " tip-bot for Namhyung Kim
2017-06-08 12:10 ` [PATCHSET 0/9] perf tools: Fix for compressed kernel modules (v4) Jiri Olsa

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20170608073109.30699-5-namhyung@kernel.org \
    --to=namhyung@kernel.org \
    --cc=a.p.zijlstra@chello.nl \
    --cc=acme@kernel.org \
    --cc=adrian.hunter@intel.com \
    --cc=dsahern@gmail.com \
    --cc=jolsa@kernel.org \
    --cc=kernel-team@lge.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mingo@kernel.org \
    --cc=wangnan0@huawei.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

LKML Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/lkml/0 lkml/git/0.git
	git clone --mirror https://lore.kernel.org/lkml/1 lkml/git/1.git
	git clone --mirror https://lore.kernel.org/lkml/2 lkml/git/2.git
	git clone --mirror https://lore.kernel.org/lkml/3 lkml/git/3.git
	git clone --mirror https://lore.kernel.org/lkml/4 lkml/git/4.git
	git clone --mirror https://lore.kernel.org/lkml/5 lkml/git/5.git
	git clone --mirror https://lore.kernel.org/lkml/6 lkml/git/6.git
	git clone --mirror https://lore.kernel.org/lkml/7 lkml/git/7.git
	git clone --mirror https://lore.kernel.org/lkml/8 lkml/git/8.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 lkml lkml/ https://lore.kernel.org/lkml \
		linux-kernel@vger.kernel.org
	public-inbox-index lkml

Example config snippet for mirrors

Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/org.kernel.vger.linux-kernel


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git