mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Jiri Olsa <jolsa@redhat.com>
To: linux-kernel@vger.kernel.org
Cc: Jiri Olsa <jolsa@redhat.com>, Ingo Molnar <mingo@kernel.org>,
	Frederic Weisbecker <fweisbec@gmail.com>,
	Peter Zijlstra <peterz@infradead.org>,
	Namhyung Kim <namhyung@kernel.org>,
	Mike Galbraith <efault@gmx.de>,
	Stephane Eranian <eranian@google.com>,
	David Ahern <dsahern@gmail.com>,
	Adrian Hunter <adrian.hunter@intel.com>
Subject: [PATCH 2/2] perf tools: Add perf_data_file__write mmap support
Date: Mon,  4 Nov 2013 19:31:45 +0100	[thread overview]
Message-ID: <1383589905-10208-3-git-send-email-jolsa@redhat.com> (raw)
In-Reply-To: <1383589905-10208-1-git-send-email-jolsa@redhat.com>

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

Original-patch-by: David Ahern <dsahern@gmail.com>
Signed-off-by: Jiri Olsa <jolsa@redhat.com>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Stephane Eranian <eranian@google.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Adrian Hunter <adrian.hunter@intel.com>
---
 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(-)

diff --git a/tools/perf/builtin-record.c b/tools/perf/builtin-record.c
index 5201677..45722fc 100644
--- a/tools/perf/builtin-record.c
+++ b/tools/perf/builtin-record.c
@@ -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);
 
 	/*
diff --git a/tools/perf/util/data.c b/tools/perf/util/data.c
index cce1256..af5d644 100644
--- a/tools/perf/util/data.c
+++ b/tools/perf/util/data.c
@@ -4,10 +4,13 @@
 #include <sys/stat.h>
 #include <unistd.h>
 #include <string.h>
+#include <sys/mman.h>
 
 #include "data.h"
 #include "util.h"
 
+#define MMAP_WRITE_SIZE   (64*1024*1024)
+
 static bool check_pipe(struct perf_data_file *file)
 {
 	struct stat st;
@@ -111,6 +114,9 @@ int perf_data_file__open(struct perf_data_file *file)
 	if (!file->path)
 		file->path = "perf.data";
 
+	if (!file->mmap_size)
+		file->mmap_size = MMAP_WRITE_SIZE;
+
 	return open_file(file);
 }
 
@@ -119,8 +125,70 @@ 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)
+static int do_mmap(struct perf_data_file *file, u64 offset)
+{
+	u64 mmap_size = file->mmap_size;
+
+	file->mmap_off  = offset % mmap_size;
+	file->mmap_foff = (offset / mmap_size) * mmap_size;
+
+	file->mmap_addr = mmap(NULL, mmap_size,
+			       PROT_WRITE | PROT_READ,
+			       MAP_SHARED,
+			       file->fd,
+			       file->mmap_foff);
+
+	if (file->mmap_addr == MAP_FAILED) {
+		pr_err("mmap failed: %d: %s\n", errno, strerror(errno));
+		return -1;
+	}
+
+	/* Expand file to include this mmap segment. */
+	if (ftruncate(file->fd, file->mmap_foff + file->mmap_size) != 0) {
+		pr_err("ftruncate failed: %d: %s\n", errno, strerror(errno));
+		return -1;
+	}
+
+	return 0;
+}
+
+static ssize_t write_mmap(struct perf_data_file *file,
+			  void *buf, size_t size)
+{
+	ssize_t total = size;
+
+	if (!file->mmap_addr) {
+		off_t offset = lseek(file->fd, 0, SEEK_CUR);
+		if (offset < 0)
+			return -1;
+
+		if (do_mmap(file, offset))
+			return -1;
+	}
+
+	while (size) {
+		u64 remain = file->mmap_size - file->mmap_off;
+
+		if (size > remain) {
+			memcpy(file->mmap_addr + file->mmap_off, buf, remain);
+			size -= remain;
+			buf  += remain;
+
+			munmap(file->mmap_addr, file->mmap_size);
+			if (do_mmap(file, file->mmap_foff + file->mmap_size))
+				return -1;
+		} else {
+			memcpy(file->mmap_addr + file->mmap_off, buf, size);
+			file->mmap_off += size;
+			size = 0;
+		}
+	}
+
+	return total;
+}
+
+static ssize_t write_raw(struct perf_data_file *file,
+			 void *buf, size_t size)
 {
 	ssize_t total = size;
 
@@ -138,3 +206,31 @@ ssize_t perf_data_file__write(struct perf_data_file *file,
 
 	return total;
 }
+
+ssize_t perf_data_file__write(struct perf_data_file *file,
+			      void *buf, size_t size)
+{
+	return file->is_pipe ? write_raw(file, buf, size) :
+			       write_mmap(file, buf, size);
+}
+
+int perf_data_file__munmap(struct perf_data_file *file)
+{
+	if (file->mmap_addr) {
+		int ret;
+
+		munmap(file->mmap_addr, file->mmap_size);
+
+		file->mmap_addr = NULL;
+		file->size = file->mmap_foff + file->mmap_off;
+
+		ret = ftruncate(file->fd, file->size);
+		if (ret)
+			pr_err("ftruncate failed: %d: %s\n", errno,
+			       strerror(errno));
+
+		return ret;
+	}
+
+	return 0;
+}
diff --git a/tools/perf/util/data.h b/tools/perf/util/data.h
index 02c53dc..de59ee0 100644
--- a/tools/perf/util/data.h
+++ b/tools/perf/util/data.h
@@ -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 */
-- 
1.7.11.7


  parent reply	other threads:[~2013-11-04 18:32 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-11-04 18:31 [PATCH 0/2] perf record: mmap output file - v3 Jiri Olsa
2013-11-04 18:31 ` [PATCH 1/2] perf tools: Add perf_data__write implementation into perf_data_file object Jiri Olsa
2013-11-04 18:31 ` Jiri Olsa [this message]
2013-11-06 17:51 ` [PATCH 0/2] perf record: mmap output file - v3 David Ahern
2013-11-07 10:06   ` Jiri Olsa
2013-11-07 14:32     ` David Ahern

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=1383589905-10208-3-git-send-email-jolsa@redhat.com \
    --to=jolsa@redhat.com \
    --cc=adrian.hunter@intel.com \
    --cc=dsahern@gmail.com \
    --cc=efault@gmx.de \
    --cc=eranian@google.com \
    --cc=fweisbec@gmail.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mingo@kernel.org \
    --cc=namhyung@kernel.org \
    --cc=peterz@infradead.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
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®