| commit | 8c5b81d9ac275629a42251f008790d304fc38ca5 | [log] [tgz] |
|---|---|---|
| author | Daniele Di Proietto <ddiproietto@google.com> | Tue May 09 16:10:03 2023 +0000 |
| committer | Cherrypicker Worker <android-build-cherrypicker-worker@google.com> | Wed May 24 10:46:14 2023 +0000 |
| tree | 1b0d990b3fd5266f4f985ccb959d5858309dd9d3 | |
| parent | 85aee3206762ba7fb9e49b569545585ad8061e9f [diff] |
ftrace: Avoid crashing if format doesn't match expectations
Kernel commit 0b04d4c0542e("f2fs: Fix f2fs_truncate_partial_nodes ftrace
event") changed the format of an event in a way that causes perfetto to
hit a PERFETTO_FATAL.
The PERFETTO_FATAL was probably not intentional there, it was added
(probably by mistake) by 6db99a9ca272("Add PERFETTO_DFATAL.").
In any case, perfetto shouldn't crash for an event it doesn't
understand.
Bug: 281660544
(cherry picked from https://android-review.googlesource.com/q/commit:f1ee130d2d4fa37f3c57b4f05019d664ae6523a5)
Merged-In: I20769f4ce47a2af4c90b87e4bfb709468b4568cf
Change-Id: I20769f4ce47a2af4c90b87e4bfb709468b4568cf
diff --git a/src/traced/probes/ftrace/proto_translation_table.cc b/src/traced/probes/ftrace/proto_translation_table.cc index 90aed24..cdc0c0d 100644 --- a/src/traced/probes/ftrace/proto_translation_table.cc +++ b/src/traced/probes/ftrace/proto_translation_table.cc
@@ -124,7 +124,7 @@ if (!InferFtraceType(ftrace_field.type_and_name, ftrace_field.size, ftrace_field.is_signed, &field->ftrace_type)) { - PERFETTO_FATAL( + PERFETTO_DFATAL( "Failed to infer ftrace field type for \"%s.%s\" (type:\"%s\" " "size:%d " "signed:%d)",