perf tools: Fix perf record as non root with kptr_restrict == 1

Currently perf record always errors out when you run it as non-root with
kptr_restrict == 1, which is often the default.

Make it only warn instead and fix the kernel resolve code to not
segfault later. Profiling works still fine, except kernel symbols are
not resolved.

Signed-off-by: Andi Kleen <[email protected]>
Cc: Ingo Molnar <[email protected]>
Cc: Jiri Olsa <[email protected]>
Cc: Namhyung Kim <[email protected]>
Cc: Peter Zijlstra <[email protected]>
Link: http://lkml.kernel.org/r/[email protected]
Signed-off-by: Arnaldo Carvalho de Melo <[email protected]>

diff --git a/tools/perf/util/event.c b/tools/perf/util/event.c
index ed558191c0b3030ec9b7b259c9f12eaf8aa78041..4af6b279e34a94881da3e838ff41f407aeb0cbfc 100644 (file)
--- a/tools/perf/util/event.c
+++ b/tools/perf/util/event.c
@@ -558,13 +558,17 @@ int perf_event__synthesize_kernel_mmap(struct perf_tool *tool,
        struct map *map;
        struct kmap *kmap;
        int err;
+       union perf_event *event;
+
+       if (machine->vmlinux_maps[0] == NULL)
+               return -1;
+
        /*
         * We should get this from /sys/kernel/sections/.text, but till that is
         * available use this, and after it is use this as a fallback for older
         * kernels.
         */
-       union perf_event *event = zalloc((sizeof(event->mmap) +
-                                         machine->id_hdr_size));
+       event = zalloc((sizeof(event->mmap) + machine->id_hdr_size));
        if (event == NULL) {
                pr_debug("Not enough memory synthesizing mmap event "
                         "for kernel modules\n");

diff --git a/tools/perf/util/session.c b/tools/perf/util/session.c
index 6d2d50dea1d8114a734d461278e8009652a53b74..883406f4b381c5ebf6d49de5cb4f40f7c5bdeeae 100644 (file)
--- a/tools/perf/util/session.c
+++ b/tools/perf/util/session.c
@@ -119,7 +119,7 @@ struct perf_session *perf_session__new(struct perf_data_file *file,
                 * kernel MMAP event, in perf_event__process_mmap().
                 */
                if (perf_session__create_kernel_maps(session) < 0)
-                       goto out_delete;
+                       pr_warning("Cannot read kernel map\n");
        }
 
        if (tool && tool->ordering_requires_timestamps &&