lkml.org 
[lkml]   [2019]   [Mar]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Subject[PATCH v7 07/12] perf record: implement compression for serial trace streaming
    From
    Date

    Compression is implemented using the functions from zstd.c. As the memory
    to operate on the compression uses mmap->data buffer. If Zstd streaming
    compression API fails for some reason the data to be compressed are just
    copied into the memory buffers using plain memcpy().

    Compressed trace frame consists of an array of PERF_RECORD_COMPRESSED
    records. Each element of the array is not longer that PERF_SAMPLE_MAX_SIZE
    and consists of perf_event_header followed by the compressed chunk
    that is decompressed on the loading stage.

    Signed-off-by: Alexey Budankov <alexey.budankov@linux.intel.com>
    ---
    tools/perf/builtin-record.c | 52 +++++++++++++++++++++++++++++++++++--
    tools/perf/util/session.h | 2 ++
    2 files changed, 52 insertions(+), 2 deletions(-)

    diff --git a/tools/perf/builtin-record.c b/tools/perf/builtin-record.c
    index c4ce5a9c9e3f..d13c0dd87592 100644
    --- a/tools/perf/builtin-record.c
    +++ b/tools/perf/builtin-record.c
    @@ -130,6 +130,9 @@ static int record__write(struct record *rec, struct perf_mmap *map __maybe_unuse
    return 0;
    }

    +static size_t zstd_compress(struct perf_session *session, 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,
    void *buf, size_t size, off_t off)
    @@ -387,6 +390,12 @@ static int record__pushfn(struct perf_mmap *map, void *to, void *bf, size_t size
    {
    struct record *rec = to;

    + if (record__comp_enabled(rec)) {
    + size = zstd_compress(rec->session, map->data,
    + perf_mmap__mmap_len(map), bf, size);
    + bf = map->data;
    + }
    +
    rec->samples++;
    return record__write(rec, map, bf, size);
    }
    @@ -773,6 +782,37 @@ static void record__adjust_affinity(struct record *rec, struct perf_mmap *map)
    }
    }

    +static size_t process_comp_header(void *record, size_t increment)
    +{
    + struct compressed_event *event = record;
    + size_t size = sizeof(struct compressed_event);
    +
    + if (increment) {
    + event->header.size += increment;
    + return increment;
    + } else {
    + event->header.type = PERF_RECORD_COMPRESSED;
    + event->header.size = size;
    + return size;
    + }
    +}
    +
    +static size_t zstd_compress(struct perf_session *session, 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 compressed_event);
    +
    + compressed = zstd_compress_stream_to_records(&(session->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;
    +}
    +
    static int record__mmap_read_evlist(struct record *rec, struct perf_evlist *evlist,
    bool overwrite, bool sync)
    {
    @@ -1202,6 +1242,14 @@ static int __cmd_record(struct record *rec, int argc, const char **argv)
    fd = perf_data__fd(data);
    rec->session = session;

    + if (zstd_init(&(session->zstd_data), rec->opts.comp_level) < 0) {
    + pr_err("Compression initialization failed.\n");
    + return -1;
    + }
    +
    + session->header.env.comp_type = PERF_COMP_ZSTD;
    + session->header.env.comp_level = rec->opts.comp_level;
    +
    record__init_features(rec);

    if (rec->opts.use_clockid && rec->opts.clockid_res_ns)
    @@ -1535,6 +1583,7 @@ static int __cmd_record(struct record *rec, int argc, const char **argv)
    }

    out_delete_session:
    + zstd_fini(&(session->zstd_data));
    perf_session__delete(session);
    return status;
    }
    @@ -2252,8 +2301,7 @@ int cmd_record(int argc, const char **argv)

    if (rec->opts.nr_cblocks > nr_cblocks_max)
    rec->opts.nr_cblocks = nr_cblocks_max;
    - if (verbose > 0)
    - pr_info("nr_cblocks: %d\n", rec->opts.nr_cblocks);
    + pr_debug("nr_cblocks: %d\n", rec->opts.nr_cblocks);

    pr_debug("affinity: %s\n", affinity_tags[rec->opts.affinity]);
    pr_debug("mmap flush: %d\n", rec->opts.mmap_flush);
    diff --git a/tools/perf/util/session.h b/tools/perf/util/session.h
    index 0e14884f28b2..6c984c895924 100644
    --- a/tools/perf/util/session.h
    +++ b/tools/perf/util/session.h
    @@ -8,6 +8,7 @@
    #include "machine.h"
    #include "data.h"
    #include "ordered-events.h"
    +#include "util/compress.h"
    #include <linux/kernel.h>
    #include <linux/rbtree.h>
    #include <linux/perf_event.h>
    @@ -37,6 +38,7 @@ struct perf_session {
    struct perf_tool *tool;
    u64 bytes_transferred;
    u64 bytes_compressed;
    + struct zstd_data zstd_data;
    };

    struct perf_tool;
    --
    2.20.1
    \
     
     \ /
      Last update: 2019-03-12 06:26    [W:2.839 / U:0.220 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site