From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6F6CAC2B9F7 for ; Wed, 26 May 2021 10:53:59 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 43306613F4 for ; Wed, 26 May 2021 10:53:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234342AbhEZKz2 (ORCPT ); Wed, 26 May 2021 06:55:28 -0400 Received: from mga02.intel.com ([134.134.136.20]:1593 "EHLO mga02.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234272AbhEZKzO (ORCPT ); Wed, 26 May 2021 06:55:14 -0400 IronPort-SDR: HrI14UGsRQ8QHoEUK6rAEspw31d6xv9OxWZk0FYXWQtsqJqqE4A1YSFsWbLVnh9929Dg/UM7q8 iTxZIbqBhvmw== X-IronPort-AV: E=McAfee;i="6200,9189,9995"; a="189556440" X-IronPort-AV: E=Sophos;i="5.82,331,1613462400"; d="scan'208";a="189556440" Received: from orsmga007.jf.intel.com ([10.7.209.58]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 May 2021 03:53:39 -0700 IronPort-SDR: 8m8JD15kFu6wPPWV2lDTecdwBAZkD55ZtXp8cJMNhpzlv8HFQHEPrMbSRHLfeW3qKczf0ge8gZ uxYnA/Jw5ULQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.82,331,1613462400"; d="scan'208";a="436079229" Received: from nntpat99-84.inn.intel.com ([10.125.99.84]) by orsmga007.jf.intel.com with ESMTP; 26 May 2021 03:53:36 -0700 From: Alexey Bayduraev To: Arnaldo Carvalho de Melo Cc: Jiri Olsa , Namhyung Kim , Alexander Shishkin , Peter Zijlstra , Ingo Molnar , linux-kernel , Andi Kleen , Adrian Hunter , Alexander Antonov , Alexei Budankov Subject: [PATCH v6 07/20] perf record: Introduce data transferred and compressed stats Date: Wed, 26 May 2021 13:53:00 +0300 Message-Id: <40c7b4fded74959c6ee49656e116b0efc75e0d26.1622025774.git.alexey.v.bayduraev@linux.intel.com> X-Mailer: git-send-email 2.19.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Introduce bytes_transferred and bytes_compressed stats so they would capture statistics for the related data buffer transfers. Acked-by: Andi Kleen Signed-off-by: Alexey Bayduraev --- tools/perf/builtin-record.c | 64 +++++++++++++++++++++++++++++-------- tools/perf/util/mmap.h | 3 ++ 2 files changed, 54 insertions(+), 13 deletions(-) diff --git a/tools/perf/builtin-record.c b/tools/perf/builtin-record.c index a43b96ecea9e..19e4f067b20a 100644 --- a/tools/perf/builtin-record.c +++ b/tools/perf/builtin-record.c @@ -198,6 +198,11 @@ static int record__write(struct record *rec, struct mmap *map __maybe_unused, return -1; } + if (map && map->file) { + map->bytes_written += size; + return 0; + } + rec->bytes_written += size; if (record__output_max_size_exceeded(rec) && !done) { @@ -215,8 +220,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, @@ -350,9 +355,13 @@ 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; + + aio->rec->session->bytes_transferred += size; + size = zstd_compress(zstd_data, + aio->data + aio->size, mmap__mmap_len(map) - aio->size, buf, size); + aio->rec->session->bytes_compressed += size; } else { memcpy(aio->data + aio->size, buf, size); } @@ -577,8 +586,22 @@ 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); + struct zstd_data *zstd_data = &rec->session->zstd_data; + + if (map->file) { + zstd_data = &map->zstd_data; + map->bytes_transferred += size; + } else { + rec->session->bytes_transferred += size; + } + + size = zstd_compress(zstd_data, map->data, mmap__mmap_len(map), bf, size); bf = map->data; + + if (map->file) + map->bytes_compressed += size; + else + rec->session->bytes_compressed += size; } thread->samples++; @@ -1311,18 +1334,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; } @@ -2004,8 +2024,10 @@ static int record__start_threads(struct record *rec) static int record__stop_threads(struct record *rec, unsigned long *waking) { - int t; + int t, tm; + struct mmap *map, *overwrite_map; struct thread_data *thread_data = rec->thread_data; + u64 bytes_written = 0, bytes_transferred = 0, bytes_compressed = 0; for (t = 1; t < rec->nr_threads; t++) record__terminate_thread(&thread_data[t]); @@ -2013,9 +2035,25 @@ static int record__stop_threads(struct record *rec, unsigned long *waking) for (t = 0; t < rec->nr_threads; t++) { rec->samples += thread_data[t].samples; *waking += thread_data[t].waking; - pr_debug("threads[%d]: samples=%lld, wakes=%ld, trasferred=%ld, compressed=%ld\n", + for (tm = 0; tm < thread_data[t].nr_mmaps; tm++) { + if (thread_data[t].maps) { + map = thread_data[t].maps[tm]; + bytes_transferred += map->bytes_transferred; + bytes_compressed += map->bytes_compressed; + bytes_written += map->bytes_written; + } + if (thread_data[t].overwrite_maps) { + overwrite_map = thread_data[t].overwrite_maps[tm]; + bytes_transferred += overwrite_map->bytes_transferred; + bytes_compressed += overwrite_map->bytes_compressed; + bytes_written += overwrite_map->bytes_written; + } + } + rec->session->bytes_transferred += bytes_transferred; + rec->session->bytes_compressed += bytes_compressed; + pr_debug("threads[%d]: samples=%lld, wakes=%ld, trasferred=%ld, compressed=%ld, written=%ld\n", thread_data[t].tid, thread_data[t].samples, thread_data[t].waking, - rec->session->bytes_transferred, rec->session->bytes_compressed); + bytes_transferred, bytes_compressed, bytes_written); } return 0; diff --git a/tools/perf/util/mmap.h b/tools/perf/util/mmap.h index c4aed6e89549..c04ca4b5adf5 100644 --- a/tools/perf/util/mmap.h +++ b/tools/perf/util/mmap.h @@ -46,6 +46,9 @@ struct mmap { int comp_level; struct perf_data_file *file; struct zstd_data zstd_data; + u64 bytes_transferred; + u64 bytes_compressed; + u64 bytes_written; }; struct mmap_params { -- 2.19.0