Received: by 2002:a05:6a10:206:0:0:0:0 with SMTP id 6csp4510574pxj; Tue, 22 Jun 2021 01:45:49 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxpjR8HD7e+nfrnIjyObekW3FyBXUTvhkd5p3d/oVTSU3voBJ5gSCLFnEI9OQWj9sH/5jUt X-Received: by 2002:a05:6402:4242:: with SMTP id g2mr3411407edb.350.1624351548999; Tue, 22 Jun 2021 01:45:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1624351548; cv=none; d=google.com; s=arc-20160816; b=Xx5RTSsRy92k19Wg449/mF1SCHk5ZLiG/J8XwygO4YBLGH9YQSFE7M1iu1xLyngca1 b0RUbs1vfpvxjMxBqoOBwynl0JlsHDPAJQt8gAZgMUH8uXkrqsT1iUdDNeYrB7p71IkB Xf+ldratVA8uJAsFRAsDAjQRQzO7aAoXBtR7Mt5NiYh0gXCtHaV7HlBfwxY3f66dn3Ss AEWyLsVTaIuRFMhPujqkTxMksQI6EiQKeeyZTiD3Hsfg6o9mpc7gwlqhnKGdRMn/EZNp dipw7fwyIxMTa0uhMmuYsstqGhCUcbQ4o6ozQvgkB3hspETeELjXpf0KS4tZdnNzSlOb HAsw== 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 :ironport-sdr:ironport-sdr; bh=cKwpsB+67hMPyhMqbIWgd/Qiorxqi1e4ScCgpOnh2Ck=; b=TEbCjYuXTEBHokH1U+s11oQUrw9pynrwd6+dDgKzlaO0W0MYgOlY70xvLQSksaOuHc MMhv1m6kSYnrDNxhwe9afF7RSfXvGD9vxkkQRSOc/U+r9Vpm8RHCgP8++ZSMQxfzvOed 7PvAn9tUUiVMWOV6Uu4Q7gNOZ3fmIHDFudgN4UrUat/oXjpQ6//0AJVl0zTVswtF8YL5 am+LO3XHNn7DhYGdlGW+ib6kHdmWD79S63VJ2CzlA7bL6L2KkTIS9csP9J9sAC4JYpC6 3mi4cgbiRXigvZTUzF90G7Qit8Cm9bfID9/MPPtXSTXYlI0GMOWZreHTc3fAl1SKp1qJ 1PJQ== 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 m11si608300edd.447.2021.06.22.01.45.26; Tue, 22 Jun 2021 01:45:48 -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 S231281AbhFVIp5 (ORCPT + 99 others); Tue, 22 Jun 2021 04:45:57 -0400 Received: from mga05.intel.com ([192.55.52.43]:57640 "EHLO mga05.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231247AbhFVIpv (ORCPT ); Tue, 22 Jun 2021 04:45:51 -0400 IronPort-SDR: By3JxcW7GHzCoRtg9DR5csHF4w4u3H60hKMdVLetaGpmfZCxQ10/BQttiWGwKV80disnijIi1Q XPinvMmgE+Rg== X-IronPort-AV: E=McAfee;i="6200,9189,10022"; a="292641628" X-IronPort-AV: E=Sophos;i="5.83,291,1616482800"; d="scan'208";a="292641628" Received: from fmsmga007.fm.intel.com ([10.253.24.52]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 22 Jun 2021 01:43:18 -0700 IronPort-SDR: T4NEVcw+XBRgFojlLRKPvSz81oQJ8VuMvcc5YXNcfcM5J+0HoAvOyDZvY0QdHFBLWcARxh8HfX /KF1aceE9Rbg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.83,291,1616482800"; d="scan'208";a="417332658" Received: from nntpat99-84.inn.intel.com ([10.125.99.84]) by fmsmga007.fm.intel.com with ESMTP; 22 Jun 2021 01:43:15 -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 v7 14/20] perf session: Introduce reader_state in reader object Date: Tue, 22 Jun 2021 11:42:23 +0300 Message-Id: <3a17b4cfbf0eba56004409b8178eb88992a71d10.1624350588.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 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 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 6ba7da8c5daa..d9ba87a754be 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 @@ -2175,29 +2187,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; @@ -2209,35 +2220,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; } @@ -2246,9 +2258,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; @@ -2257,8 +2269,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) @@ -2269,7 +2281,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