mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Wang Nan <wangnan0@huawei.com>
To: Alexei Starovoitov <ast@kernel.org>,
	Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Brendan Gregg <brendan.d.gregg@gmail.com>,
	Daniel Borkmann <daniel@iogearbox.net>,
	"David S. Miller" <davem@davemloft.net>,
	He Kuang <hekuang@huawei.com>, Jiri Olsa <jolsa@kernel.org>,
	Li Zefan <lizefan@huawei.com>,
	Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>,
	Namhyung Kim <namhyung@kernel.org>,
	Peter Zijlstra <peterz@infradead.org>, <pi3orama@163.com>,
	Will Deacon <will.deacon@arm.com>, <linux-kernel@vger.kernel.org>,
	Wang Nan <wangnan0@huawei.com>
Subject: [PATCH 50/54] perf record: Toggle overwrite ring buffer for reading
Date: Mon, 25 Jan 2016 09:56:37 +0000	[thread overview]
Message-ID: <1453715801-7732-51-git-send-email-wangnan0@huawei.com> (raw)
In-Reply-To: <1453715801-7732-1-git-send-email-wangnan0@huawei.com>

Reading from a overwrite ring buffer is unrelible. perf_evsel__pause()
should be called before reading from them.

Toggel overwrite_evt_paused director after receiving done or switch
output.

Signed-off-by: Wang Nan <wangnan0@huawei.com>
Signed-off-by: He Kuang <hekuang@huawei.com>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Zefan Li <lizefan@huawei.com>
Cc: pi3orama@163.com
---
 tools/perf/builtin-record.c | 77 +++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 77 insertions(+)

diff --git a/tools/perf/builtin-record.c b/tools/perf/builtin-record.c
index 09aa4ee..69f089f 100644
--- a/tools/perf/builtin-record.c
+++ b/tools/perf/builtin-record.c
@@ -39,6 +39,11 @@
 #include <sys/mman.h>
 #include <asm/bug.h>
 
+enum overwrite_evt_state {
+	OVERWRITE_EVT_RUNNING,
+	OVERWRITE_EVT_DATA_PENDING,
+	OVERWRITE_EVT_EMPTY,
+};
 
 struct record {
 	struct perf_tool	tool;
@@ -57,6 +62,7 @@ struct record {
 	bool			buildid_all;
 	bool			timestamp_filename;
 	bool			switch_output;
+	enum overwrite_evt_state overwrite_evt_state;
 	unsigned long long	samples;
 };
 
@@ -388,6 +394,7 @@ try_again:
 
 	session->evlist = evlist;
 	perf_session__set_id_hdr_size(session);
+	rec->overwrite_evt_state = OVERWRITE_EVT_RUNNING;
 out:
 	return rc;
 }
@@ -468,6 +475,50 @@ static struct perf_event_header finished_round_event = {
 	.type = PERF_RECORD_FINISHED_ROUND,
 };
 
+static void
+record__toggle_overwrite_evsels(struct record *rec,
+				enum overwrite_evt_state state)
+{
+	struct perf_evsel *pos;
+	struct perf_evlist *evlist = rec->evlist;
+	enum overwrite_evt_state old_state = rec->overwrite_evt_state;
+	enum action {
+		NONE,
+		PAUSE,
+		RESUME,
+	} action = NONE;
+
+	switch (old_state) {
+	case OVERWRITE_EVT_RUNNING:
+		if (state != OVERWRITE_EVT_RUNNING)
+			action = PAUSE;
+		break;
+	case OVERWRITE_EVT_DATA_PENDING:
+		if (state == OVERWRITE_EVT_RUNNING)
+			action = RESUME;
+		break;
+	case OVERWRITE_EVT_EMPTY:
+		if (state == OVERWRITE_EVT_RUNNING)
+			action = RESUME;
+		if (state == OVERWRITE_EVT_DATA_PENDING)
+			state = OVERWRITE_EVT_EMPTY;
+		break;
+	default:
+		WARN_ONCE(1, "Shouldn't get there\n");
+	}
+
+	rec->overwrite_evt_state = state;
+
+	if (action == NONE)
+		return;
+
+	evlist__for_each(evlist, pos) {
+		if (!pos->overwrite)
+			continue;
+		perf_evsel__pause(pos, action == PAUSE);
+	}
+}
+
 static bool record__mmap_should_read(struct record *rec, int idx)
 {
 	int channel = -1;
@@ -512,6 +563,8 @@ static int record__mmap_read_all(struct record *rec)
 	if (bytes_written != rec->bytes_written)
 		rc = record__write(rec, &finished_round_event, sizeof(finished_round_event));
 
+	if (rec->overwrite_evt_state == OVERWRITE_EVT_DATA_PENDING)
+		record__toggle_overwrite_evsels(rec, OVERWRITE_EVT_EMPTY);
 out:
 	return rc;
 }
@@ -870,6 +923,17 @@ static int __cmd_record(struct record *rec, int argc, const char **argv)
 	for (;;) {
 		unsigned long long hits = rec->samples;
 
+		/*
+		 * rec->overwrite_evt_state is possible to be
+		 * OVERWRITE_EVT_EMPTY here: when done == true and
+		 * hits != rec->samples after previous reading.
+		 *
+		 * record__toggle_overwrite_evsels ensure we never
+		 * convert OVERWRITE_EVT_EMPTY to OVERWRITE_EVT_DATA_PENDING.
+		 */
+		if (switch_output_started || done || draining)
+			record__toggle_overwrite_evsels(rec, OVERWRITE_EVT_DATA_PENDING);
+
 		if (record__mmap_read_all(rec) < 0) {
 			auxtrace_snapshot_disable();
 			err = -1;
@@ -888,7 +952,20 @@ static int __cmd_record(struct record *rec, int argc, const char **argv)
 		}
 
 		if (switch_output_started) {
+			/*
+			 * SIGUSR2 raise after or during record__mmap_read_all().
+			 * continue to read again.
+			 */
+			if (rec->overwrite_evt_state == OVERWRITE_EVT_RUNNING)
+				continue;
+
 			switch_output_started = 0;
+			/*
+			 * Reenable events in overwrite ring buffer after
+			 * record__mmap_read_all(): we should have collected
+			 * data from it.
+			 */
+			record__toggle_overwrite_evsels(rec, OVERWRITE_EVT_RUNNING);
 
 			if (!quiet)
 				fprintf(stderr, "[ perf record: dump data: Woken up %ld times ]\n",
-- 
1.8.3.4

  parent reply	other threads:[~2016-01-25 10:02 UTC|newest]

Thread overview: 80+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-01-25  9:55 [GIT PULL 00/54] perf tools: Bugfix, BPF improvements and overwrite ring buffer support Wang Nan
2016-01-25  9:55 ` [PATCH 01/54] perf test: Add libbpf relocation checker Wang Nan
2016-01-26 14:58   ` Arnaldo Carvalho de Melo
2016-01-26 15:07     ` Arnaldo Carvalho de Melo
2016-02-03 10:13   ` [tip:perf/core] " tip-bot for Wang Nan
2016-01-25  9:55 ` [PATCH 02/54] perf bpf: Check relocation target section Wang Nan
2016-02-03 10:14   ` [tip:perf/core] " tip-bot for Wang Nan
2016-01-25  9:55 ` [PATCH 03/54] tools build: Allow subprojects select all feature checkers Wang Nan
2016-02-03 10:14   ` [tip:perf/core] " tip-bot for Wang Nan
2016-01-25  9:55 ` [PATCH 04/54] perf build: Select all feature checkers for feature-dump Wang Nan
2016-02-03 10:14   ` [tip:perf/core] " tip-bot for Wang Nan
2016-01-25  9:55 ` [PATCH 05/54] perf build: Use feature dump file for build-test Wang Nan
2016-01-26 16:59   ` Arnaldo Carvalho de Melo
2016-01-27  2:36     ` Wangnan (F)
2016-01-27 13:54       ` Arnaldo Carvalho de Melo
2016-01-27 11:22     ` [PATCH] tools build: Check basic headers for test-compile feature checker Wang Nan
2016-01-27 13:23       ` Jiri Olsa
2016-01-27 13:55         ` Arnaldo Carvalho de Melo
2016-02-03 10:15       ` [tip:perf/core] " tip-bot for Wang Nan
2016-01-25  9:55 ` [PATCH 06/54] perf test: Check environment before start real BPF test Wang Nan
2016-02-03 10:18   ` [tip:perf/core] " tip-bot for Wang Nan
2016-01-25  9:55 ` [PATCH 07/54] perf tools: Fix symbols searching for offline module in buildid-cache Wang Nan
2016-01-25  9:55 ` [PATCH 08/54] perf test: Improve bp_signal Wang Nan
2016-02-03 10:18   ` [tip:perf/core] " tip-bot for Wang Nan
2016-01-25  9:55 ` [PATCH 09/54] perf tools: Add API to config maps in bpf object Wang Nan
2016-02-03 23:29   ` Arnaldo Carvalho de Melo
2016-02-04 12:59     ` Wangnan (F)
2016-01-25  9:55 ` [PATCH 10/54] perf tools: Enable BPF object configure syntax Wang Nan
2016-01-25  9:55 ` [PATCH 11/54] perf record: Apply config to BPF objects before recording Wang Nan
2016-01-25  9:55 ` [PATCH 12/54] perf tools: Enable passing event to BPF object Wang Nan
2016-01-25  9:56 ` [PATCH 13/54] perf tools: Support perf event alias name Wang Nan
2016-02-03 23:35   ` Arnaldo Carvalho de Melo
2016-01-25  9:56 ` [PATCH 14/54] perf tools: Support setting different slots in a BPF map separately Wang Nan
2016-01-25  9:56 ` [PATCH 15/54] perf tools: Enable indices setting syntax for BPF maps Wang Nan
2016-01-25  9:56 ` [PATCH 16/54] perf tools: Introduce bpf-output event Wang Nan
2016-01-25  9:56 ` [PATCH 17/54] perf data: Support converting data from bpf_perf_event_output() Wang Nan
2016-01-25  9:56 ` [PATCH 18/54] perf core: Introduce new ioctl options to pause and resume ring buffer Wang Nan
2016-01-25  9:56 ` [PATCH 19/54] perf core: Set event's default overflow_handler Wang Nan
2016-01-25  9:56 ` [PATCH 20/54] perf core: Prepare writing into ring buffer from end Wang Nan
2016-01-25  9:56 ` [PATCH 21/54] perf core: Add backward attribute to perf event Wang Nan
2016-01-25  9:56 ` [PATCH 22/54] perf core: Reduce perf event output overhead by new overflow handler Wang Nan
2016-01-25  9:56 ` [PATCH 23/54] perf tools: Introduce API to pause ring buffer Wang Nan
2016-01-25  9:56 ` [PATCH 24/54] perf tools: Only validate is_pos for tracking evsels Wang Nan
2016-01-25  9:56 ` [PATCH 25/54] perf tools: Print write_backward value in perf_event_attr__fprintf Wang Nan
2016-01-25  9:56 ` [PATCH 26/54] perf tools: Move timestamp creation to util Wang Nan
2016-02-03 10:18   ` [tip:perf/core] " tip-bot for Wang Nan
2016-01-25  9:56 ` [PATCH 27/54] perf tools: Make ordered_events reusable Wang Nan
2016-01-25  9:56 ` [PATCH 28/54] perf record: Extract synthesize code to record__synthesize() Wang Nan
2016-01-29 20:37   ` Arnaldo Carvalho de Melo
2016-01-25  9:56 ` [PATCH 29/54] perf tools: Add perf_data_file__switch() helper Wang Nan
2016-01-25  9:56 ` [PATCH 30/54] perf record: Turns auxtrace_snapshot_enable into 3 states Wang Nan
2016-01-25  9:56 ` [PATCH 31/54] perf record: Introduce record__finish_output() to finish a perf.data Wang Nan
2016-01-25  9:56 ` [PATCH 32/54] perf record: Use OPT_BOOLEAN_SET for buildid cache related options Wang Nan
2016-02-03 10:19   ` [tip:perf/core] " tip-bot for Wang Nan
2016-01-25  9:56 ` [PATCH 33/54] perf record: Add '--timestamp-filename' option to append timestamp to output filename Wang Nan
2016-01-25  9:56 ` [PATCH 34/54] perf record: Split output into multiple files via '--switch-output' Wang Nan
2016-01-25  9:56 ` [PATCH 35/54] perf record: Force enable --timestamp-filename when --switch-output is provided Wang Nan
2016-01-25  9:56 ` [PATCH 36/54] perf record: Disable buildid cache options by default in switch output mode Wang Nan
2016-01-25  9:56 ` [PATCH 37/54] perf record: Re-synthesize tracking events after output switching Wang Nan
2016-01-25  9:56 ` [PATCH 38/54] perf record: Generate tracking events for process forked by perf Wang Nan
2016-01-25  9:56 ` [PATCH 39/54] perf record: Ensure return non-zero rc when mmap fail Wang Nan
2016-01-25  9:56 ` [PATCH 40/54] perf record: Prevent reading invalid data in record__mmap_read Wang Nan
2016-01-25  9:56 ` [PATCH 41/54] perf tools: Add evlist channel helpers Wang Nan
2016-01-25  9:56 ` [PATCH 42/54] perf tools: Automatically add new channel according to evlist Wang Nan
2016-01-25  9:56 ` [PATCH 43/54] perf tools: Operate multiple channels Wang Nan
2016-01-25  9:56 ` [PATCH 44/54] perf tools: Squash overwrite setting into channel Wang Nan
2016-01-25  9:56 ` [PATCH 45/54] perf record: Don't read from and poll overwrite channel Wang Nan
2016-01-25  9:56 ` [PATCH 46/54] perf record: Don't poll on " Wang Nan
2016-01-25  9:56 ` [PATCH 47/54] perf tools: Detect avalibility of write_backward Wang Nan
2016-01-25  9:56 ` [PATCH 48/54] perf tools: Enable overwrite settings Wang Nan
2016-01-25  9:56 ` [PATCH 49/54] perf tools: Set write_backward attribut bit for overwrite events Wang Nan
2016-01-25  9:56 ` Wang Nan [this message]
2016-01-26  8:25   ` [PATCH 50/54] perf record: Toggle overwrite ring buffer for reading Wangnan (F)
2016-01-25  9:56 ` [PATCH 51/54] perf record: Rename variable to make code clear Wang Nan
2016-01-25  9:56 ` [PATCH 52/54] perf record: Read from backward ring buffer Wang Nan
2016-01-25  9:56 ` [PATCH 53/54] perf record: Allow generate tracking events at the end of output Wang Nan
2016-01-25  9:56 ` [PATCH 54/54] perf tools: Don't warn about out of order event if write_backward is used Wang Nan
2016-01-26  9:11 ` [offlist] Re: [GIT PULL 00/54] perf tools: Bugfix, BPF improvements and overwrite ring buffer support Wangnan (F)
2016-01-26 14:11   ` Arnaldo Carvalho de Melo
2016-02-05 14:01 [PATCH " Wang Nan
2016-02-05 14:02 ` [PATCH 50/54] perf record: Toggle overwrite ring buffer for reading Wang Nan

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=1453715801-7732-51-git-send-email-wangnan0@huawei.com \
    --to=wangnan0@huawei.com \
    --cc=acme@redhat.com \
    --cc=ast@kernel.org \
    --cc=brendan.d.gregg@gmail.com \
    --cc=daniel@iogearbox.net \
    --cc=davem@davemloft.net \
    --cc=hekuang@huawei.com \
    --cc=jolsa@kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=lizefan@huawei.com \
    --cc=masami.hiramatsu.pt@hitachi.com \
    --cc=namhyung@kernel.org \
    --cc=peterz@infradead.org \
    --cc=pi3orama@163.com \
    --cc=will.deacon@arm.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
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®