perf callchain: Remove unnecessary validation

Now that the sample parsing correctly checks data sizes there is no
reason for it to be done again for callchains.

Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>
Acked-by: Namhyung Kim <namhyung@kernel.org>
Cc: David Ahern <dsahern@gmail.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Namhyung Kim <namhyung@gmail.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lkml.kernel.org/r/1377591794-30553-4-git-send-email-adrian.hunter@intel.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

diff --git a/tools/perf/util/callchain.c b/tools/perf/util/callchain.c
index 4fee33b229b0f8a67b664edbc2f092dc0bc0d235..482f68081cd8d50a7c84fd25845841c18fcfb870 100644 (file)
--- a/tools/perf/util/callchain.c
+++ b/tools/perf/util/callchain.c
@@ -21,14 +21,6 @@
 
 __thread struct callchain_cursor callchain_cursor;
 
-bool ip_callchain__valid(struct ip_callchain *chain,
-                        const union perf_event *event)
-{
-       unsigned int chain_size = event->header.size;
-       chain_size -= (unsigned long)&event->ip.__more_data - (unsigned long)event;
-       return chain->nr * sizeof(u64) <= chain_size;
-}
-
 #define chain_for_each_child(child, parent)    \
        list_for_each_entry(child, &parent->children, siblings)
 

diff --git a/tools/perf/util/callchain.h b/tools/perf/util/callchain.h
index 812d5a0ff2bcf7da3ce89315e6ad130a173adf10..2b585bc308cff6f5f7cdfa1685c469007b0db3b5 100644 (file)
--- a/tools/perf/util/callchain.h
+++ b/tools/perf/util/callchain.h
@@ -109,11 +109,6 @@ int callchain_append(struct callchain_root *root,
 int callchain_merge(struct callchain_cursor *cursor,
                    struct callchain_root *dst, struct callchain_root *src);
 
-struct ip_callchain;
-union perf_event;
-
-bool ip_callchain__valid(struct ip_callchain *chain,
-                        const union perf_event *event);
 /*
  * Initialize a cursor before adding entries inside, but keep
  * the previously allocated entries as a cache.

diff --git a/tools/perf/util/session.c b/tools/perf/util/session.c
index 57b6f38f246a904686c977ae650fa3ad899a5586..07590c3c68b85ec13d0a4174c6ebaafbaea8379e 100644 (file)
--- a/tools/perf/util/session.c
+++ b/tools/perf/util/session.c
@@ -997,22 +997,6 @@ static int perf_session_deliver_event(struct perf_session *session,
        }
 }
 
-static int perf_session__preprocess_sample(struct perf_session *session,
-                                          union perf_event *event, struct perf_sample *sample)
-{
-       if (event->header.type != PERF_RECORD_SAMPLE ||
-           !(perf_evlist__sample_type(session->evlist) & PERF_SAMPLE_CALLCHAIN))
-               return 0;
-
-       if (!ip_callchain__valid(sample->callchain, event)) {
-               pr_debug("call-chain problem with event, skipping it.\n");
-               ++session->stats.nr_invalid_chains;
-               session->stats.total_invalid_chains += sample->period;
-               return -EINVAL;
-       }
-       return 0;
-}
-
 static int perf_session__process_user_event(struct perf_session *session, union perf_event *event,
                                            struct perf_tool *tool, u64 file_offset)
 {
@@ -1075,10 +1059,6 @@ static int perf_session__process_event(struct perf_session *session,
        if (ret)
                return ret;
 
-       /* Preprocess sample records - precheck callchains */
-       if (perf_session__preprocess_sample(session, event, &sample))
-               return 0;
-
        if (tool->ordered_samples) {
                ret = perf_session_queue_event(session, event, &sample,
                                               file_offset);