From: Jiri Olsa <jolsa@redhat.com>
To: Alexey Bayduraev <alexey.v.bayduraev@linux.intel.com>
Cc: Arnaldo Carvalho de Melo <acme@kernel.org>,
Namhyung Kim <namhyung@kernel.org>,
Alexander Shishkin <alexander.shishkin@linux.intel.com>,
Peter Zijlstra <peterz@infradead.org>,
Ingo Molnar <mingo@redhat.com>,
linux-kernel <linux-kernel@vger.kernel.org>,
Andi Kleen <ak@linux.intel.com>,
Adrian Hunter <adrian.hunter@intel.com>,
Alexander Antonov <alexander.antonov@linux.intel.com>,
Alexei Budankov <abudankov@huawei.com>,
Riccardo Mancini <rickyman7@gmail.com>
Subject: Re: [PATCH 5/6] perf session: Move map/unmap into reader__mmap function
Date: Mon, 4 Oct 2021 15:24:10 +0200 [thread overview]
Message-ID: <YVsAejiXaMAfUHM+@krava> (raw)
In-Reply-To: <212fc917cbc0c26da042c3571c67bf0f4696aba8.1632900802.git.alexey.v.bayduraev@linux.intel.com>
On Wed, Sep 29, 2021 at 11:41:53AM +0300, Alexey Bayduraev wrote:
> 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.
>
> Suggested-by: Jiri Olsa <jolsa@kernel.org>
> Acked-by: Namhyung Kim <namhyung@gmail.com>
> Reviewed-by: Riccardo Mancini <rickyman7@gmail.com>
> Tested-by: Riccardo Mancini <rickyman7@gmail.com>
> Signed-off-by: Alexey Bayduraev <alexey.v.bayduraev@linux.intel.com>
> ---
> 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 85142d2a9a5a..5e08def72b41 100644
> --- a/tools/perf/util/session.c
> +++ b/tools/perf/util/session.c
> @@ -2206,12 +2206,9 @@ static int
> reader__init(struct reader *rd, bool *one_mmap)
> {
> struct reader_state *st = &rd->state;
> - u64 page_offset;
> char **mmaps = st->mmaps;
>
> - 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;
>
extra line, please remove
jirka
> st->data_size = rd->data_size + rd->data_offset;
>
> @@ -2238,15 +2235,12 @@ reader__exit(struct reader *rd)
> }
>
> 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;
> @@ -2257,20 +2251,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:
> @@ -2279,17 +2298,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
>
next prev parent reply other threads:[~2021-10-04 13:26 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-29 8:41 [PATCH 0/6] perf session: Extend reader object to allow multiple readers Alexey Bayduraev
2021-09-29 8:41 ` [PATCH 1/6] perf session: Move reader structure to the top Alexey Bayduraev
2021-09-29 8:41 ` [PATCH 2/6] perf session: Introduce reader_state in reader object Alexey Bayduraev
2021-09-29 8:41 ` [PATCH 3/6] perf session: Introduce decompressor into " Alexey Bayduraev
2021-10-04 13:53 ` Jiri Olsa
2021-09-29 8:41 ` [PATCH 4/6] perf session: Move init/exit into reader__init/reader__exit functions Alexey Bayduraev
2021-09-29 8:41 ` [PATCH 5/6] perf session: Move map/unmap into reader__mmap function Alexey Bayduraev
2021-10-04 13:24 ` Jiri Olsa [this message]
2021-09-29 8:41 ` [PATCH 6/6] perf session: Load single file for analysis Alexey Bayduraev
2021-10-04 13:22 ` Jiri Olsa
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=YVsAejiXaMAfUHM+@krava \
--to=jolsa@redhat.com \
--cc=abudankov@huawei.com \
--cc=acme@kernel.org \
--cc=adrian.hunter@intel.com \
--cc=ak@linux.intel.com \
--cc=alexander.antonov@linux.intel.com \
--cc=alexander.shishkin@linux.intel.com \
--cc=alexey.v.bayduraev@linux.intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=namhyung@kernel.org \
--cc=peterz@infradead.org \
--cc=rickyman7@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox