From: Petr Malat <oss@malat.biz>
To: linux-kernel@vger.kernel.org
Cc: Petr Malat <oss@malat.biz>, Peter Zijlstra <peterz@infradead.org>,
Ingo Molnar <mingo@redhat.com>,
Arnaldo Carvalho de Melo <acme@kernel.org>,
Mark Rutland <mark.rutland@arm.com>,
Alexander Shishkin <alexander.shishkin@linux.intel.com>,
Jiri Olsa <jolsa@redhat.com>, Namhyung Kim <namhyung@kernel.org>,
Adrian Hunter <adrian.hunter@intel.com>,
Kan Liang <kan.liang@linux.intel.com>,
Alexey Budankov <alexey.budankov@linux.intel.com>
Subject: [PATCH v2 1/3] Revert "perf session: Fix decompression of PERF_RECORD_COMPRESSED records"
Date: Tue, 24 Nov 2020 11:29:15 +0100 [thread overview]
Message-ID: <20201124102919.15312-1-oss@malat.biz> (raw)
In-Reply-To: <20201124095923.3683-1-oss@malat.biz>
Both mmapped and compressed events can be split by the buffer boundary,
it doesn't make sense to handle them differently.
Fixes: bb1835a3b86c ("perf session: Fix decompression of PERF_RECORD_COMPRESSED records")
Fixes: 57fc032ad643 ("perf session: Avoid infinite loop when seeing invalid header.size")
Signed-off-by: Petr Malat <oss@malat.biz>
---
tools/perf/util/session.c | 44 +++++++++++++++------------------------
1 file changed, 17 insertions(+), 27 deletions(-)
diff --git a/tools/perf/util/session.c b/tools/perf/util/session.c
index 098080287c68..0d7a59c1aeb6 100644
--- a/tools/perf/util/session.c
+++ b/tools/perf/util/session.c
@@ -2038,8 +2038,8 @@ static int __perf_session__process_pipe_events(struct perf_session *session)
}
static union perf_event *
-prefetch_event(char *buf, u64 head, size_t mmap_size,
- bool needs_swap, union perf_event *error)
+fetch_mmaped_event(struct perf_session *session,
+ u64 head, size_t mmap_size, char *buf)
{
union perf_event *event;
@@ -2051,32 +2051,20 @@ prefetch_event(char *buf, u64 head, size_t mmap_size,
return NULL;
event = (union perf_event *)(buf + head);
- if (needs_swap)
- perf_event_header__bswap(&event->header);
-
- if (head + event->header.size <= mmap_size)
- return event;
- /* We're not fetching the event so swap back again */
- if (needs_swap)
+ if (session->header.needs_swap)
perf_event_header__bswap(&event->header);
- pr_debug("%s: head=%#" PRIx64 " event->header_size=%#x, mmap_size=%#zx:"
- " fuzzed or compressed perf.data?\n",__func__, head, event->header.size, mmap_size);
-
- return error;
-}
-
-static union perf_event *
-fetch_mmaped_event(u64 head, size_t mmap_size, char *buf, bool needs_swap)
-{
- return prefetch_event(buf, head, mmap_size, needs_swap, ERR_PTR(-EINVAL));
-}
+ if (head + event->header.size > mmap_size) {
+ /* We're not fetching the event so swap back again */
+ if (session->header.needs_swap)
+ perf_event_header__bswap(&event->header);
+ pr_debug("%s: head=%#" PRIx64 " event->header_size=%#x, mmap_size=%#zx: fuzzed perf.data?\n",
+ __func__, head, event->header.size, mmap_size);
+ return ERR_PTR(-EINVAL);
+ }
-static union perf_event *
-fetch_decomp_event(u64 head, size_t mmap_size, char *buf, bool needs_swap)
-{
- return prefetch_event(buf, head, mmap_size, needs_swap, NULL);
+ return event;
}
static int __perf_session__process_decomp_events(struct perf_session *session)
@@ -2089,8 +2077,10 @@ static int __perf_session__process_decomp_events(struct perf_session *session)
return 0;
while (decomp->head < decomp->size && !session_done()) {
- union perf_event *event = fetch_decomp_event(decomp->head, decomp->size, decomp->data,
- session->header.needs_swap);
+ union perf_event *event = fetch_mmaped_event(session, decomp->head, decomp->size, decomp->data);
+
+ if (IS_ERR(event))
+ return PTR_ERR(event);
if (!event)
break;
@@ -2190,7 +2180,7 @@ reader__process_events(struct reader *rd, struct perf_session *session,
}
more:
- event = fetch_mmaped_event(head, mmap_size, buf, session->header.needs_swap);
+ event = fetch_mmaped_event(session, head, mmap_size, buf);
if (IS_ERR(event))
return PTR_ERR(event);
--
2.20.1
next prev parent reply other threads:[~2020-11-24 10:29 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-24 9:59 [PATCH 1/3] Revert "perf session: Fix decompression of PERF_RECORD_COMPRESSED records" Petr Malat
2020-11-24 9:59 ` [PATCH 2/3] Revert "perf session: Avoid infinite loop when seeing invalid header.size" Petr Malat
2020-11-24 9:59 ` [PATCH 3/3] perf session: Avoid infinite loop if an event is truncated Petr Malat
2020-11-24 10:21 ` Petr Malat
2020-11-24 10:29 ` Petr Malat [this message]
2020-11-24 10:29 ` [PATCH v2 2/3] Revert "perf session: Avoid infinite loop when seeing invalid header.size" Petr Malat
2020-11-24 10:29 ` [PATCH v2 3/3] perf session: Avoid infinite loop if an event is truncated Petr Malat
2020-11-24 14:36 ` [PATCH v2 1/3] Revert "perf session: Fix decompression of PERF_RECORD_COMPRESSED records" Jiri Olsa
2020-11-24 18:15 ` Petr Malat
2020-11-30 11:40 ` Petr Malat
2020-12-01 19:09 ` Jiri Olsa
2020-12-01 21:04 ` Alexei Budankov
2020-12-01 21:28 ` Alexei Budankov
2020-12-02 14:04 ` Bayduraev, Alexey V
2020-12-02 14:18 ` Alexei Budankov
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=20201124102919.15312-1-oss@malat.biz \
--to=oss@malat.biz \
--cc=acme@kernel.org \
--cc=adrian.hunter@intel.com \
--cc=alexander.shishkin@linux.intel.com \
--cc=alexey.budankov@linux.intel.com \
--cc=jolsa@redhat.com \
--cc=kan.liang@linux.intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=mingo@redhat.com \
--cc=namhyung@kernel.org \
--cc=peterz@infradead.org \
/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;
as well as URLs for NNTP newsgroup(s).