Received: by 2002:a05:6a10:1d13:0:0:0:0 with SMTP id pp19csp1014804pxb; Tue, 17 Aug 2021 01:29:47 -0700 (PDT) X-Google-Smtp-Source: ABdhPJym5K5BOw/pPogrfzhiItLa1YNw6Yhj3Dw67FZAKa1CZa+Hjmf5h4ltpQSGK1o4/a+zWnER X-Received: by 2002:aa7:cc02:: with SMTP id q2mr2834910edt.154.1629188987669; Tue, 17 Aug 2021 01:29:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1629188987; cv=none; d=google.com; s=arc-20160816; b=wlsfE4EsMIK9TIIM00XJRVPBEYDJiNpxUCNIOxjwBzoOQChN8nl1aCb3ZbdzV6Qj5b 7uXaixnom09jxj8fhI90oWE0u/bWaVxzZMhmiOKrmTbhkG/UrDN6wGOXzx7YGtA1kFrh PERpPyaYb4j2dtquFx06GFQW04Xep0yWKSqyLpglTj8j3iCm5FzdmPMzSXc355qUKtKW xAoC7+qhUhW6NITmc+yx88Nn/LG+tGCWJlvhweQ69OyAFwpv/Wa8T4rPH2hJhS7x7ewu P8ZKvqXUjf+FJ2+CZYk9Nh0V+9ug6vPToid7bFCKP2sYE4oaQjrxYC/Cvm/Bc2xw6Uuy zRig== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=ZGfh1YwCyPHm6T7M4R8vOEa1pw6DIKLU3i1FADEqeoI=; b=fW8/5g/ZdBscR0HxG5+cD/JAdYf5rAOHZ44HQlG6oqLClBQns/PfCrm4O3735zLo7N 0nQBep3qosJsuE0QFhy0HBmT7RFOqLq+BMUOVRfDH6SEo3M0SlFQIDWbNi0a9ZGUIqlE bB7CgR3RhiQf8jYdYQQwwKzpAU8e4PbzQAnJ8utK0PpN+ujwA1KJbP/O/LyA0hvmZYBP G7r2gF8fJHyhhXdgVPGK8XxoB97KRkz393lvuXmSkAQvzD/JtVbANcocRBBGg6RdkiuN rbCFViGhzXSlMTO1/bxpa3sdsQuxdOpZS/p5GcwgO42YPyFKPcHGyBEuxlX4Uhp/wAVP efFA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id bs11si1691265ejb.438.2021.08.17.01.29.24; Tue, 17 Aug 2021 01:29:47 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239505AbhHQIZa (ORCPT + 99 others); Tue, 17 Aug 2021 04:25:30 -0400 Received: from mga04.intel.com ([192.55.52.120]:18138 "EHLO mga04.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239344AbhHQIZB (ORCPT ); Tue, 17 Aug 2021 04:25:01 -0400 X-IronPort-AV: E=McAfee;i="6200,9189,10078"; a="214171943" X-IronPort-AV: E=Sophos;i="5.84,328,1620716400"; d="scan'208";a="214171943" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Aug 2021 01:24:28 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.84,328,1620716400"; d="scan'208";a="471080414" Received: from nntpat99-84.inn.intel.com ([10.125.99.84]) by orsmga008.jf.intel.com with ESMTP; 17 Aug 2021 01:24:25 -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 v11 18/24] perf session: Introduce reader_state in reader object Date: Tue, 17 Aug 2021 11:23:21 +0300 Message-Id: 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 We need all the state info about reader in separate object to load data from multiple files, so we can keep multiple readers at the same time. Adding struct reader_state and adding all items that need to be kept. 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 Reviewed-by: Riccardo Mancini Tested-by: Riccardo Mancini Signed-off-by: Alexey Bayduraev --- tools/perf/util/session.c | 74 +++++++++++++++++++++++---------------- 1 file changed, 43 insertions(+), 31 deletions(-) diff --git a/tools/perf/util/session.c b/tools/perf/util/session.c index fe7d986cb094..a82204d4c4d6 100644 --- a/tools/perf/util/session.c +++ b/tools/perf/util/session.c @@ -55,6 +55,17 @@ typedef s64 (*reader_cb_t)(struct perf_session *session, u64 file_offset, const char *file_path); +struct reader_state { + char *mmaps[NUM_MMAPS]; + size_t mmap_size; + int mmap_idx; + char *mmap_cur; + u64 file_pos; + u64 file_offset; + u64 data_size; + u64 head; +}; + struct reader { int fd; const char *path; @@ -62,6 +73,7 @@ struct reader { u64 data_offset; reader_cb_t process; bool in_place_update; + struct reader_state state; }; #ifdef HAVE_ZSTD_SUPPORT @@ -2180,29 +2192,28 @@ static int reader__process_events(struct reader *rd, struct perf_session *session, struct ui_progress *prog) { - u64 data_size = rd->data_size; - u64 head, page_offset, file_offset, file_pos, size; - int err = 0, mmap_prot, mmap_flags, map_idx = 0; - size_t mmap_size; - char *buf, *mmaps[NUM_MMAPS]; + struct reader_state *st = &rd->state; + u64 page_offset, size; + int err = 0, mmap_prot, mmap_flags; + char *buf, **mmaps = st->mmaps; union perf_event *event; s64 skip; page_offset = page_size * (rd->data_offset / page_size); - file_offset = page_offset; - head = rd->data_offset - page_offset; + st->file_offset = page_offset; + st->head = rd->data_offset - page_offset; - ui_progress__init_size(prog, data_size, "Processing events..."); + ui_progress__init_size(prog, rd->data_size, "Processing events..."); - data_size += rd->data_offset; + st->data_size = rd->data_size + rd->data_offset; - mmap_size = MMAP_SIZE; - if (mmap_size > data_size) { - mmap_size = data_size; + st->mmap_size = MMAP_SIZE; + if (st->mmap_size > st->data_size) { + st->mmap_size = st->data_size; session->one_mmap = true; } - memset(mmaps, 0, sizeof(mmaps)); + memset(mmaps, 0, sizeof(st->mmaps)); mmap_prot = PROT_READ; mmap_flags = MAP_SHARED; @@ -2214,35 +2225,36 @@ reader__process_events(struct reader *rd, struct perf_session *session, mmap_flags = MAP_PRIVATE; } remap: - buf = mmap(NULL, mmap_size, mmap_prot, mmap_flags, rd->fd, - file_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; } - mmaps[map_idx] = buf; - map_idx = (map_idx + 1) & (ARRAY_SIZE(mmaps) - 1); - file_pos = file_offset + head; + 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; if (session->one_mmap) { session->one_mmap_addr = buf; - session->one_mmap_offset = file_offset; + session->one_mmap_offset = st->file_offset; } more: - event = fetch_mmaped_event(head, mmap_size, buf, session->header.needs_swap); + event = fetch_mmaped_event(st->head, st->mmap_size, st->mmap_cur, + session->header.needs_swap); if (IS_ERR(event)) return PTR_ERR(event); if (!event) { - if (mmaps[map_idx]) { - munmap(mmaps[map_idx], mmap_size); - mmaps[map_idx] = NULL; + if (mmaps[st->mmap_idx]) { + munmap(mmaps[st->mmap_idx], st->mmap_size); + mmaps[st->mmap_idx] = NULL; } - page_offset = page_size * (head / page_size); - file_offset += page_offset; - head -= page_offset; + page_offset = page_size * (st->head / page_size); + st->file_offset += page_offset; + st->head -= page_offset; goto remap; } @@ -2251,9 +2263,9 @@ reader__process_events(struct reader *rd, struct perf_session *session, skip = -EINVAL; if (size < sizeof(struct perf_event_header) || - (skip = rd->process(session, event, file_pos, rd->path)) < 0) { + (skip = rd->process(session, event, st->file_pos, rd->path)) < 0) { pr_err("%#" PRIx64 " [%s] [%#x]: failed to process type: %d [%s]\n", - file_offset + head, rd->path, event->header.size, + st->file_offset + st->head, rd->path, event->header.size, event->header.type, strerror(-skip)); err = skip; goto out; @@ -2262,8 +2274,8 @@ reader__process_events(struct reader *rd, struct perf_session *session, if (skip) size += skip; - head += size; - file_pos += size; + st->head += size; + st->file_pos += size; err = __perf_session__process_decomp_events(session); if (err) @@ -2274,7 +2286,7 @@ reader__process_events(struct reader *rd, struct perf_session *session, if (session_done()) goto out; - if (file_pos < data_size) + if (st->file_pos < st->data_size) goto more; out: -- 2.19.0