LKML Archive on lore.kernel.org
 help / color / Atom feed
From: Andi Kleen <andi@firstfloor.org>
To: acme@kernel.org
Cc: jolsa@kernel.org, namhyung@kernel.org,
	linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org,
	Andi Kleen <ak@linux.intel.com>
Subject: [PATCH v4 01/15] perf tools: Add utility function to fetch executable
Date: Tue,  5 Mar 2019 06:47:44 -0800
Message-ID: <20190305144758.12397-2-andi@firstfloor.org> (raw)
In-Reply-To: <20190305144758.12397-1-andi@firstfloor.org>

From: Andi Kleen <ak@linux.intel.com>

Add a utility function to fetch executable code. Convert one
user over to it. There are more places doing that, but they
do significantly different actions, so they are not
easy to fit into a single library function.

Signed-off-by: Andi Kleen <ak@linux.intel.com>
---
 tools/perf/util/Build       |  1 +
 tools/perf/util/fetch.c     | 28 ++++++++++++++++++++++++++++
 tools/perf/util/fetch.h     |  7 +++++++
 tools/perf/util/intel-bts.c | 21 +++------------------
 4 files changed, 39 insertions(+), 18 deletions(-)
 create mode 100644 tools/perf/util/fetch.c
 create mode 100644 tools/perf/util/fetch.h

diff --git a/tools/perf/util/Build b/tools/perf/util/Build
index 8dd3102301ea..649321fc3fb9 100644
--- a/tools/perf/util/Build
+++ b/tools/perf/util/Build
@@ -65,6 +65,7 @@ perf-y += trace-event-scripting.o
 perf-y += trace-event.o
 perf-y += svghelper.o
 perf-y += sort.o
+perf-y += fetch.o
 perf-y += hist.o
 perf-y += util.o
 perf-y += xyarray.o
diff --git a/tools/perf/util/fetch.c b/tools/perf/util/fetch.c
new file mode 100644
index 000000000000..1430083e7eca
--- /dev/null
+++ b/tools/perf/util/fetch.c
@@ -0,0 +1,28 @@
+#include "perf.h"
+#include "machine.h"
+#include "thread.h"
+#include "symbol.h"
+#include "map.h"
+#include "fetch.h"
+
+int fetch_exe(u64 ip, struct thread *thread, struct machine *machine,
+	      char *buf, int len, bool *is64bit)
+{
+	struct addr_location al;
+	u8 cpumode;
+	long offset;
+
+	if (machine__kernel_ip(machine, ip))
+		cpumode = PERF_RECORD_MISC_KERNEL;
+	else
+		cpumode = PERF_RECORD_MISC_USER;
+	if (!thread__find_map(thread, cpumode, ip, &al) || !al.map->dso)
+		return -1;
+	if (al.map->dso->data.status == DSO_DATA_STATUS_ERROR)
+		return -1;
+	map__load(al.map);
+	offset = al.map->map_ip(al.map, ip);
+	if (is64bit)
+		*is64bit = al.map->dso->is_64_bit;
+	return dso__data_read_offset(al.map->dso, machine, offset, (u8 *)buf, len);
+}
diff --git a/tools/perf/util/fetch.h b/tools/perf/util/fetch.h
new file mode 100644
index 000000000000..7b77b8cee55a
--- /dev/null
+++ b/tools/perf/util/fetch.h
@@ -0,0 +1,7 @@
+#ifndef FETCH_H
+#define FETCH_H 1
+
+int fetch_exe(u64 ip, struct thread *thread, struct machine *machine,
+	      char *buf, int len, bool *is64bit);
+
+#endif
diff --git a/tools/perf/util/intel-bts.c b/tools/perf/util/intel-bts.c
index 0c0180c67574..915f4662e52e 100644
--- a/tools/perf/util/intel-bts.c
+++ b/tools/perf/util/intel-bts.c
@@ -38,6 +38,7 @@
 #include "auxtrace.h"
 #include "intel-pt-decoder/intel-pt-insn-decoder.h"
 #include "intel-bts.h"
+#include "fetch.h"
 
 #define MAX_TIMESTAMP (~0ULL)
 
@@ -328,35 +329,19 @@ static int intel_bts_get_next_insn(struct intel_bts_queue *btsq, u64 ip)
 {
 	struct machine *machine = btsq->bts->machine;
 	struct thread *thread;
-	struct addr_location al;
 	unsigned char buf[INTEL_PT_INSN_BUF_SZ];
 	ssize_t len;
-	int x86_64;
-	uint8_t cpumode;
+	bool x86_64;
 	int err = -1;
 
-	if (machine__kernel_ip(machine, ip))
-		cpumode = PERF_RECORD_MISC_KERNEL;
-	else
-		cpumode = PERF_RECORD_MISC_USER;
-
 	thread = machine__find_thread(machine, -1, btsq->tid);
 	if (!thread)
 		return -1;
 
-	if (!thread__find_map(thread, cpumode, ip, &al) || !al.map->dso)
-		goto out_put;
-
-	len = dso__data_read_addr(al.map->dso, al.map, machine, ip, buf,
-				  INTEL_PT_INSN_BUF_SZ);
+	len = fetch_exe(ip, thread, machine, (char*)buf, INTEL_PT_INSN_BUF_SZ, &x86_64);
 	if (len <= 0)
 		goto out_put;
 
-	/* Load maps to ensure dso->is_64_bit has been updated */
-	map__load(al.map);
-
-	x86_64 = al.map->dso->is_64_bit;
-
 	if (intel_pt_get_insn(buf, len, x86_64, &btsq->intel_pt_insn))
 		goto out_put;
 
-- 
2.20.1


  reply index

Thread overview: 36+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-03-05 14:47 Support sample context in perf report Andi Kleen
2019-03-05 14:47 ` Andi Kleen [this message]
2019-03-06 20:53   ` [PATCH v4 01/15] perf tools: Add utility function to fetch executable Arnaldo Carvalho de Melo
2019-03-06 21:08     ` Andi Kleen
2019-03-09 19:59   ` [tip:perf/urgent] perf thread: Generalize function to copy from thread addr space from intel-bts code tip-bot for Andi Kleen
2019-03-05 14:47 ` [PATCH v4 02/15] perf tools script: Support insn output for normal samples Andi Kleen
2019-03-08 13:37   ` Arnaldo Carvalho de Melo
2019-03-22 21:59   ` [tip:perf/urgent] perf " tip-bot for Andi Kleen
2019-03-05 14:47 ` [PATCH v4 03/15] perf tools script: Filter COMM/FORK/.. events by CPU Andi Kleen
2019-03-06 14:23   ` Adrian Hunter
2019-03-07 11:02     ` Jiri Olsa
2019-03-08 13:39       ` Arnaldo Carvalho de Melo
2019-03-08 15:08         ` Andi Kleen
2019-03-05 14:47 ` [PATCH v4 04/15] perf tools report: Support nano seconds Andi Kleen
2019-03-22 21:59   ` [tip:perf/urgent] perf report: Support output in nanoseconds tip-bot for Andi Kleen
2019-03-05 14:47 ` [PATCH v4 05/15] perf tools report: Parse time quantum Andi Kleen
2019-03-08 13:45   ` Arnaldo Carvalho de Melo
2019-03-08 13:52     ` Arnaldo Carvalho de Melo
2019-03-08 17:39       ` Andi Kleen
2019-03-22 22:01   ` [tip:perf/urgent] perf " tip-bot for Andi Kleen
2019-03-05 14:47 ` [PATCH v4 06/15] perf tools report: Support time sort key Andi Kleen
2019-03-05 14:47 ` [PATCH v4 07/15] perf tools report: Use less for scripts output Andi Kleen
2019-03-08 13:47   ` Arnaldo Carvalho de Melo
2019-03-09  7:52     ` Feng Tang
2019-03-05 14:47 ` [PATCH v4 08/15] perf tools report: Support running scripts for current time range Andi Kleen
2019-03-05 14:47 ` [PATCH v4 09/15] perf tools report: Support builtin perf script in scripts menu Andi Kleen
2019-03-05 14:47 ` [PATCH v4 10/15] perf tools: Add utility function to print ns time stamps Andi Kleen
2019-03-08 13:51   ` Arnaldo Carvalho de Melo
2019-03-22 22:00   ` [tip:perf/urgent] perf time-utils: Add utility function to print time stamps in nanoseconds tip-bot for Andi Kleen
2019-03-05 14:47 ` [PATCH v4 11/15] perf tools report: Implement browsing of individual samples Andi Kleen
2019-03-05 14:47 ` [PATCH v4 12/15] perf tools: Add some new tips describing the new options Andi Kleen
2019-03-05 14:47 ` [PATCH v4 13/15] perf tools report: Add custom scripts to script menu Andi Kleen
2019-03-05 14:47 ` [PATCH v4 14/15] perf tools script: Add array bound checking to list_scripts Andi Kleen
2019-03-05 14:47 ` [PATCH v4 15/15] perf tools ui: Fix ui popup browser for many entries Andi Kleen
2019-03-07 10:57 ` Support sample context in perf report Jiri Olsa
2019-03-07 16:57   ` Andi Kleen

Reply instructions:

You may reply publically 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=20190305144758.12397-2-andi@firstfloor.org \
    --to=andi@firstfloor.org \
    --cc=acme@kernel.org \
    --cc=ak@linux.intel.com \
    --cc=jolsa@kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-perf-users@vger.kernel.org \
    --cc=namhyung@kernel.org \
    /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

	# 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