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=-21.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,MENTIONS_GIT_HOSTING,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, 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 1E9B0C11F6A for ; Wed, 30 Jun 2021 15:59:28 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 0B730613ED for ; Wed, 30 Jun 2021 15:59:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235894AbhF3QBz (ORCPT ); Wed, 30 Jun 2021 12:01:55 -0400 Received: from mga01.intel.com ([192.55.52.88]:4075 "EHLO mga01.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236152AbhF3QAq (ORCPT ); Wed, 30 Jun 2021 12:00:46 -0400 X-IronPort-AV: E=McAfee;i="6200,9189,10031"; a="230016036" X-IronPort-AV: E=Sophos;i="5.83,312,1616482800"; d="scan'208";a="230016036" Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 30 Jun 2021 08:56:05 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.83,312,1616482800"; d="scan'208";a="559099854" Received: from nntpat99-84.inn.intel.com ([10.125.99.84]) by fmsmga001.fm.intel.com with ESMTP; 30 Jun 2021 08:56:02 -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 , Riccardo Mancini Subject: [PATCH v8 18/22] perf session: Move map/unmap into reader__mmap function Date: Wed, 30 Jun 2021 18:54:57 +0300 Message-Id: <8de124cd5c51110ab0e5d40c7c375c307407bdaf.1625065643.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 Moving mapping and unmapping code into reader__mmap, so the mmap code is located together. Moving head/file_offset computation into reader__mmap function, so all the offset computation is located together and in one place only. Design and implementation are 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 Acked-by: Namhyung Kim Signed-off-by: Alexey Bayduraev --- tools/perf/util/session.c | 60 +++++++++++++++++++++++---------------- 1 file changed, 35 insertions(+), 25 deletions(-) diff --git a/tools/perf/util/session.c b/tools/perf/util/session.c index 578ff304fdb4..f956f078e047 100644 --- a/tools/perf/util/session.c +++ b/tools/perf/util/session.c @@ -2215,14 +2215,11 @@ static int reader__init(struct reader *rd, bool *one_mmap) { struct reader_state *st = &rd->state; - u64 page_offset; char **mmaps = st->mmaps; pr_debug("reader processing %s\n", rd->path); - page_offset = page_size * (rd->data_offset / page_size); - st->file_offset = page_offset; - st->head = rd->data_offset - page_offset; + st->head = rd->data_offset; st->data_size = rd->data_size + rd->data_offset; @@ -2242,15 +2239,12 @@ reader__init(struct reader *rd, bool *one_mmap) } static int -reader__process_events(struct reader *rd, struct perf_session *session, - struct ui_progress *prog) +reader__mmap(struct reader *rd, struct perf_session *session) { struct reader_state *st = &rd->state; - u64 page_offset, size; - int err = 0, mmap_prot, mmap_flags; + int mmap_prot, mmap_flags; char *buf, **mmaps = st->mmaps; - union perf_event *event; - s64 skip; + u64 page_offset; mmap_prot = PROT_READ; mmap_flags = MAP_SHARED; @@ -2261,20 +2255,45 @@ reader__process_events(struct reader *rd, struct perf_session *session, mmap_prot |= PROT_WRITE; mmap_flags = MAP_PRIVATE; } -remap: + + if (mmaps[st->mmap_idx]) { + munmap(mmaps[st->mmap_idx], st->mmap_size); + mmaps[st->mmap_idx] = NULL; + } + + page_offset = page_size * (st->head / page_size); + st->file_offset += page_offset; + st->head -= page_offset; + buf = mmap(NULL, st->mmap_size, mmap_prot, mmap_flags, rd->fd, st->file_offset); if (buf == MAP_FAILED) { pr_err("failed to mmap file\n"); - err = -errno; - goto out; + return -errno; } mmaps[st->mmap_idx] = st->mmap_cur = buf; st->mmap_idx = (st->mmap_idx + 1) & (ARRAY_SIZE(st->mmaps) - 1); st->file_pos = st->file_offset + st->head; + return 0; +} + +static int +reader__process_events(struct reader *rd, struct perf_session *session, + struct ui_progress *prog) +{ + struct reader_state *st = &rd->state; + u64 size; + int err = 0; + union perf_event *event; + s64 skip; + +remap: + err = reader__mmap(rd, session); + if (err) + goto out; if (session->one_mmap) { - session->one_mmap_addr = buf; - session->one_mmap_offset = st->file_offset; + session->one_mmap_addr = rd->state.mmap_cur; + session->one_mmap_offset = rd->state.file_offset; } more: @@ -2283,17 +2302,8 @@ reader__process_events(struct reader *rd, struct perf_session *session, if (IS_ERR(event)) return PTR_ERR(event); - if (!event) { - if (mmaps[st->mmap_idx]) { - munmap(mmaps[st->mmap_idx], st->mmap_size); - mmaps[st->mmap_idx] = NULL; - } - - page_offset = page_size * (st->head / page_size); - st->file_offset += page_offset; - st->head -= page_offset; + if (!event) goto remap; - } session->active_reader = rd; size = event->header.size; -- 2.19.0