Messages in this thread | | | Subject | Re: [PATCH v8 06/22] perf record: Introduce data file at mmap buffer object | From | "Bayduraev, Alexey V" <> | Date | Thu, 1 Jul 2021 19:41:18 +0300 |
| |
Hi,
On 30.06.2021 20:23, Arnaldo Carvalho de Melo wrote: > Em Wed, Jun 30, 2021 at 06:54:45PM +0300, Alexey Bayduraev escreveu: >> Introduce data file and compressor objects into mmap object so >> they could be used to process and store data stream from the >> corresponding kernel data buffer. Make use of the introduced >> per mmap file and compressor when they are initialized and >> available. > > So you're introducing even compressed storage in this patchset? To make > it smaller I thought this could be in a followup cset.
These patches were slit by request from Jiri:
Changes in v5: - split patch 06/12 to 06/20 and 07/20
request: https://lore.kernel.org/lkml/YG97LMsttP4VEWPU@krava/
And I'm a bit confused :)
Regards, Alexey
> > - Arnaldo > >> Acked-by: Andi Kleen <ak@linux.intel.com> >> Acked-by: Namhyung Kim <namhyung@gmail.com> >> Signed-off-by: Alexey Bayduraev <alexey.v.bayduraev@linux.intel.com> >> --- >> tools/perf/builtin-record.c | 3 +++ >> tools/perf/util/mmap.c | 6 ++++++ >> tools/perf/util/mmap.h | 3 +++ >> 3 files changed, 12 insertions(+) >> >> diff --git a/tools/perf/builtin-record.c b/tools/perf/builtin-record.c >> index cead2b3c56d7..9b7e7a5dc116 100644 >> --- a/tools/perf/builtin-record.c >> +++ b/tools/perf/builtin-record.c >> @@ -190,6 +190,9 @@ 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; >> 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..c4aed6e89549 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,8 @@ struct mmap { >> struct mmap_cpu_mask affinity_mask; >> void *data; >> int comp_level; >> + struct perf_data_file *file; >> + struct zstd_data zstd_data; >> }; >> >> struct mmap_params { >> -- >> 2.19.0 >> >
| |