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.2 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, MENTIONS_GIT_HOSTING,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_SANE_1 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 C5E80C388F9 for ; Wed, 21 Oct 2020 16:01:26 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 6E3DD22283 for ; Wed, 21 Oct 2020 16:01:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2444342AbgJUQBZ (ORCPT ); Wed, 21 Oct 2020 12:01:25 -0400 Received: from mga14.intel.com ([192.55.52.115]:7495 "EHLO mga14.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2444332AbgJUQBY (ORCPT ); Wed, 21 Oct 2020 12:01:24 -0400 IronPort-SDR: GR1VEYtLgg09EALKPQ0muww9qiIsf98yTDNBFCxx7s5gEqyPYxzW4AsBK7pR5DSHHnmXmf3G7S Iki3n0qmnX9g== X-IronPort-AV: E=McAfee;i="6000,8403,9780"; a="166613770" X-IronPort-AV: E=Sophos;i="5.77,401,1596524400"; d="scan'208";a="166613770" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga006.jf.intel.com ([10.7.209.51]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Oct 2020 09:01:23 -0700 IronPort-SDR: 9BWf0sUbyit9xQIup+E1/rCC3/Q0lhPMuvpDb22v63jawrO+KQYTe1RwSm3TGURqZw1Bplfy2p E3HTHJ+MKRVQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.77,401,1596524400"; d="scan'208";a="321056632" Received: from linux.intel.com ([10.54.29.200]) by orsmga006.jf.intel.com with ESMTP; 21 Oct 2020 09:01:23 -0700 Received: from [10.249.231.46] (abudanko-mobl.ccr.corp.intel.com [10.249.231.46]) by linux.intel.com (Postfix) with ESMTP id 7747E580107; Wed, 21 Oct 2020 09:01:20 -0700 (PDT) Subject: [PATCH v2 06/15] perf session: load data directory into tool process memory From: Alexey Budankov To: Arnaldo Carvalho de Melo , Jiri Olsa Cc: Namhyung Kim , Alexander Shishkin , Adrian Hunter , Andi Kleen , Peter Zijlstra , Ingo Molnar , linux-kernel References: <1ec29ed6-0047-d22f-630b-a7f5ccee96b4@linux.intel.com> Organization: Intel Corp. Message-ID: Date: Wed, 21 Oct 2020 19:01:19 +0300 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:68.0) Gecko/20100101 Thunderbird/68.12.1 MIME-Version: 1.0 In-Reply-To: <1ec29ed6-0047-d22f-630b-a7f5ccee96b4@linux.intel.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Read trace files located in data directory into tool process memory. Basic analysis support of data directories is provided for report mode. Raw dump (-D) and aggregated reports are available for data directories, still with no memory consumption optimizations. However data directories collected with --compression-level option enabled can be analyzed with little less memory because trace files are unmaped from tool process memory after loading collected data. The implementation is based on the prototype [1], [2]. [1] git clone https://git.kernel.org/pub/scm/linux/kernel/git/jolsa/perf.git -b perf/record_threads [2] https://lore.kernel.org/lkml/20180913125450.21342-1-jolsa@kernel.org/ Suggested-by: Jiri Olsa Suggested-by: Namhyung Kim Signed-off-by: Alexey Budankov --- tools/perf/util/session.c | 48 +++++++++++++++++++++++++++++++++++++++ tools/perf/util/session.h | 1 + 2 files changed, 49 insertions(+) diff --git a/tools/perf/util/session.c b/tools/perf/util/session.c index 6afc670fdf0c..0752eec19813 100644 --- a/tools/perf/util/session.c +++ b/tools/perf/util/session.c @@ -2212,6 +2212,17 @@ reader__process_events(struct reader *rd, struct perf_session *session, goto more; out: + if (rd->unmap_file) { + int i; + + for (i = 0; i < NUM_MMAPS; i++) { + if (mmaps[i]) { + munmap(mmaps[i], mmap_size); + mmaps[i] = NULL; + } + } + } + return err; } @@ -2231,6 +2242,7 @@ static int __perf_session__process_events(struct perf_session *session) .data_offset = session->header.data_offset, .process = process_simple, .path = session->data->file.path, + .unmap_file = false, }; struct ordered_events *oe = &session->ordered_events; struct perf_tool *tool = session->tool; @@ -2247,6 +2259,42 @@ static int __perf_session__process_events(struct perf_session *session) err = reader__process_events(&rd, session, &prog); if (err) goto out_err; + + if (perf_data__is_dir(session->data)) { + int i, nr = session->data->dir.nr; + struct reader file_rd[nr]; + u64 total_size = perf_data__size(session->data); + + total_size -= session->data->file.size; + ui_progress__init_size(&prog, total_size, "Sorting events..."); + + memset(&file_rd, 0, nr * sizeof(file_rd[0])); + + for (i = 0; i < nr ; i++) { + struct perf_data_file *file; + + file = &session->data->dir.files[i]; + file_rd[i] = (struct reader) { + .fd = file->fd, + .path = file->path, + .data_size = file->size, + .data_offset = 0, + .process = process_simple, + }; + file_rd[i].unmap_file = perf_header__has_feat(&session->header, + HEADER_COMPRESSED); + session->reader = &file_rd[i]; + + if (zstd_init(&(file_rd[i].zstd_data), 0)) + goto out_err; + err = reader__process_events(&file_rd[i], session, &prog); + zstd_fini(&(file_rd[i].zstd_data)); + session->reader = NULL; + if (err) + goto out_err; + } + } + /* do the final flush for ordered samples */ err = ordered_events__flush(oe, OE_FLUSH__FINAL); if (err) diff --git a/tools/perf/util/session.h b/tools/perf/util/session.h index 4fc9ccdf7970..d428f3eaf7fd 100644 --- a/tools/perf/util/session.h +++ b/tools/perf/util/session.h @@ -43,6 +43,7 @@ struct reader { u64 data_offset; reader_cb_t process; struct zstd_data zstd_data; + bool unmap_file; }; struct perf_session { -- 2.24.1