perf: enable compression of record mode trace to save storage space
Subsystems (2)
v2 cover perf: enable compression of record mode trace to save storage space
The patch set implements runtime trace compression for record mode and trace file decompression for report mode. Zstandard API [1] is used for compression/decompression of data that come from perf_events kernel data buffers.
Realized -z,--compression_level=n option provides ~3-5x avg. trace file size reduction on variety of tested workloads what saves user storage space on larger server systems where trace file size can easily reach several tens or even hundreds of GiBs, especially when profiling with stacks for later dwarf unwinding and context-switches tracing and etc.
$ tools/perf/perf record -z 1 -e cycles -- matrix.gcc
--mmap-flush option can be used to avoid compressing every single byte of data and increase compression ratio at the same time lowering tool runtime overhead.
The compression functionality can be disabled from the command line using NO_LIBZSTD define and Zstandard sources can be overridden using value of LIBZSTD_DIR define:
$ make -C tools/perf NO_LIBZSTD=1 clean all $ make -C tools/perf LIBZSTD_DIR=/path/to/zstd-1.3.7 clean all
The patch set is for Arnaldo's perf/core repository.
---
Alexey Budankov (4):
feature: realize libzstd check, LIBZSTD_DIR and NO_LIBZSTD defines perf record: implement -z=<level> and --mmap-flush=<thres> options perf record: enable runtime trace compression
perf report: support record trace file decompression
tools/build/Makefile.feature | 6 +- tools/build/feature/Makefile | 6 +- tools/build/feature/test-all.c | 5 + tools/build/feature/test-libzstd.c | 12 + tools/perf/Documentation/perf-record.txt | 9 + tools/perf/Makefile.config | 20 ++ tools/perf/Makefile.perf | 3 + tools/perf/builtin-record.c | 167 +++++++++++--- tools/perf/builtin-report.c | 5 +- tools/perf/perf.h | 2 + tools/perf/util/env.h | 10 + tools/perf/util/event.c | 1 + tools/perf/util/event.h | 7 + tools/perf/util/evlist.c | 6 +- tools/perf/util/evlist.h | 2 +- tools/perf/util/header.c | 45 +++- tools/perf/util/header.h | 1 + tools/perf/util/mmap.c | 173 ++++++++++----- tools/perf/util/mmap.h | 31 ++- tools/perf/util/session.c | 271 ++++++++++++++++++++++- tools/perf/util/session.h | 26 +++ tools/perf/util/tool.h | 2 + 22 files changed, 695 insertions(+), 115 deletions(-) create mode 100644 tools/build/feature/test-libzstd.c
---
Changes in v2:
- moved compression/decompression code to session layer
- enabled allocation aio data buffers for compression
- enabled trace compression for serial trace streaming
---
[1] https://github.com/facebook/zstd
---
Examples:
$ make -C tools/perf NO_LIBZSTD=1 clean all $ make -C tools/perf LIBZSTD_DIR=/path/to/zstd-1.3.7 clean all
$ tools/perf/perf record -z 1 -e cycles -- matrix.gcc Addr of buf1 = 0x7fc266d52010 Offs of buf1 = 0x7fc266d52180 Addr of buf2 = 0x7fc264d51010 Offs of buf2 = 0x7fc264d511c0 Addr of buf3 = 0x7fc262d50010 Offs of buf3 = 0x7fc262d50100 Addr of buf4 = 0x7fc260d4f010 Offs of buf4 = 0x7fc260d4f140 Threads #: 8 Pthreads Matrix size: 2048 Using multiply kernel: multiply1 Execution time = 31.471 seconds [ perf record: Woken up 120 times to write data ] [ perf record: Compressed 38.118 MB to 7.084 MB, ratio is 5.381 ] [ perf record: Captured and wrote 7.100 MB perf.data (999192 samples) ]
$ tools/perf/perf report -D --header
# ========
# captured on : Sat Jan 26 11:49:55 2019
# header version : 1
# data offset : 296
# data size : 7444119
# feat offset : 7444415
# hostname : nntvtune39
# os release : 4.19.15-300.fc29.x86_64
# perf version : 4.13.rc5.g3cfa299
# arch : x86_64
# nrcpus online : 8
# nrcpus avail : 8
# cpudesc : Intel(R) Core(TM) i7-6700K CPU @ 4.00GHz
# cpuid : GenuineIntel,6,94,3
# total memory : 16153184 kB
# cmdline : /root/abudanko/kernel/acme/tools/perf/perf record -z 1 -e cycles -- ../../matrix/linux/matrix.gcc
# event : name = cycles, , id = { 2171, 2172, 2173, 2174, 2175, 2176, 2177, 2178 }, size = 112, { sample_period, sample_freq } = 4000, sample_type = IP|TID|TIME|PERIOD, read_format =>
# CPU_TOPOLOGY info available, use -I to display
# NUMA_TOPOLOGY info available, use -I to display
# pmu mappings: intel_pt = 8, software = 1, power = 11, uprobe = 7, uncore_imc = 12, cpu = 4, cstate_core = 18, uncore_cbox_2 = 15, breakpoint = 5, uncore_cbox_0 = 13, tracepoint = 2>
# CACHE info available, use -I to display
# time of first sample : 230574.239204
# time of last sample : 230605.735403
# sample duration : 31496.200 ms
# MEM_TOPOLOGY info available, use -I to display
# compressed : Zstd, level = 1, ratio = 5
# missing features: TRACING_DATA BRANCH_STACK GROUP_DESC AUXTRACE STAT CLOCKID
# ========
# 0x128 [0x20]: event: 79
.
. ... raw event: size 32 bytes
. 0000: 4f 00 00 00 00 00 20 00 1f 00 00 00 00 00 00 00 O..... ......... . 0010: 11 a6 ef 1f 00 00 00 00 e7 16 81 83 f5 ff ff ff ................
0 0x128 [0x20]: PERF_RECORD_TIME_CONV: unhandled!
0x148 [0x50]: event: 1
.
. ... raw event: size 80 bytes
. 0000: 01 00 00 00 01 00 50 00 ff ff ff ff 00 00 00 00 ......P......... . 0010: 00 00 00 89 ff ff ff ff 00 10 31 37 00 00 00 00 ..........17.... . 0020: 00 00 00 89 ff ff ff ff 5b 6b 65 72 6e 65 6c 2e ........[kernel. . 0030: 6b 61 6c 6c 73 79 6d 73 5d 5f 74 65 78 74 00 00 kallsyms]_text.. . 0040: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................
0 0x148 [0x50]: PERF_RECORD_MMAP -1/0: [0xffffffff89000000(0x37311000) @ 0xffffffff89000000]: x [kernel.kallsyms]_text
...
0x6375d [0x8]: event: 68
.
. ... raw event: size 8 bytes
. 0000: 44 00 00 00 00 00 08 00 D.......
0 0x6375d [0x8]: PERF_RECORD_FINISHED_ROUND
0 [0x28]: event: 9
.
. ... raw event: size 40 bytes
. 0000: 09 00 00 00 01 00 28 00 76 78 06 89 ff ff ff ff ......(.vx...... . 0010: d4 1d 00 00 d4 1d 00 00 26 43 9f bf b4 d1 00 00 ........&C...... . 0020: 01 00 00 00 00 00 00 00 ........
230574239204134 0 [0x28]: PERF_RECORD_SAMPLE(IP, 0x1): 7636/7636: 0xffffffff89067876 period: 1 addr: 0
... thread: perf:7636
...... dso: /proc/kcore
0 [0x30]: event: 3
.
. ... raw event: size 48 bytes
. 0000: 03 00 00 00 00 20 30 00 d4 1d 00 00 d4 1d 00 00 ..... 0......... . 0010: 6d 61 74 72 69 78 2e 67 63 63 00 00 00 00 00 00 matrix.gcc...... . 0020: d4 1d 00 00 d4 1d 00 00 34 4a 9f bf b4 d1 00 00 ........4J......
230574239205940 0 [0x30]: PERF_RECORD_COMM exec: matrix.gcc:7636/7636
0 [0x28]: event: 9
.
. ... raw event: size 40 bytes
. 0000: 09 00 00 00 01 00 28 00 76 78 06 89 ff ff ff ff ......(.vx...... . 0010: d4 1d 00 00 d4 1d 00 00 1f af 9f bf b4 d1 00 00 ................ . 0020: 3f 0c 00 00 00 00 00 00 ?.......
230574239231775 0 [0x28]: PERF_RECORD_SAMPLE(IP, 0x1): 7636/7636: 0xffffffff89067876 period: 3135 addr: 0
... thread: matrix.gcc:7636
...... dso: /proc/kcore
Aggregated stats:
TOTAL events: 1001434
MMAP events: 100
LOST events: 0
COMM events: 2
EXIT events: 9
THROTTLE events: 0
UNTHROTTLE events: 0
FORK events: 8
READ events: 0
SAMPLE events: 999192
MMAP2 events: 7
AUX events: 0
ITRACE_START events: 0
LOST_SAMPLES events: 0
SWITCH events: 0
SWITCH_CPU_WIDE events: 0
NAMESPACES events: 0
KSYMBOL events: 0
BPF_EVENT events: 0
ATTR events: 0
EVENT_TYPE events: 0
TRACING_DATA events: 0
BUILD_ID events: 0
FINISHED_ROUND events: 319
ID_INDEX events: 0
AUXTRACE_INFO events: 0
AUXTRACE events: 0
AUXTRACE_ERROR events: 0
THREAD_MAP events: 1
CPU_MAP events: 1
STAT_CONFIG events: 0
STAT events: 0
STAT_ROUND events: 0
EVENT_UPDATE events: 0
TIME_CONV events: 1
FEATURE events: 0
COMPRESSED events: 1794
cycles stats:
TOTAL events: 999192
MMAP events: 0
LOST events: 0
COMM events: 0
EXIT events: 0
THROTTLE events: 0
UNTHROTTLE events: 0
FORK events: 0
READ events: 0
SAMPLE events: 999192
MMAP2 events: 0
AUX events: 0
ITRACE_START events: 0
LOST_SAMPLES events: 0
SWITCH events: 0
SWITCH_CPU_WIDE events: 0
NAMESPACES events: 0
KSYMBOL events: 0
BPF_EVENT events: 0
ATTR events: 0
EVENT_TYPE events: 0
TRACING_DATA events: 0
BUILD_ID events: 0
FINISHED_ROUND events: 0
ID_INDEX events: 0
AUXTRACE_INFO events: 0
AUXTRACE events: 0
AUXTRACE_ERROR events: 0
THREAD_MAP events: 0
CPU_MAP events: 0
STAT_CONFIG events: 0
STAT events: 0
STAT_ROUND events: 0
EVENT_UPDATE events: 0
TIME_CONV events: 0
FEATURE events: 0
COMPRESSED events: 0---
PATCH v2 1/4 feature: realize libzstd check, LIBZSTD_DIR and NO_LIBZSTD defines
Implement libzstd feature check, NO_LIBZSTD and LIBZSTD_DIR defines to overrride Zstd library sources or disable the feature from the command line:
$ make -C tools/perf LIBZSTD_DIR=/root/abudanko/zstd-1.3.7 clean all $ make -C tools/perf NO_LIBZSTD=1 clean all
--- tools/build/Makefile.feature | 6 ++++-- tools/build/feature/Makefile | 6 +++++- tools/build/feature/test-all.c | 5 +++++ tools/build/feature/test-libzstd.c | 12 ++++++++++++ tools/perf/Makefile.config | 20 ++++++++++++++++++++ tools/perf/Makefile.perf | 3 +++ 6 files changed, 49 insertions(+), 3 deletions(-) create mode 100644 tools/build/feature/test-libzstd.c
tools/build/Makefile.feature +4 -2
@@ -71,7 +71,8 @@ FEATURE_TESTS_BASIC := \ sdt \ setns \ libopencsd \ - libaio + libaio \ + libzstd # FEATURE_TESTS_BASIC + FEATURE_TESTS_EXTRA is the complete list # of all feature tests
@@ -118,7 +119,8 @@ FEATURE_DISPLAY ?= \ lzma \ get_cpuid \ bpf \ - libaio + libaio \ + libzstd # Set FEATURE_CHECK_(C|LD)FLAGS-all for all FEATURE_TESTS features. # If in the future we need per-feature checks/flags for features not
tools/build/feature/Makefile +5 -1
@@ -62,7 +62,8 @@ FILES= \ test-clang.bin \ test-llvm.bin \ test-llvm-version.bin \ - test-libaio.bin + test-libaio.bin \ + test-libzstd.bin FILES := $(addprefix $(OUTPUT),$(FILES))
@@ -301,6 +302,9 @@ $(OUTPUT)test-clang.bin: $(OUTPUT)test-libaio.bin: $(BUILD) -lrt +$(OUTPUT)test-libzstd.bin: + $(BUILD) -lzstd + ############################### clean:
tools/build/feature/test-all.c +5 -0
@@ -178,6 +178,10 @@# include "test-libaio.c" #undef main +#define main main_test_zstd +# include "test-libzstd.c" +#undef main +int main (int argc,char *argv[]) {main_test_libpython ();
@@ -219,6 +223,7 @@ int main(int argc, char *argv[])main_test_setns ();main_test_libopencsd ();main_test_libaio (); +main_test_libzstd ();return 0 ; }
tools/build/feature/test-libzstd.c new file +12 -0
@@ -0,0 +1,12 @@ +// SPDX-License-Identifier: GPL-2.0 +#include <zstd.h> + +int main (void ) +{ +ZSTD_CStream *cstream; + + cstream =ZSTD_createCStream (); +ZSTD_freeCStream (cstream); + +return 0 ; +}
tools/perf/Makefile.config +20 -0
@@ -145,6 +145,13 @@ endif FEATURE_CHECK_CFLAGS-libbabeltrace := $(LIBBABELTRACE_CFLAGS) FEATURE_CHECK_LDFLAGS-libbabeltrace := $(LIBBABELTRACE_LDFLAGS) -lbabeltrace-ctf +ifdef LIBZSTD_DIR + LIBZSTD_CFLAGS := -I$(LIBZSTD_DIR)/lib + LIBZSTD_LDFLAGS := -L$(LIBZSTD_DIR)/lib +endif +FEATURE_CHECK_CFLAGS-libzstd := $(LIBZSTD_CFLAGS) +FEATURE_CHECK_LDFLAGS-libzstd := $(LIBZSTD_LDFLAGS) + FEATURE_CHECK_CFLAGS-bpf = -I. -I$(srctree)/tools/include -I$(srctree)/tools/arch/$(SRCARCH)/include/uapi -I$(srctree)/tools/include/uapi # include ARCH specific config -include $(src-perf)/arch/$(SRCARCH)/Makefile
@@ -770,6 +777,19 @@ ifndef NO_LZMA endif endif +ifndef NO_LIBZSTD + ifeq ($(feature-libzstd), 1) + CFLAGS += -DHAVE_ZSTD_SUPPORT + CFLAGS += $(LIBZSTD_CFLAGS) + LDFLAGS += $(LIBZSTD_LDFLAGS) + EXTLIBS += -lzstd + $(call detected,CONFIG_ZSTD) + else + msg := $(warning No libzstd found, disables trace compression, please install libzstd-dev[el] and/or set LIBZSTD_DIR); + NO_LIBZSTD := 1 + endif +endif + ifndef NO_BACKTRACE ifeq ($(feature-backtrace), 1) CFLAGS += -DHAVE_BACKTRACE_SUPPORT
tools/perf/Makefile.perf +3 -0
@@ -108,6 +108,9 @@ include ../scripts/utilities.mak # streaming for record mode. Currently Posix AIO trace streaming is # supported only when linking with glibc. # +# Define NO_LIBZSTD if you do not want support of Zstandard based runtime +# trace compression in record mode. +# # As per kernel Makefile, avoid funny character set dependencies unexport LC_ALL
PATCH v2 2/4 perf record: implement -z=<level> and --mmap-flush=<thres> options
In reply to Alexey BudankovImplement -z,--compression_level=<n> and --mmap-flush=<dump_least_size> options as well as a special PERF_RECORD_COMPRESSED record that contains compressed parts of kernel data buffer.
Because compression requires auxiliary memory to implement encoding of kernel data record->opts.nr_cblocks == -1 signifies to allocate single AIO data buffer aio.data[0] without accompanying AIO control blocks.
---
Changes in v2:
- enabled allocation aio data buffers for compression
--- tools/perf/Documentation/perf-record.txt | 9 ++ tools/perf/builtin-record.c | 110 ++++++++++++++++++---- tools/perf/perf.h | 2 + tools/perf/util/env.h | 10 ++ tools/perf/util/event.c | 1 + tools/perf/util/event.h | 7 ++ tools/perf/util/evlist.c | 6 +- tools/perf/util/evlist.h | 2 +- tools/perf/util/header.c | 45 ++++++++- tools/perf/util/header.h | 1 + tools/perf/util/mmap.c | 112 ++++++++++++++--------- tools/perf/util/mmap.h | 7 +- tools/perf/util/session.h | 2 + 13 files changed, 246 insertions(+), 68 deletions(-)
tools/perf/Documentation/perf-record.txt +9 -0
@@ -440,6 +440,15 @@ Use <n> control blocks in asynchronous (Posix AIO) trace writing mode (default: Asynchronous mode is supported only when linking Perf tool with libc library providing implementation for Posix AIO API. +-z:: +--compression-level=n:: +Produce compressed trace file using specified level n to save storage space (no compression: 0 - default, +fastest compression: 1, smallest trace file: 22) + +--mmap-flush=n:: +Minimal number of bytes accumulated in kernel buffer that is flushed to trace file (default: 1). +Maximal allowed value is a quater of kernel buffer size. + --all-kernel:: Configure all used events to run in kernel space.
tools/perf/builtin-record.c +93 -17
222 lines not on this page · raw message
tools/perf/perf.h +2 -0
@@ -84,6 +84,8 @@ struct record_opts {clockid_t clockid;u64 clockid_res_ns;int nr_cblocks; +unsigned int comp_level; +int mmap_flush; };struct option ;
tools/perf/util/env.h +10 -0
@@ -64,6 +64,16 @@ struct perf_env {struct memory_node *memory_nodes;unsigned long long memory_bsize;u64 clockid_res_ns; +u32 comp_type; +u32 comp_level; +u32 comp_ratio; +u32 comp_mmap_len; +}; + +enum perf_compress_type { +PERF_COMP_NONE =0 , +PERF_COMP_ZSTD , +PERF_COMP_MAX };extern struct perf_env perf_env;
tools/perf/util/event.c +1 -0
@@ -66,6 +66,7 @@ static const char *perf_event__names[] = { [PERF_RECORD_EVENT_UPDATE] = "EVENT_UPDATE", [PERF_RECORD_TIME_CONV] = "TIME_CONV", [PERF_RECORD_HEADER_FEATURE] = "FEATURE", + [PERF_RECORD_COMPRESSED] = "COMPRESSED", };static const char *perf_ns__names[] = {
tools/perf/util/event.h +7 -0
@@ -254,6 +254,7 @@ enum perf_user_event_type { /* above any possible kernel type */PERF_RECORD_EVENT_UPDATE =78 ,PERF_RECORD_TIME_CONV =79 ,PERF_RECORD_HEADER_FEATURE =80 , +PERF_RECORD_COMPRESSED =81 , PERF_RECORD_HEADER_MAX };
@@ -625,6 +626,11 @@ struct feature_event {char data[]; }; +struct compressed_event { +struct perf_event_header header; +char data[]; +}; +union perf_event {struct perf_event_header header;struct mmap_event mmap;
@@ -658,6 +664,7 @@ union perf_event {struct feature_event feat;struct ksymbol_event ksymbol_event;struct bpf_event bpf_event; +struct compressed_event pack; };void perf_event__print_totals (void );
tools/perf/util/evlist.c +3 -3
@@ -1022,7 +1022,7 @@ int perf_evlist__parse_mmap_pages(const struct option *opt, const char *str,*/ int perf_evlist__mmap_ex (struct perf_evlist *evlist,unsigned int pages,unsigned int auxtrace_pages, -bool auxtrace_overwrite,int nr_cblocks) +bool auxtrace_overwrite,int nr_cblocks,int flush) {struct perf_evsel *evsel;const struct cpu_map *cpus = evlist->cpus;
@@ -1032,7 +1032,7 @@ int perf_evlist__mmap_ex(struct perf_evlist *evlist, unsigned int pages,* Its value is decided by evsel's write_backward. * So &mp should not be passed through const pointer. */ -struct mmap_params mp = { .nr_cblocks = nr_cblocks }; +struct mmap_params mp = { .nr_cblocks = nr_cblocks, .flush = flush };if (!evlist->mmap) evlist->mmap =perf_evlist__alloc_mmap (evlist, false);
@@ -1064,7 +1064,7 @@ int perf_evlist__mmap_ex(struct perf_evlist *evlist, unsigned int pages,int perf_evlist__mmap (struct perf_evlist *evlist,unsigned int pages) { -return perf_evlist__mmap_ex (evlist, pages,0 , false,0 ); +return perf_evlist__mmap_ex (evlist, pages,0 , false,0 ,1 ); }int perf_evlist__create_maps (struct perf_evlist *evlist,struct target *target)
tools/perf/util/evlist.h +1 -1
@@ -165,7 +165,7 @@ unsigned long perf_event_mlock_kb_in_pages(void);int perf_evlist__mmap_ex (struct perf_evlist *evlist,unsigned int pages,unsigned int auxtrace_pages, -bool auxtrace_overwrite,int nr_cblocks); +bool auxtrace_overwrite,int nr_cblocks,int flush);int perf_evlist__mmap (struct perf_evlist *evlist,unsigned int pages);void perf_evlist__munmap (struct perf_evlist *evlist);
tools/perf/util/header.c +44 -1
69 lines not on this page · raw message
tools/perf/util/header.h +1 -0
@@ -39,6 +39,7 @@ enum {HEADER_SAMPLE_TIME ,HEADER_MEM_TOPOLOGY ,HEADER_CLOCKID , +HEADER_COMPRESSED ,HEADER_LAST_FEATURE , HEADER_FEAT_BITS = 256, };
tools/perf/util/mmap.c +69 -43
163 lines not on this page · raw message
tools/perf/util/mmap.h +4 -3
@@ -30,14 +30,15 @@ struct perf_mmap {bool overwrite;struct auxtrace_mmap auxtrace_mmap;char event_copy[PERF_SAMPLE_MAX_SIZE ]__aligned(8) ; -#ifdef HAVE_AIO_SUPPORT +u64 flush;struct {void **data; +#ifdef HAVE_AIO_SUPPORT struct aiocb *cblocks;struct aiocb **aiocb; +#endif int nr_cblocks; } aio; -#endif };/*
@@ -69,7 +70,7 @@ enum bkw_mmap_state { };struct mmap_params { -int prot, mask, nr_cblocks; +int prot, mask, nr_cblocks, flush;struct auxtrace_mmap_params auxtrace_mp; };
tools/perf/util/session.h +2 -0
@@ -35,6 +35,8 @@ struct perf_session {struct ordered_events ordered_events;struct perf_data *data;struct perf_tool *tool; +u64 bytes_transferred; +u64 bytes_compressed; };struct perf_tool ;
PATCH v2 3/4 perf record: enable runtime trace compression
In reply to Alexey BudankovCompression is implemented using simple Zstd API and employs AIO data buffer as the memory to operate on. If the API call fails for some reason compression falls back to memcpy().
Data chunks are split and packed into PERF_RECORD_COMPRESSED records by 64KB at max. mmap-flush option value can be used to avoid compression of every single byte of data and increase compression ratio.
---
Changes in v2:
- enabled trace compression for serial trace streaming
- moved compression/decompression code to session layer
--- tools/perf/builtin-record.c | 67 +++++++++++++++-------- tools/perf/util/mmap.c | 69 ++++++++++++++++------- tools/perf/util/mmap.h | 24 +++++--- tools/perf/util/session.c | 106 ++++++++++++++++++++++++++++++++++++ tools/perf/util/session.h | 13 +++++ 5 files changed, 228 insertions(+), 51 deletions(-)
tools/perf/builtin-record.c +43 -24
@@ -107,8 +107,7 @@ static bool switch_output_time(struct record *rec)trigger_is_ready (&switch_output_trigger); } -static int record__write (struct record *rec,struct perf_mmap *map__maybe_unused , -void *bf,size_t size) +static int record__write (struct record *rec,void *bf,size_t size) {struct perf_data_file *file = &rec->session->data->file;
@@ -232,7 +231,7 @@ static int record__aio_sync(struct perf_mmap *md, bool sync_all) }while (1 ); } -static int record__aio_pushfn (void *to,struct aiocb *cblock,void *bf,size_t size,off_t off) +static int record__aio_pushfn (void *to,void *bf,size_t size,off_t off,struct aiocb *cblock) {struct record *rec = to;int ret, trace_fd = rec->session->data->file.fd;
@@ -259,13 +258,15 @@ static void record__aio_set_pos(int trace_fd, off_t pos)lseek (trace_fd, pos,SEEK_SET ); } +static int record__aio_enabled (struct record *rec); +static void record__aio_mmap_read_sync (struct record *rec) {int i;struct perf_evlist *evlist = rec->evlist;struct perf_mmap *maps = evlist->mmap; -if (!rec->opts.nr_cblocks) +if (!record__aio_enabled (rec))return ;for (i =0 ; i < evlist->nr_mmaps; i++) {
@@ -306,8 +307,8 @@ static int record__aio_sync(struct perf_mmap *md __maybe_unused, bool sync_all _return -1 ; } -static int record__aio_pushfn (void *to__maybe_unused ,struct aiocb *cblock__maybe_unused , -void *bf__maybe_unused ,size_t size__maybe_unused ,off_t off__maybe_unused ) +static int record__aio_pushfn (void *to__maybe_unused ,void *bf__maybe_unused , +size_t size__maybe_unused ,off_t off__maybe_unused ,struct aiocb *cblock__maybe_unused ) {return -1 ; }
@@ -366,15 +367,15 @@ static int process_synthesized_event(struct perf_tool *tool, struct machine *machine __maybe_unused) { struct record *rec = container_of(tool, struct record, tool); -return record__write (rec,NULL , event, event->header.size); +return record__write (rec, event, event->header.size); } -static int record__pushfn (struct perf_mmap *map,void *to,void *bf,size_t size) +static int record__pushfn (void *to,void *bf,size_t size) {struct record *rec = to; rec->samples++; -return record__write (rec, map, bf, size); +return record__write (rec, bf, size); }static volatile int done;
@@ -409,7 +410,7 @@ static void record__sig_exit(void)#ifdef HAVE_AUXTRACE_SUPPORT static int record__process_auxtrace (struct perf_tool *tool, -struct perf_mmap *map, +struct perf_mmap *map__maybe_unused ,union perf_event *event,void *data1,size_t len1,void *data2,size_t len2) {
@@ -437,11 +438,11 @@ static int record__process_auxtrace(struct perf_tool *tool,if (padding) padding =8 - padding; -record__write (rec, map, event, event->header.size); -record__write (rec, map, data1, len1); +record__write (rec, event, event->header.size); +record__write (rec, data1, len1);if (len2) -record__write (rec, map, data2, len2); -record__write (rec, map, &pad, padding); +record__write (rec, data2, len2); +record__write (rec, &pad, padding);return 0 ; }
@@ -764,6 +765,8 @@ static int record__mmap_read_evlist(struct record *rec, struct perf_evlist *evlistruct perf_mmap *maps;int trace_fd = rec->data.file.fd;off_t off; +struct perf_session *session = rec->session; +perf_mmap__compress_fn_t compress_fn;if (!evlist)return 0 ;
@@ -775,6 +778,9 @@ static int record__mmap_read_evlist(struct record *rec, struct perf_evlist *evliif (overwrite && evlist->bkw_mmap_state !=BKW_MMAP_DATA_PENDING )return 0 ; + compress_fn = (record__comp_enabled (rec) ? + perf_session__zstd_compress : perf_session__zstd_copy); +if (record__aio_enabled (rec)) off =record__aio_get_pos (trace_fd);
@@ -788,11 +794,21 @@ static int record__mmap_read_evlist(struct record *rec, struct perf_evlist *evli map->flush =MMAP_FLUSH_DEFAULT ; }if (!record__aio_enabled (rec)) { -if (perf_mmap__push (map, rec, record__pushfn) !=0 ) { -if (sync) - map->flush = flush; - rc =-1 ; - goto out; +if (!record__comp_enabled (rec)) { +if (perf_mmap__push (map, rec, record__pushfn) !=0 ) { +if (sync) + map->flush = flush; + rc =-1 ; + goto out; + } + }else { +if (perf_mmap__pack (map, rec, record__pushfn, + compress_fn, session) !=0 ) { +if (sync) + map->flush = flush; + rc =-1 ; + goto out; + } } }else {int idx;
@@ -801,7 +817,8 @@ static int record__mmap_read_evlist(struct record *rec, struct perf_evlist *evli* becomes available after previous aio write request. */ idx =record__aio_sync (map, false); -if (perf_mmap__aio_push (map, rec, idx, record__aio_pushfn, &off) !=0 ) { +if (perf_mmap__aio_push (map, rec, record__aio_pushfn, + &off, idx, compress_fn, session) !=0 ) {record__aio_set_pos (trace_fd, off);if (sync) map->flush = flush;
@@ -828,7 +845,7 @@ static int record__mmap_read_evlist(struct record *rec, struct perf_evlist *evli* at least one event. */ if (bytes_written != rec->bytes_written) - rc =record__write (rec,NULL , &finished_round_event,sizeof (finished_round_event)); + rc =record__write (rec, &finished_round_event,sizeof (finished_round_event));if (overwrite)perf_evlist__toggle_bkw_mmap (evlist,BKW_MMAP_EMPTY );
@@ -1182,9 +1199,10 @@ static int __cmd_record(struct record *rec, int argc, const char **argv) fd =perf_data__fd (data); rec->session = session; - rec->opts.comp_level =0 ; - session->header.env.comp_level = rec->opts.comp_level; - session->header.env.comp_type =PERF_COMP_NONE ; +if (perf_session__zstd_init (session, rec->opts.comp_level) <0 ) { +pr_err ("Compression initialization failed.\n" ); +return -1 ; + }record__init_features (rec);
@@ -1515,6 +1533,7 @@ static int __cmd_record(struct record *rec, int argc, const char **argv) } out_delete_session: +perf_session__zstd_fini (session);perf_session__delete (session);return status; }
tools/perf/util/mmap.c +50 -19
117 lines not on this page · raw message
tools/perf/util/mmap.h +16 -8
@@ -96,16 +96,24 @@ union perf_event *perf_mmap__read_forward(struct perf_mmap *map);union perf_event *perf_mmap__read_event (struct perf_mmap *map); -int perf_mmap__push (struct perf_mmap *md,void *to, -int push (struct perf_mmap *map,void *to,void *buf,size_t size)); +typedef int (*perf_mmap__push_fn_t )(void *to,void *buf,size_t size); +int perf_mmap__push (struct perf_mmap *md,void *to,perf_mmap__push_fn_t push); + +typedef size_t (*perf_mmap__compress_fn_t )(void *where,void *dst,size_t dst_size, +void *src,size_t src_size); +int perf_mmap__pack (struct perf_mmap *md,void *to,perf_mmap__push_fn_t push, +perf_mmap__compress_fn_t compress,void *where); + +typedef int (*perf_mmap__aio_push_fn_t )(void *to,void *buf,size_t size, +off_t push_off,struct aiocb *cblock); +#ifdef HAVE_AIO_SUPPORT -int perf_mmap__aio_push (struct perf_mmap *md,void *to,int idx, -int push (void *to,struct aiocb *cblock,void *buf,size_t size,off_t off), -off_t *off); +int perf_mmap__aio_push (struct perf_mmap *md,void *to,perf_mmap__aio_push_fn_t push,off_t *push_off, +int idx,perf_mmap__compress_fn_t compress_fn,void *where);#else -static inline int perf_mmap__aio_push (struct perf_mmap *md__maybe_unused ,void *to__maybe_unused ,int idx__maybe_unused , -int push (void *to,struct aiocb *cblock,void *buf,size_t size,off_t off)__maybe_unused , -off_t *off__maybe_unused ) +static inline int perf_mmap__aio_push (struct perf_mmap *md__maybe_unused ,void *to__maybe_unused , +perf_mmap__aio_push_fn_t push__maybe_unused ,off_t *push_off__maybe_unused , +int idx__maybe_unused ,perf_mmap__compress_fn_t compress__maybe_unused ,void *where__maybe_unused ) {return 0 ; }
tools/perf/util/session.c +106 -0
112 lines not on this page · raw message
tools/perf/util/session.h +13 -0
@@ -11,6 +11,9 @@#include <linux/kernel.h> #include <linux/rbtree.h> #include <linux/perf_event.h> +#ifdef HAVE_ZSTD_SUPPORT +#include <zstd.h> +#endif struct ip_callchain ;struct symbol ;
@@ -37,6 +40,9 @@ struct perf_session {struct perf_tool *tool;u64 bytes_transferred;u64 bytes_compressed; +#ifdef HAVE_ZSTD_SUPPORT +ZSTD_CStream *zstd_cstream; +#endif };struct perf_tool ;
@@ -122,6 +128,13 @@ int perf_session__deliver_synth_event(struct perf_session *session,union perf_event *event, struct perf_sample *sample); +int perf_session__zstd_init (struct perf_session *session,int level); +int perf_session__zstd_fini (struct perf_session *session); +size_t perf_session__zstd_copy (void *to,void *dst,size_t dst_size, +void *src,size_t src_size); +size_t perf_session__zstd_compress (void *to,void *dst,size_t dst_size, +void *src,size_t src_size); +int perf_event__process_id_index (struct perf_session *session,union perf_event *event);
PATCH v2 4/4 perf report: support record trace file decompression
In reply to Alexey BudankovPERF_RECORD_COMPRESSED records are decompressed from trace file into a linked list of mmaped memory regions using streaming Zstandard API. After that the regions are loaded fetching uncompressed events. When dumping raw trace (e.g., perf report -D --header) file offsets of events from compressed records are set to zero.
---
Changes in v2:
- moved compression/decompression code to session layer
--- tools/perf/builtin-report.c | 5 +- tools/perf/util/session.c | 165 +++++++++++++++++++++++++++++++++++- tools/perf/util/session.h | 11 +++ tools/perf/util/tool.h | 2 + 4 files changed, 181 insertions(+), 2 deletions(-)
tools/perf/builtin-report.c +4 -1
@@ -1197,6 +1197,9 @@ int cmd_report(int argc, const char **argv)if (session ==NULL )return -1 ; +if (perf_session__zstd_init (session,0 ) <0 ) +pr_warning ("Decompression initialization failed. Reported data may be incomplete.\n" ); +if (report.queue_size) {ordered_events__set_alloc_size (&session->ordered_events, report.queue_size);
@@ -1409,7 +1412,7 @@ int cmd_report(int argc, const char **argv) error:zfree (&report.ptime_range); - +perf_session__zstd_fini (session);perf_session__delete (session);return ret; }
tools/perf/util/session.c +164 -1
231 lines not on this page · raw message
tools/perf/util/session.h +11 -0
@@ -42,7 +42,18 @@ struct perf_session {u64 bytes_compressed;#ifdef HAVE_ZSTD_SUPPORT ZSTD_CStream *zstd_cstream; +ZSTD_DStream *zstd_dstream;#endif +struct decomp *decomp; +struct decomp *decomp_last; +}; + +struct decomp { +struct decomp *next; +u64 file_pos; +u64 head; +size_t size; +char data[]; };struct perf_tool ;
tools/perf/util/tool.h +2 -0
@@ -28,6 +28,7 @@ typedef int (*event_attr_op)(struct perf_tool *tool,typedef int (*event_op2 )(struct perf_session *session,union perf_event *event);typedef s64 (*event_op3 )(struct perf_session *session,union perf_event *event); +typedef int (*event_op4 )(struct perf_session *session,union perf_event *event,u64 data);typedef int (*event_oe )(struct perf_tool *tool,union perf_event *event,struct ordered_events *oe);
@@ -72,6 +73,7 @@ struct perf_tool { stat, stat_round, feature; +event_op4 compressed;event_op3 auxtrace;bool ordered_events;bool ordering_requires_timestamps;
Quoted 18 lines · Alexey Budankov
The patch set implements runtime trace compression for record mode and trace file decompression for report mode. Zstandard API [1] is used for compression/decompression of data that come from
perf_eventskernel data buffers.Realized -z,--compression_level=n option provides ~3-5x avg. trace file size reduction on variety of tested workloads what saves user storage space on larger server systems where trace file size can easily reach several tens or even hundreds of GiBs, especially when profiling with stacks for later dwarf unwinding and context-switches tracing and etc.
$ tools/perf/perf record -z 1 -e cycles -- matrix.gcc--mmap-flush option can be used to avoid compressing every single byte of data and increase compression ratio at the same time lowering tool runtime overhead.
Quoted 8 lines
The compression functionality can be disabled from the command line using
NO_LIBZSTDdefine and Zstandard sources can be overridden using value ofLIBZSTD_DIRdefine:$ make -C tools/perf NO_LIBZSTD=1 clean all $ make -C tools/perf LIBZSTD_DIR=/path/to/zstd-1.3.7 clean allThe patch set is for Arnaldo's perf/core repository.
hi,
got here late and can't apply this anymore.. which revision (commit id) is this based on? perf/core is moving real fast these days ;-)
based on errors below I suspect u need to rebase anyway :-\
sry for late response
jirka
Quoted 5 lines
---
Alexey Budankov (4):
feature: realize libzstd check,LIBZSTD_DIRandNO_LIBZSTDdefines perf record: implement -z=<level> and --mmap-flush=<thres> options
got this one failing when applied:
patching file tools/perf/Documentation/perf-record.txt
Hunk #1 succeeded at 459 with fuzz 2 (offset 19 lines).
patching file tools/perf/builtin-record.c
Hunk #1 succeeded at 292 (offset 5 lines).
Hunk #2 succeeded at 336 (offset 5 lines).
Hunk #3 FAILED at 565.
Hunk #4 succeeded at 765 with fuzz 1 (offset 10 lines).
Hunk #5 FAILED at 778.
Hunk #6 succeeded at 806 (offset 11 lines).
Hunk #7 succeeded at 839 (offset 11 lines).
Hunk #8 succeeded at 873 (offset 11 lines).
Hunk #9 succeeded at 1185 (offset 11 lines).
Hunk #10 succeeded at 1218 (offset 11 lines).
Hunk #11 succeeded at 1354 (offset 11 lines).
Hunk #12 succeeded at 1455 (offset 11 lines).
Hunk #13 succeeded at 1866 (offset 26 lines).
Hunk #14 FAILED at 2006.
Hunk #15 succeeded at 2230 with fuzz 2 (offset 32 lines).
3 out of 15 hunks FAILED -- saving rejects to file tools/perf/builtin-record.c.rej patching file tools/perf/perf.h
Hunk #1 FAILED at 84.
1 out of 1 hunk FAILED -- saving rejects to file tools/perf/perf.h.rej patching file tools/perf/util/env.h
patching file tools/perf/util/event.c
Hunk #1 succeeded at 68 (offset 2 lines).
patching file tools/perf/util/event.h
Hunk #2 succeeded at 627 (offset 1 line).
Hunk #3 succeeded at 665 (offset 1 line).
patching file tools/perf/util/evlist.c
Hunk #1 FAILED at 1022.
Hunk #2 FAILED at 1032.
Hunk #3 FAILED at 1064.
3 out of 3 hunks FAILED -- saving rejects to file tools/perf/util/evlist.c.rej patching file tools/perf/util/evlist.h
Hunk #1 FAILED at 165.
1 out of 1 hunk FAILED -- saving rejects to file tools/perf/util/evlist.h.rej patching file tools/perf/util/header.c
patching file tools/perf/util/header.h
patching file tools/perf/util/mmap.c
Hunk #1 FAILED at 154.
Hunk #2 succeeded at 282 with fuzz 1 (offset 69 lines).
Hunk #3 succeeded at 359 (offset 69 lines).
Hunk #4 succeeded at 434 (offset 97 lines).
Hunk #5 succeeded at 484 (offset 97 lines).
1 out of 5 hunks FAILED -- saving rejects to file tools/perf/util/mmap.c.rej patching file tools/perf/util/mmap.h
Hunk #1 FAILED at 30.
Hunk #2 FAILED at 69.
2 out of 2 hunks FAILED -- saving rejects to file tools/perf/util/mmap.h.rej patching file tools/perf/util/session.h
Quoted 2 lines · Jiri Olsa
Quoted 1 line · Alexey Budankov
<SNIP>
Quoted 8 lines
Quoted 1 line
The patch set is for Arnaldo's perf/core repository.
hi,
got here late and can't apply this anymore.. which revision (commit id) is this based on? perf/core is moving real fast these days ;-)based on errors below I suspect u need to rebase anyway :-\
Yes, I will resend shortly.
Thanks,
Alexey
Quoted 5 lines
sry for late response
jirka