From: Stefano Sanfilippo Date: Thu, 13 Oct 2016 10:59:38 +0000 (-0700) Subject: perf jit: Make perf skip unknown records X-Git-Tag: v4.10-rc1~190^2~12^2~17 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=7354ec7a86c0cc03bebb7f86af8f20a88b27c262;p=karo-tx-linux.git perf jit: Make perf skip unknown records The behavior before this commit was to skip the remaining portion of the jitdump in case an unknown record was found, including those records that perf could handle. With this change, parsing a record with an unknown id will cause a warning to be emitted, the record will be skipped and parsing will resume from the next (valid) one. The patch aims at making perf more future proof, by extracting as much information as possible from jitdumps. Signed-off-by: Stefano Sanfilippo Signed-off-by: Ross McIlroy Reviewed-by: Stephane Eranian Cc: Anton Blanchard Cc: Jiri Olsa Cc: Namhyung Kim Cc: Peter Zijlstra Link: http://lkml.kernel.org/r/1476356383-30100-5-git-send-email-eranian@google.com Signed-off-by: Arnaldo Carvalho de Melo --- diff --git a/tools/perf/util/jitdump.c b/tools/perf/util/jitdump.c index f3ed3c963c71..75b66bbf8429 100644 --- a/tools/perf/util/jitdump.c +++ b/tools/perf/util/jitdump.c @@ -263,8 +263,7 @@ jit_get_next_entry(struct jit_buf_desc *jd) return NULL; if (id >= JIT_CODE_MAX) { - pr_warning("next_entry: unknown prefix %d, skipping\n", id); - return NULL; + pr_warning("next_entry: unknown record type %d, skipping\n", id); } if (bs > jd->bufsize) { void *n; @@ -322,7 +321,8 @@ jit_get_next_entry(struct jit_buf_desc *jd) break; case JIT_CODE_MAX: default: - return NULL; + /* skip unknown record (we have read them) */ + break; } return jr; }