Skip to contentSkip to conversation

perf record: mmap output file - v3

PATCH In review Jiri Olsa 2 participants 6 messages Nov 4, 2013 – Nov 7, 2013 perf events

lore
Share & tools
lore

Jiri Olsa

author
#0 lore raw

cover perf record: mmap output file - v3

hi,
after discussion with David, sending his change updated into the new data file object.

David's original post:
http://marc.info/?l=linux-kernel&m=138180575328977&w=2

Here's the change:
git://git.kernel.org/pub/scm/linux/kernel/git/jolsa/perf.git
perf/mmap1

thanks,
jirka

Cc Ingo Molnar <[email protected]>
Cc Frederic Weisbecker <[email protected]>
Cc Peter Zijlstra <[email protected]>
Cc Namhyung Kim <[email protected]>
Cc Mike Galbraith <[email protected]>
Cc Stephane Eranian <[email protected]>
Cc David Ahern <[email protected]>
Cc Adrian Hunter <[email protected]>

---
Jiri Olsa (2):
perf tools: Add perf_data__write implementation into perf_data_file object perf tools: Add perf_data_file__write mmap support

 tools/perf/builtin-record.c |  49 ++++++++++++++++++--------------------------
 tools/perf/util/data.c      | 116 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 tools/perf/util/data.h      |  23 ++++++++++++++-------
 3 files changed, 152 insertions(+), 36 deletions(-)
author
#1 lore raw

PATCH 1/2 perf tools: Add perf_data__write implementation into perf_data_file object

Adding perf_data__write implementation into perf_data_file object. This interface is now used within record command to store data.

Cc Ingo Molnar <[email protected]>
Cc Frederic Weisbecker <[email protected]>
Cc Peter Zijlstra <[email protected]>
Cc Namhyung Kim <[email protected]>
Cc Mike Galbraith <[email protected]>
Cc Stephane Eranian <[email protected]>
Cc David Ahern <[email protected]>
Cc Adrian Hunter <[email protected]>
---
 tools/perf/builtin-record.c | 38 ++++++++++++++------------------------
 tools/perf/util/data.c      | 20 ++++++++++++++++++++
 tools/perf/util/data.h      | 15 ++++++++-------
 3 files changed, 42 insertions(+), 31 deletions(-)
tools/perf/builtin-record.c +14 -24
index ab8d15e..5201677 100644
@@ -82,24 +82,17 @@ static void advance_output(struct perf_record *rec, size_t size)
 	rec->bytes_written += size;
 }
 
-static int write_output(struct perf_record *rec, void *buf, size_t size)
+static ssize_t perf_record__write(struct perf_record *rec,
+				  void *buf, size_t size)
 {
-	struct perf_data_file *file = &rec->file;
-
-	while (size) {
-		int ret = write(file->fd, buf, size);
-
-		if (ret < 0) {
-			pr_err("failed to write perf data, error: %m\n");
-			return -1;
-		}
-
-		size -= ret;
-		buf += ret;
+	struct perf_session *session = rec->session;
+	ssize_t ret;
 
-		rec->bytes_written += ret;
-	}
+	ret = perf_data_file__write(session->file, buf, size);
+	if (ret < 0)
+		return -1;
 
+	rec->bytes_written += ret;
 	return 0;
 }
 
@@ -109,10 +102,7 @@ static int process_synthesized_event(struct perf_tool *tool,
 				     struct machine *machine __maybe_unused)
 {
 	struct perf_record *rec = container_of(tool, struct perf_record, tool);
-	if (write_output(rec, event, event->header.size) < 0)
-		return -1;
-
-	return 0;
+	return perf_record__write(rec, event, event->header.size);
 }
 
 static int perf_record__mmap_read(struct perf_record *rec,
@@ -137,7 +127,7 @@ static int perf_record__mmap_read(struct perf_record *rec,
 		size = md->mask + 1 - (old & md->mask);
 		old += size;
 
-		if (write_output(rec, buf, size) < 0) {
+		if (perf_record__write(rec, buf, size) < 0) {
 			rc = -1;
 			goto out;
 		}
@@ -147,7 +137,7 @@ static int perf_record__mmap_read(struct perf_record *rec,
 	size = head - old;
 	old += size;
 
-	if (write_output(rec, buf, size) < 0) {
+	if (perf_record__write(rec, buf, size) < 0) {
 		rc = -1;
 		goto out;
 	}
@@ -322,8 +312,8 @@ static struct perf_event_header finished_round_event = {
 
 static int perf_record__mmap_read_all(struct perf_record *rec)
 {
-	int i;
-	int rc = 0;
+	struct perf_session *session = rec->session;
+	int i, rc = 0;
 
 	for (i = 0; i < rec->evlist->nr_mmaps; i++) {
 		if (rec->evlist->mmap[i].base) {
@@ -335,7 +325,7 @@ static int perf_record__mmap_read_all(struct perf_record *rec)
 	}
 
 	if (perf_header__has_feat(&rec->session->header, HEADER_TRACING_DATA))
-		rc = write_output(rec, &finished_round_event,
+		rc = perf_data_file__write(session->file, &finished_round_event,
 				  sizeof(finished_round_event));
 
 out:
tools/perf/util/data.c +20 -0
index 7d09faf..cce1256 100644
@@ -118,3 +118,23 @@ void perf_data_file__close(struct perf_data_file *file)
 {
 	close(file->fd);
 }
+
+ssize_t perf_data_file__write(struct perf_data_file *file,
+			      void *buf, size_t size)
+{
+	ssize_t total = size;
+
+	while (size) {
+		ssize_t ret = write(file->fd, buf, size);
+
+		if (ret < 0) {
+			pr_err("failed to write perf data, error: %m\n");
+			return -1;
+		}
+
+		size -= ret;
+		buf  += ret;
+	}
+
+	return total;
+}
tools/perf/util/data.h +8 -7
index 8c2df80..02c53dc 100644
@@ -9,12 +9,12 @@ enum perf_data_mode {
 };
 
 struct perf_data_file {
-	const char *path;
-	int fd;
-	bool is_pipe;
-	bool force;
-	unsigned long size;
-	enum perf_data_mode mode;
+	const char		*path;
+	int			 fd;
+	bool			 is_pipe;
+	bool			 force;
+	unsigned long		 size;
+	enum perf_data_mode	 mode;
 };
 
 static inline bool perf_data_file__is_read(struct perf_data_file *file)
@@ -44,5 +44,6 @@ static inline unsigned long perf_data_file__size(struct perf_data_file *file)
 
 int perf_data_file__open(struct perf_data_file *file);
 void perf_data_file__close(struct perf_data_file *file);
-
+ssize_t perf_data_file__write(struct perf_data_file *file,
+			      void *buf, size_t size);
 #endif /* __PERF_DATA_H */
Signature · 1 line
1.7.11.7
author
#2 lore raw

PATCH 2/2 perf tools: Add perf_data_file__write mmap support

In reply to Jiri Olsa

When recording raw_syscalls for the entire system, e.g.,
perf record -e raw_syscalls:*,sched:sched_switch -a -- sleep 10

you end up with a negative feedback loop as perf itself calls write() fairly often. This patch handles the problem by mmap'ing the file in chunks of 64M at a time and copies events from the event buffers to the file avoiding write system calls.

Before (with write syscall):

  # time ./perf.old record -e raw_syscalls:*,sched:sched_switch -a -- sleep 10
  [ perf record: Woken up 0 times to write data ]
  [ perf record: Captured and wrote 914.717 MB perf.data (~39964591 samples) ]
  real    0m11.390s
  user    0m2.029s
  sys     0m9.311s

After (using mmap):

  # time ./perf record -e raw_syscalls:*,sched:sched_switch -a -- sleep 10
  [ perf record: Woken up 74 times to write data ]
  [ perf record: Captured and wrote 19.231 MB perf.data (~840219 samples) ]
  real    0m10.182s
  user    0m0.067s
  sys     0m0.121s

In addition to perf-trace benefits using mmap lowers the overhead of perf-record.

v3: moved David's code into perf_data_file object, also used
most of his changelog

Cc Ingo Molnar <[email protected]>
Cc Frederic Weisbecker <[email protected]>
Cc Peter Zijlstra <[email protected]>
Cc Namhyung Kim <[email protected]>
Cc Mike Galbraith <[email protected]>
Cc Stephane Eranian <[email protected]>
Cc David Ahern <[email protected]>
Cc Adrian Hunter <[email protected]>
---
 tools/perf/builtin-record.c |  11 ++---
 tools/perf/util/data.c      | 100 +++++++++++++++++++++++++++++++++++++++++++-
 tools/perf/util/data.h      |   8 ++++
 3 files changed, 112 insertions(+), 7 deletions(-)
tools/perf/builtin-record.c +6 -5
index 5201677..45722fc 100644
@@ -240,12 +240,8 @@ out:
 
 static int process_buildids(struct perf_record *rec)
 {
-	struct perf_data_file *file  = &rec->file;
 	struct perf_session *session = rec->session;
-
-	u64 size = lseek(file->fd, 0, SEEK_CUR);
-	if (size == 0)
-		return 0;
+	u64 size = perf_data_file__size(&rec->file);
 
 	return __perf_session__process_events(session, rec->post_processing_offset,
 					      size - rec->post_processing_offset,
@@ -535,6 +531,11 @@ static int __cmd_record(struct perf_record *rec, int argc, const char **argv)
 	if (quiet || signr == SIGUSR1)
 		return 0;
 
+	if (perf_data_file__munmap(file)) {
+		pr_err("data file unmap failed\n");
+		goto out_delete_session;
+	}
+
 	fprintf(stderr, "[ perf record: Woken up %ld times to write data ]\n", waking);
 
 	/*
tools/perf/util/data.c +98 -2

125 lines not on this page · raw message

tools/perf/util/data.h +8 -0
index 02c53dc..de59ee0 100644
@@ -2,6 +2,7 @@
 #define __PERF_DATA_H
 
 #include <stdbool.h>
+#include "types.h"
 
 enum perf_data_mode {
 	PERF_DATA_MODE_WRITE,
@@ -15,6 +16,12 @@ struct perf_data_file {
 	bool			 force;
 	unsigned long		 size;
 	enum perf_data_mode	 mode;
+
+	/* for MMAP based file writes */
+	void			*mmap_addr;
+	u64			 mmap_off;
+	u64			 mmap_foff;
+	u64			 mmap_size;
 };
 
 static inline bool perf_data_file__is_read(struct perf_data_file *file)
@@ -46,4 +53,5 @@ int perf_data_file__open(struct perf_data_file *file);
 void perf_data_file__close(struct perf_data_file *file);
 ssize_t perf_data_file__write(struct perf_data_file *file,
 			      void *buf, size_t size);
+int perf_data_file__munmap(struct perf_data_file *file);
 #endif /* __PERF_DATA_H */
Signature · 1 line
1.7.11.7
#3 lore raw
In reply to Jiri Olsa
Quoted 11 lines · Jiri Olsa

hi,
after discussion with David, sending his change
updated into the new data file object.

David's original post:

   http://marc.info/?l=linux-kernel&m=138180575328977&w=2

Here's the change:
git://git.kernel.org/pub/scm/linux/kernel/git/jolsa/perf.git
perf/mmap1

Not having any luck with these patches. Basic use case:

perf trace record -a -- sleep 5
perf trace --summary

With your patches I get a parse error. With my latest versions everything works clean.

David

author
#4 lore raw
Quoted 13 lines · David Ahern
Quoted 11 lines · Jiri Olsa

hi,
after discussion with David, sending his change
updated into the new data file object.

David's original post:
http://marc.info/?l=linux-kernel&m=138180575328977&w=2

Here's the change:
git://git.kernel.org/pub/scm/linux/kernel/git/jolsa/perf.git
perf/mmap1

Quoted 7 lines

Not having any luck with these patches. Basic use case:

perf trace record -a -- sleep 5
perf trace --summary

With your patches I get a parse error. With my latest versions everything works clean.

hum,
perf trace --summary seems stuck in a loop, but that's no different from current acme's perf/core.

Anyway I'll postpone the change till your v3 goes in and go from there.

jirka

#5 lore raw
Quoted 19 lines · Jiri Olsa
Quoted 18 lines · David Ahern
Quoted 11 lines · Jiri Olsa

hi,
after discussion with David, sending his change
updated into the new data file object.

David's original post:

   http://marc.info/?l=linux-kernel&m=138180575328977&w=2

Here's the change:
git://git.kernel.org/pub/scm/linux/kernel/git/jolsa/perf.git
perf/mmap1

Not having any luck with these patches. Basic use case:

perf trace record -a -- sleep 5
perf trace --summary

Quoted 6 lines
Quoted 2 lines

With your patches I get a parse error. With my latest versions everything works clean.

hum,
perf trace --summary seems stuck in a loop, but that's no different from current acme's perf/core.

D'oh. When writing the email I was trying to keep the command line small and in the process removed the -i /tmp/perf.data from the second command. Without it perf-trace runs in live mode; with it events are read from a file.

David