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 07/15] perf record: introduce trace file, compressor and stats in mmap object
Date: Mon, 12 Oct 2020 11:59:51 +0300 [thread overview]
Message-ID: <781092bf-8b1d-9d01-367b-b83d88bccf7b@linux.intel.com> (raw)
In-Reply-To: <810f3a69-0004-9dff-a911-b7ff97220ae0@linux.intel.com>
Introduce trace file and compressor objects into mmap object so
they could be used to process and store data stream from the
corresponding kernel data buffer. Introduce bytes_transferred
and bytes_compressed stats so they would capture statistics for
the related data buffer transfers. Make use of the introduced
per mmap file, compressor and stats when they are initialized
and available.
Signed-off-by: Alexey Budankov <alexey.budankov@linux.intel.com>
---
tools/perf/builtin-record.c | 47 +++++++++++++++++++++++++++----------
tools/perf/util/mmap.c | 6 +++++
tools/perf/util/mmap.h | 5 ++++
3 files changed, 46 insertions(+), 12 deletions(-)
diff --git a/tools/perf/builtin-record.c b/tools/perf/builtin-record.c
index adf311d15d3d..619aaee11231 100644
--- a/tools/perf/builtin-record.c
+++ b/tools/perf/builtin-record.c
@@ -150,11 +150,17 @@ static int record__write(struct record *rec, struct mmap *map __maybe_unused,
{
struct perf_data_file *file = &rec->session->data->file;
+ if (map && map->file)
+ file = map->file;
+
if (perf_data_file__write(file, bf, size) < 0) {
pr_err("failed to write perf data, error: %m\n");
return -1;
}
+ if (file != &rec->session->data->file)
+ return 0;
+
rec->bytes_written += size;
if (record__output_max_size_exceeded(rec) && !done) {
@@ -172,8 +178,8 @@ static int record__write(struct record *rec, struct mmap *map __maybe_unused,
static int record__aio_enabled(struct record *rec);
static int record__comp_enabled(struct record *rec);
-static size_t zstd_compress(struct perf_session *session, void *dst, size_t dst_size,
- void *src, size_t src_size);
+static size_t zstd_compress(struct zstd_data *data,
+ void *dst, size_t dst_size, void *src, size_t src_size);
#ifdef HAVE_AIO_SUPPORT
static int record__aio_write(struct aiocb *cblock, int trace_fd,
@@ -291,6 +297,7 @@ struct record_aio {
static int record__aio_pushfn(struct mmap *map, void *to, void *buf, size_t size)
{
struct record_aio *aio = to;
+ size_t compressed = size;
/*
* map->core.base data pointed by buf is copied into free map->aio.data[] buffer
@@ -307,9 +314,14 @@ static int record__aio_pushfn(struct mmap *map, void *to, void *buf, size_t size
*/
if (record__comp_enabled(aio->rec)) {
- size = zstd_compress(aio->rec->session, aio->data + aio->size,
- mmap__mmap_len(map) - aio->size,
+ struct zstd_data *zstd_data = &(aio->rec->session->zstd_data);
+
+ compressed = zstd_compress(zstd_data,
+ aio->data + aio->size, mmap__mmap_len(map) - aio->size,
buf, size);
+
+ aio->rec->session->bytes_transferred += size;
+ aio->rec->session->bytes_compressed += compressed;
} else {
memcpy(aio->data + aio->size, buf, size);
}
@@ -328,7 +340,7 @@ static int record__aio_pushfn(struct mmap *map, void *to, void *buf, size_t size
perf_mmap__get(&map->core);
}
- aio->size += size;
+ aio->size += compressed;
return size;
}
@@ -532,14 +544,28 @@ static int process_locked_synthesized_event(struct perf_tool *tool,
static int record__pushfn(struct mmap *map, void *to, void *bf, size_t size)
{
struct record *rec = to;
+ size_t compressed = size;
if (record__comp_enabled(rec)) {
- size = zstd_compress(rec->session, map->data, mmap__mmap_len(map), bf, size);
+ struct zstd_data *zstd_data = &rec->session->zstd_data;
+
+ if (map->file)
+ zstd_data = &map->zstd_data;
+
+ compressed = zstd_compress(zstd_data, map->data, mmap__mmap_len(map), bf, size);
bf = map->data;
+
+ if (map->file) {
+ map->bytes_transferred += size;
+ map->bytes_compressed += compressed;
+ } else {
+ rec->session->bytes_transferred += size;
+ rec->session->bytes_compressed += compressed;
+ }
}
rec->samples++;
- return record__write(rec, map, bf, size);
+ return record__write(rec, map, bf, compressed);
}
static volatile int signr = -1;
@@ -1079,18 +1105,15 @@ static size_t process_comp_header(void *record, size_t increment)
return size;
}
-static size_t zstd_compress(struct perf_session *session, void *dst, size_t dst_size,
+static size_t zstd_compress(struct zstd_data *zstd_data, void *dst, size_t dst_size,
void *src, size_t src_size)
{
size_t compressed;
size_t max_record_size = PERF_SAMPLE_MAX_SIZE - sizeof(struct perf_record_compressed) - 1;
- compressed = zstd_compress_stream_to_records(&session->zstd_data, dst, dst_size, src, src_size,
+ compressed = zstd_compress_stream_to_records(zstd_data, dst, dst_size, src, src_size,
max_record_size, process_comp_header);
- session->bytes_transferred += src_size;
- session->bytes_compressed += compressed;
-
return compressed;
}
diff --git a/tools/perf/util/mmap.c b/tools/perf/util/mmap.c
index ab7108d22428..a2c5e4237592 100644
--- a/tools/perf/util/mmap.c
+++ b/tools/perf/util/mmap.c
@@ -230,6 +230,8 @@ void mmap__munmap(struct mmap *map)
{
bitmap_free(map->affinity_mask.bits);
+ zstd_fini(&map->zstd_data);
+
perf_mmap__aio_munmap(map);
if (map->data != NULL) {
munmap(map->data, mmap__mmap_len(map));
@@ -291,6 +293,10 @@ int mmap__mmap(struct mmap *map, struct mmap_params *mp, int fd, int cpu)
map->core.flush = mp->flush;
map->comp_level = mp->comp_level;
+ if (zstd_init(&map->zstd_data, map->comp_level)) {
+ pr_debug2("failed to init mmap commpressor, error %d\n", errno);
+ return -1;
+ }
if (map->comp_level && !perf_mmap__aio_enabled(map)) {
map->data = mmap(NULL, mmap__mmap_len(map), PROT_READ|PROT_WRITE,
diff --git a/tools/perf/util/mmap.h b/tools/perf/util/mmap.h
index 9d5f589f02ae..d98b0bdedeac 100644
--- a/tools/perf/util/mmap.h
+++ b/tools/perf/util/mmap.h
@@ -13,6 +13,7 @@
#endif
#include "auxtrace.h"
#include "event.h"
+#include "util/compress.h"
struct aiocb;
@@ -43,6 +44,10 @@ struct mmap {
struct mmap_cpu_mask affinity_mask;
void *data;
int comp_level;
+ struct perf_data_file *file;
+ struct zstd_data zstd_data;
+ u64 bytes_transferred;
+ u64 bytes_compressed;
};
struct mmap_params {
--
2.24.1
next prev parent reply other threads:[~2020-10-12 8:59 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 ` Alexey Budankov [this message]
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 ` [PATCH v1 12/15] perf record: introduce thread local variable for trace streaming Alexey Budankov
2020-10-12 9:10 ` [PATCH v1 13/15] perf record: stop threads in the end of " 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=781092bf-8b1d-9d01-367b-b83d88bccf7b@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.