perf session: fix decompression of PERF_RECORD_COMPRESSED records
PATCH v3 1/1 perf session: fix decompression of PERF_RECORD_COMPRESSED records
Avoid termination of trace loading in case the last record in the decompressed buffer partly resides in the following mmaped PERF_RECORD_COMPRESSED record. In this case NULL value returned by fetch_mmaped_event() means to proceed to the next mmaped record then decompress it and load compressed events.
The issue can be reproduced like this:
$ perf record -z -- some_long_running_workload $ perf report --stdio -vv decomp (B): 44519 to 163000 decomp (B): 48119 to 174800 decomp (B): 65527 to 131072 fetch_mmaped_event: head=0x1ffe0 event->header_size=0x28, mmap_size=0x20000: fuzzed perf.data? Error: failed to process sample ...
Testing:
71: Zstd perf.data compression/decompression : Ok
$ tools/perf/perf report -vv --stdio decomp (B): 59593 to 262160 decomp (B): 4438 to 16512 decomp (B): 285 to 880 Looking at the vmlinux_path (8 entries long) Using vmlinux for symbols decomp (B): 57474 to 261248 prefetch_event: head=0x3fc78 event->header_size=0x28, mmap_size=0x3fc80: fuzzed or compressed perf.data? decomp (B): 25 to 32 decomp (B): 52 to 120 ...
---
Changes in v3:
- extended debug message with 'fuzzed or compressed perf.data?' Changes in v2:
- avoided static declaration of prefetch_event();
- renamed 'ret' to 'error' for returning in case of split compressed or overlapping records;
- passed only needs_swap quality into fetch_*_event() instead of the whole session object;
--- tools/perf/util/session.c | 44 ++++++++++++++++++++++++--------------- 1 file changed, 27 insertions(+), 17 deletions(-)
tools/perf/util/session.c +27 -17
@@ -1958,8 +1958,8 @@ static int __perf_session__process_pipe_events(struct perf_session *session) }static union perf_event * -fetch_mmaped_event (struct perf_session *session, -u64 head,size_t mmap_size,char *buf) +prefetch_event (char *buf,u64 head,size_t mmap_size, +bool needs_swap,union perf_event *error) {union perf_event *event;
@@ -1971,20 +1971,32 @@ fetch_mmaped_event(struct perf_session *session,return NULL ; event = (union perf_event *)(buf + head); +if (needs_swap) +perf_event_header__bswap (&event->header); -if (session->header.needs_swap) +if (head + event->header.size <= mmap_size) +return event; + +/* We're not fetching the event so swap back again */ +if (needs_swap)perf_event_header__bswap (&event->header); -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 ); - } +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 event; +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 )); +} + +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 ); }static int __perf_session__process_decomp_events (struct perf_session *session)
@@ -1997,10 +2009,8 @@ 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_mmaped_event (session, decomp->head, decomp->size, decomp->data); - -if (IS_ERR (event)) -return PTR_ERR (event); +union perf_event *event =fetch_decomp_event (decomp->head, decomp->size, decomp->data, + session->header.needs_swap);if (!event)break ;
@@ -2100,7 +2110,7 @@ reader__process_events(struct reader *rd, struct perf_session *session, } more: - event =fetch_mmaped_event (session, head, mmap_size, buf); + event =fetch_mmaped_event (head, mmap_size, buf, session->header.needs_swap);if (IS_ERR (event))return PTR_ERR (event);
Signature · 1 line
2.20.1
Quoted 35 lines · Alexey Budankov
Avoid termination of trace loading in case the last record in the decompressed buffer partly resides in the following mmaped
PERF_RECORD_COMPRESSEDrecord. In this case NULL value returned byfetch_mmaped_event()means to proceed to the next mmaped record then decompress it and load compressed events.The issue can be reproduced like this:
$ perf record -z -- some_long_running_workload $ perf report --stdio -vv decomp (B): 44519 to 163000 decomp (B): 48119 to 174800 decomp (B): 65527 to 131072 fetch_mmaped_event: head=0x1ffe0 event->header_size=0x28, mmap_size=0x20000: fuzzed perf.data? Error: failed to process sample ...Testing:
71: Zstd perf.data compression/decompression : Ok
$ tools/perf/perf report -vv --stdio decomp (B): 59593 to 262160 decomp (B): 4438 to 16512 decomp (B): 285 to 880 Looking at the vmlinux_path (8 entries long) Using vmlinux for symbols decomp (B): 57474 to 261248 prefetch_event: head=0x3fc78 event->header_size=0x28, mmap_size=0x3fc80: fuzzed or compressed perf.data? decomp (B): 25 to 32 decomp (B): 52 to 120 ...
Quoted 4 lines
Fixes 57fc032ad643 ("perf session: Avoid infinite loop when seeing invalid header.size")Co-developed-by Jiri Olsa <[email protected]>Signed-off-by Alexey Budankov <[email protected]>
thanks,
jirka
Arnaldo Carvalho de Melo
AppliedEm Tue, Nov 19, 2019 at 09:05:10PM +0100, Jiri Olsa escreveu:
Quoted 36 lines · Alexey Budankov
Quoted 35 lines
Avoid termination of trace loading in case the last record in the decompressed buffer partly resides in the following mmaped
PERF_RECORD_COMPRESSEDrecord. In this case NULL value returned byfetch_mmaped_event()means to proceed to the next mmaped record then decompress it and load compressed events.The issue can be reproduced like this:
$ perf record -z -- some_long_running_workload $ perf report --stdio -vv decomp (B): 44519 to 163000 decomp (B): 48119 to 174800 decomp (B): 65527 to 131072 fetch_mmaped_event: head=0x1ffe0 event->header_size=0x28, mmap_size=0x20000: fuzzed perf.data? Error: failed to process sample ...Testing:
71: Zstd perf.data compression/decompression : Ok
$ tools/perf/perf report -vv --stdio decomp (B): 59593 to 262160 decomp (B): 4438 to 16512 decomp (B): 285 to 880 Looking at the vmlinux_path (8 entries long) Using vmlinux for symbols decomp (B): 57474 to 261248 prefetch_event: head=0x3fc78 event->header_size=0x28, mmap_size=0x3fc80: fuzzed or compressed perf.data? decomp (B): 25 to 32 decomp (B): 52 to 120 ...
Quoted 6 lines
Quoted 4 lines
Fixes 57fc032ad643 ("perf session: Avoid infinite loop when seeing invalid header.size")Co-developed-by Jiri Olsa <[email protected]>Signed-off-by Alexey Budankov <[email protected]>Acked-by Jiri Olsa <[email protected]>
Thanks, applied.
- Arnaldo
Quoted 2 lines
thanks,
jirka
Signature · 1 line
- Arnaldo
[tip: perf/core] perf session: Fix decompression of PERF_RECORD_COMPRESSED records
In reply to Alexey BudankovThe following commit has been merged into the perf/core branch of tip:
The following commit has been merged into the perf/core branch of tip:
Commit-ID: bb1835a3b86c73aa534ef6430ad40223728dfbc0 Gitweb: https://git.kernel.org/tip/bb1835a3b86c73aa534ef6430ad40223728dfbc0 Author: Alexey Budankov <[email protected]> AuthorDate: Mon, 18 Nov 2019 17:21:03 +03:00 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitterDate: Tue, 19 Nov 2019 19:31:55 -03:00
perf session: Fix decompression of PERF_RECORD_COMPRESSED records
Avoid termination of trace loading in case the last record in the decompressed buffer partly resides in the following mmaped PERF_RECORD_COMPRESSED record.
In this case NULL value returned by fetch_mmaped_event() means to proceed to the next mmaped record then decompress it and load compressed events.
The issue can be reproduced like this:
$ perf record -z -- some_long_running_workload $ perf report --stdio -vv decomp (B): 44519 to 163000 decomp (B): 48119 to 174800 decomp (B): 65527 to 131072 fetch_mmaped_event: head=0x1ffe0 event->header_size=0x28, mmap_size=0x20000: fuzzed perf.data? Error: failed to process sample ...
Testing:
71: Zstd perf.data compression/decompression : Ok
$ tools/perf/perf report -vv --stdio decomp (B): 59593 to 262160 decomp (B): 4438 to 16512 decomp (B): 285 to 880 Looking at the vmlinux_path (8 entries long) Using vmlinux for symbols decomp (B): 57474 to 261248 prefetch_event: head=0x3fc78 event->header_size=0x28, mmap_size=0x3fc80: fuzzed or compressed perf.data? decomp (B): 25 to 32 decomp (B): 52 to 120 ...
--- tools/perf/util/session.c | 44 +++++++++++++++++++++++--------------- 1 file changed, 27 insertions(+), 17 deletions(-)
tools/perf/util/session.c +27 -17
@@ -1958,8 +1958,8 @@ out_err: }static union perf_event * -fetch_mmaped_event (struct perf_session *session, -u64 head,size_t mmap_size,char *buf) +prefetch_event (char *buf,u64 head,size_t mmap_size, +bool needs_swap,union perf_event *error) {union perf_event *event;
@@ -1971,20 +1971,32 @@ fetch_mmaped_event(struct perf_session *session,return NULL ; event = (union perf_event *)(buf + head); +if (needs_swap) +perf_event_header__bswap (&event->header); -if (session->header.needs_swap) +if (head + event->header.size <= mmap_size) +return event; + +/* We're not fetching the event so swap back again */ +if (needs_swap)perf_event_header__bswap (&event->header); -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 ); - } +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 event; +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 )); +} + +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 ); }static int __perf_session__process_decomp_events (struct perf_session *session)
@@ -1997,10 +2009,8 @@ 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_mmaped_event (session, decomp->head, decomp->size, decomp->data); - -if (IS_ERR (event)) -return PTR_ERR (event); +union perf_event *event =fetch_decomp_event (decomp->head, decomp->size, decomp->data, + session->header.needs_swap);if (!event)break ;
@@ -2100,7 +2110,7 @@ remap: } more: - event =fetch_mmaped_event (session, head, mmap_size, buf); + event =fetch_mmaped_event (head, mmap_size, buf, session->header.needs_swap);if (IS_ERR (event))return PTR_ERR (event);