Commit 75f5f1fc authored by Alexey Bayduraev's avatar Alexey Bayduraev Committed by Arnaldo Carvalho de Melo
Browse files

perf record: Introduce compressor at mmap buffer object 



Introduce compressor object into mmap object so it could be used to
pack the data stream from the corresponding kernel data buffer.
Initialize and make use of the introduced per mmap compressor.

Signed-off-by: default avatarAlexey Bayduraev <alexey.v.bayduraev@linux.intel.com>
Tested-by: default avatarJiri Olsa <jolsa@kernel.org>
Acked-by: default avatarAndi Kleen <ak@linux.intel.com>
Acked-by: default avatarNamhyung Kim <namhyung@gmail.com>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Alexander Antonov <alexander.antonov@linux.intel.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Alexei Budankov <abudankov@huawei.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Riccardo Mancini <rickyman7@gmail.com>
Link: https://lore.kernel.org/r/80edc286cf6543139a7d5a91217605123aa0b50d.1642440724.git.alexey.v.bayduraev@linux.intel.com


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent ae9c7242

tools/perf/builtin-record.c

+11 −7
Original line number Diff line number Diff line
@@ -246,8 +246,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 perf_session *session, struct mmap *map,

			    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,
@@ -381,7 +381,7 @@ 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,

		size = zstd_compress(aio->rec->session, NULL, aio->data + aio->size,

				     mmap__mmap_len(map) - aio->size,

				     buf, size);

	} else {
@@ -608,7 +608,7 @@ static int record__pushfn(struct 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, mmap__mmap_len(map), bf, size);

		size = zstd_compress(rec->session, map, map->data, mmap__mmap_len(map), bf, size);

		bf   = map->data;

	}
@@ -1394,13 +1394,17 @@ 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,

			    void *src, size_t src_size)

static size_t zstd_compress(struct perf_session *session, struct mmap *map,

			    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;

	struct zstd_data *zstd_data = &session->zstd_data;



	compressed = zstd_compress_stream_to_records(&session->zstd_data, dst, dst_size, src, src_size,

	if (map && map->file)

		zstd_data = &map->zstd_data;



	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;

tools/perf/util/mmap.c

+10 −0
Original line number Diff line number Diff line
@@ -230,6 +230,10 @@ void mmap__munmap(struct mmap *map) 
{

	bitmap_free(map->affinity_mask.bits);



#ifndef PYTHON_PERF

	zstd_fini(&map->zstd_data);

#endif



	perf_mmap__aio_munmap(map);

	if (map->data != NULL) {

		munmap(map->data, mmap__mmap_len(map));
@@ -292,6 +296,12 @@ int mmap__mmap(struct mmap *map, struct mmap_params *mp, int fd, struct perf_cpu 
	map->core.flush = mp->flush;



	map->comp_level = mp->comp_level;

#ifndef PYTHON_PERF

	if (zstd_init(&map->zstd_data, map->comp_level)) {

		pr_debug2("failed to init mmap commpressor, error %d\n", errno);

		return -1;

	}

#endif



	if (map->comp_level && !perf_mmap__aio_enabled(map)) {

		map->data = mmap(NULL, mmap__mmap_len(map), PROT_READ|PROT_WRITE,

tools/perf/util/mmap.h

+2 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
#endif

#include "auxtrace.h"

#include "event.h"

#include "util/compress.h"



struct aiocb;
@@ -46,6 +47,7 @@ struct mmap { 
	void		*data;

	int		comp_level;

	struct perf_data_file *file;

	struct zstd_data      zstd_data;

};



struct mmap_params {