linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Alexey Budankov <alexey.budankov@linux.intel.com>
To: Arnaldo Carvalho de Melo <acme@kernel.org>, Jiri Olsa <jolsa@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>,
	Alexander Shishkin <alexander.shishkin@linux.intel.com>,
	Andi Kleen <ak@linux.intel.com>,
	Adrian Hunter <adrian.hunter@intel.com>,
	Peter Zijlstra <peterz@infradead.org>,
	Ingo Molnar <mingo@redhat.com>,
	linux-kernel <linux-kernel@vger.kernel.org>
Subject: [PATCH v1 12/15] perf record: introduce thread local variable for trace streaming
Date: Mon, 12 Oct 2020 12:05:57 +0300	[thread overview]
Message-ID: <7a4821f7-5d31-c265-5cc9-5bf932c512d5@linux.intel.com> (raw)
In-Reply-To: <810f3a69-0004-9dff-a911-b7ff97220ae0@linux.intel.com>


Introduce thread local variable and use it for threaded trace streaming.

Signed-off-by: Alexey Budankov <alexey.budankov@linux.intel.com>
---
 tools/perf/builtin-record.c | 71 ++++++++++++++++++++++++++++++++-----
 1 file changed, 62 insertions(+), 9 deletions(-)

diff --git a/tools/perf/builtin-record.c b/tools/perf/builtin-record.c
index 89cb8e913fb3..3b7e9026f25b 100644
--- a/tools/perf/builtin-record.c
+++ b/tools/perf/builtin-record.c
@@ -101,6 +101,8 @@ struct thread_data {
 	u64		   bytes_written;
 };
 
+static __thread struct thread_data *thread;
+
 struct record {
 	struct perf_tool	tool;
 	struct record_opts	opts;
@@ -587,7 +589,11 @@ static int record__pushfn(struct mmap *map, void *to, void *bf, size_t size)
 		}
 	}
 
-	rec->samples++;
+	if (thread)
+		thread->samples++;
+	else
+		rec->samples++;
+
 	return record__write(rec, map, bf, compressed);
 }
 
@@ -1258,6 +1264,7 @@ static int record__mmap_read_evlist(struct record *rec, struct evlist *evlist,
 	int i;
 	int rc = 0;
 	struct mmap *maps;
+	int nr_mmaps;
 	int trace_fd = rec->data.file.fd;
 	off_t off = 0;
 
@@ -1265,6 +1272,14 @@ static int record__mmap_read_evlist(struct record *rec, struct evlist *evlist,
 		return 0;
 
 	maps = overwrite ? evlist->overwrite_mmap : evlist->mmap;
+	nr_mmaps = evlist->core.nr_mmaps;
+
+	if (thread) {
+		bytes_written = thread->bytes_written;
+		maps = thread->maps;
+		nr_mmaps = thread->nr_mmaps;
+	}
+
 	if (!maps)
 		return 0;
 
@@ -1274,7 +1289,7 @@ static int record__mmap_read_evlist(struct record *rec, struct evlist *evlist,
 	if (record__aio_enabled(rec))
 		off = record__aio_get_pos(trace_fd);
 
-	for (i = 0; i < evlist->core.nr_mmaps; i++) {
+	for (i = 0; i < nr_mmaps; i++) {
 		u64 flush = 0;
 		struct mmap *map = &maps[i];
 
@@ -1323,7 +1338,7 @@ static int record__mmap_read_evlist(struct record *rec, struct evlist *evlist,
 	 * because per-cpu maps and files have data
 	 * sorted by kernel.
 	 */
-	if (!record__threads_enabled(rec) && bytes_written != rec->bytes_written)
+	if (!thread && bytes_written != rec->bytes_written)
 		rc = record__write(rec, NULL, &finished_round_event, sizeof(finished_round_event));
 
 	if (overwrite)
@@ -1343,6 +1358,15 @@ static int record__mmap_read_all(struct record *rec, bool synch)
 	return record__mmap_read_evlist(rec, rec->evlist, true, synch);
 }
 
+static void record__thread_munmap_filtered(struct fdarray *fda, int fd,
+					   void *arg __maybe_unused)
+{
+	struct perf_mmap *map = fda->priv[fd].ptr;
+
+	if (map)
+		perf_mmap__put(map);
+}
+
 static void record__init_features(struct record *rec)
 {
 	struct perf_session *session = rec->session;
@@ -2020,7 +2044,12 @@ static int __cmd_record(struct record *rec, int argc, const char **argv)
 	trigger_ready(&switch_output_trigger);
 	perf_hooks__invoke_record_start();
 	for (;;) {
-		unsigned long long hits = rec->samples;
+		unsigned long long hits0, hits1;
+
+		if (thread)
+			hits0 = thread->samples;
+		else
+			hits0 = rec->samples;
 
 		/*
 		 * rec->evlist->bkw_mmap_state is possible to be
@@ -2089,20 +2118,44 @@ static int __cmd_record(struct record *rec, int argc, const char **argv)
 				alarm(rec->switch_output.time);
 		}
 
-		if (hits == rec->samples) {
+		if (thread)
+			hits1 = thread->samples;
+		else
+			hits1 = rec->samples;
+
+		if (hits0 == hits1) {
 			if (done || draining)
 				break;
-			err = evlist__poll(rec->evlist, -1);
+
+			if (thread)
+				err = fdarray__poll(&thread->pollfd, -1);
+			else
+				err = evlist__poll(rec->evlist, -1);
 			/*
 			 * Propagate error, only if there's any. Ignore positive
 			 * number of returned events and interrupt error.
 			 */
 			if (err > 0 || (err < 0 && errno == EINTR))
 				err = 0;
-			waking++;
 
-			if (evlist__filter_pollfd(rec->evlist, POLLERR | POLLHUP) == 0)
-				draining = true;
+			if (thread) {
+				thread->waking++;
+				if (thread->ctlfd_pos != -1) {
+					evlist__ctlfd_update(rec->evlist,
+						&(thread->pollfd.entries[thread->ctlfd_pos]));
+				}
+			} else {
+				waking++;
+			}
+
+			if (thread) {
+				if (fdarray__filter(&thread->pollfd, POLLERR | POLLHUP,
+						    record__thread_munmap_filtered, NULL) == 0)
+					draining = true;
+			} else {
+				if (evlist__filter_pollfd(rec->evlist, POLLERR | POLLHUP) == 0)
+					draining = true;
+			}
 		}
 
 		if (evlist__ctlfd_process(rec->evlist, &cmd) > 0) {
-- 
2.24.1



  parent reply	other threads:[~2020-10-12  9:06 UTC|newest]

Thread overview: 45+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-10-12  8:50 [PATCH v1 00/15] Introduce threaded trace streaming for basic perf record operation Alexey Budankov
2020-10-12  8:53 ` [PATCH v1 01/15] perf session: introduce trace file path to be shown in raw trace dump Alexey Budankov
2020-10-12  8:54 ` [PATCH v1 02/15] perf report: output trace file name " Alexey Budankov
2020-10-12 16:01   ` Andi Kleen
2020-10-12 17:06     ` Alexey Budankov
2020-10-20 16:31       ` Alexey Budankov
2020-10-20 17:10         ` Alexey Budankov
2020-10-20 20:29           ` Andi Kleen
2020-10-13 19:54   ` Jiri Olsa
2020-10-13 21:23     ` Alexey Budankov
2020-10-12  8:55 ` [PATCH v1 03/15] perf data: open data directory in read access mode Alexey Budankov
2020-10-12 16:03   ` Andi Kleen
2020-10-12 16:52     ` Alexey Budankov
2020-10-13 16:22       ` Arnaldo Carvalho de Melo
2020-10-14 10:39         ` Alexey Budankov
2020-10-12  8:56 ` [PATCH v1 04/15] perf session: move reader object definition to header file Alexey Budankov
2020-10-12  8:57 ` [PATCH v1 05/15] perf session: introduce decompressor into trace reader object Alexey Budankov
2020-10-12 16:05   ` Andi Kleen
2020-10-12 16:50     ` Alexey Budankov
2020-10-12  8:58 ` [PATCH v1 06/15] perf session: load data directory into tool process memory Alexey Budankov
2020-10-12 16:09   ` Andi Kleen
2020-10-12 16:49     ` Alexey Budankov
2020-10-13 11:30       ` Alexey Budankov
2020-10-21  6:54         ` Namhyung Kim
2020-10-21 10:25           ` Alexey Budankov
2020-10-21 10:57             ` Namhyung Kim
2020-10-21 13:01               ` Alexey Budankov
2020-10-12  8:59 ` [PATCH v1 07/15] perf record: introduce trace file, compressor and stats in mmap object Alexey Budankov
2020-10-12  9:01 ` [PATCH v1 08/15] perf record: write trace data into mmap trace files Alexey Budankov
2020-10-14 10:52   ` Namhyung Kim
2020-10-14 12:09     ` Alexey Budankov
2020-10-21  7:34       ` Namhyung Kim
2020-10-21 10:24         ` Alexey Budankov
2020-10-21 10:51           ` Namhyung Kim
2020-10-12  9:02 ` [PATCH v1 09/15] perf record: introduce thread specific objects for trace streaming Alexey Budankov
2020-10-12  9:03 ` [PATCH v1 10/15] perf record: manage thread specific data array Alexey Budankov
2020-10-12  9:05 ` [PATCH v1 11/15] perf evlist: introduce evlist__ctlfd_update() to update ctl fd status Alexey Budankov
2020-10-12  9:05 ` Alexey Budankov [this message]
2020-10-12  9:10 ` [PATCH v1 13/15] perf record: stop threads in the end of trace streaming Alexey Budankov
2020-10-12  9:11 ` [PATCH v1 14/15] perf record: start threads in the beginning " Alexey Budankov
2020-10-12  9:13 ` [PATCH v1 15/15] perf record: introduce --threads command line option Alexey Budankov
2020-10-13 16:20 ` [PATCH v1 00/15] Introduce threaded trace streaming for basic perf record operation Arnaldo Carvalho de Melo
2020-10-14 12:15   ` Alexey Budankov
2020-10-14 17:27 ` Ingo Molnar
2020-10-15 10:35   ` Alexey Budankov

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=7a4821f7-5d31-c265-5cc9-5bf932c512d5@linux.intel.com \
    --to=alexey.budankov@linux.intel.com \
    --cc=acme@kernel.org \
    --cc=adrian.hunter@intel.com \
    --cc=ak@linux.intel.com \
    --cc=alexander.shishkin@linux.intel.com \
    --cc=jolsa@redhat.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mingo@redhat.com \
    --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;
as well as URLs for NNTP newsgroup(s).