perf tools: Add support for PERF_RECORD_KSYMBOL_TYPE_OOL

PERF_RECORD_KSYMBOL_TYPE_OOL marks an executable page. Create a map
backed only by memory, which will be populated as necessary by text poke
events.

Committer notes:

From the patch:

OOL stands for "Out of line" code such as kprobe-replaced instructions
or optimized kprobes or ftrace trampolines.

Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Borislav Petkov <bp@alien8.de>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Leo Yan <leo.yan@linaro.org>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Masami Hiramatsu <mhiramat@kernel.org>
Cc: Mathieu Poirier <mathieu.poirier@linaro.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Steven Rostedt (VMware) <rostedt@goodmis.org>
Cc: x86@kernel.org
Link: http://lore.kernel.org/lkml/20200512121922.8997-13-adrian.hunter@intel.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

diff --git a/tools/include/uapi/linux/perf_event.h b/tools/include/uapi/linux/perf_event.h
index e5bee6c17b86818b0e058545f61340cf91f385e9..52ca2093831cc7b5010c6e180661937537cf5e69 100644 (file)
--- a/tools/include/uapi/linux/perf_event.h
+++ b/tools/include/uapi/linux/perf_event.h
@@ -1049,6 +1049,11 @@ enum perf_event_type {
 enum perf_record_ksymbol_type {
        PERF_RECORD_KSYMBOL_TYPE_UNKNOWN        = 0,
        PERF_RECORD_KSYMBOL_TYPE_BPF            = 1,
+       /*
+        * Out of line code such as kprobe-replaced instructions or optimized
+        * kprobes or ftrace trampolines.
+        */
+       PERF_RECORD_KSYMBOL_TYPE_OOL            = 2,
        PERF_RECORD_KSYMBOL_TYPE_MAX            /* non-ABI */
 };
 

diff --git a/tools/perf/util/dso.c b/tools/perf/util/dso.c
index 99f0a39c3c596d7635d7f58b41de6b23645ac210..be991cbbe9f89510caf9e5d954799977d6ac79a3 100644 (file)
--- a/tools/perf/util/dso.c
+++ b/tools/perf/util/dso.c
@@ -208,6 +208,7 @@ int dso__read_binary_type_filename(const struct dso *dso,
        case DSO_BINARY_TYPE__JAVA_JIT:
        case DSO_BINARY_TYPE__BPF_PROG_INFO:
        case DSO_BINARY_TYPE__BPF_IMAGE:
+       case DSO_BINARY_TYPE__OOL:
        case DSO_BINARY_TYPE__NOT_FOUND:
                ret = -1;
                break;
@@ -898,6 +899,8 @@ static struct dso_cache *dso_cache__populate(struct dso *dso,
 
        if (dso->binary_type == DSO_BINARY_TYPE__BPF_PROG_INFO)
                *ret = bpf_read(dso, cache_offset, cache->data);
+       else if (dso->binary_type == DSO_BINARY_TYPE__OOL)
+               *ret = DSO__DATA_CACHE_SIZE;
        else
                *ret = file_read(dso, machine, cache_offset, cache->data);
 

diff --git a/tools/perf/util/dso.h b/tools/perf/util/dso.h
index d3d03274b0d1a91b6328cb4d9f700281e1488bc0..31c3a92449388ec4a922d0d507f91da06aba597e 100644 (file)
--- a/tools/perf/util/dso.h
+++ b/tools/perf/util/dso.h
@@ -42,6 +42,7 @@ enum dso_binary_type {
        DSO_BINARY_TYPE__OPENEMBEDDED_DEBUGINFO,
        DSO_BINARY_TYPE__BPF_PROG_INFO,
        DSO_BINARY_TYPE__BPF_IMAGE,
+       DSO_BINARY_TYPE__OOL,
        DSO_BINARY_TYPE__NOT_FOUND,
 };
 

diff --git a/tools/perf/util/machine.c b/tools/perf/util/machine.c
index 1e9fe6b4d8db41bcb67ac5eca699d4178273328a..a818595325715a3a62497b951860210b9270128a 100644 (file)
--- a/tools/perf/util/machine.c
+++ b/tools/perf/util/machine.c
@@ -762,6 +762,12 @@ static int machine__process_ksymbol_register(struct machine *machine,
                        return -ENOMEM;
                }
 
+               if (event->ksymbol.ksym_type == PERF_RECORD_KSYMBOL_TYPE_OOL) {
+                       map->dso->binary_type = DSO_BINARY_TYPE__OOL;
+                       map->dso->data.file_size = event->ksymbol.len;
+                       dso__set_loaded(map->dso);
+               }
+
                map->start = event->ksymbol.addr;
                map->end = map->start + event->ksymbol.len;
                maps__insert(&machine->kmaps, map);

diff --git a/tools/perf/util/map.c b/tools/perf/util/map.c
index 53d96611e6a6ad3d69b7ef18c36d16a0bf92b592..f9dc8c5493ea37b894bc1737b535d11023fb2f8f 100644 (file)
--- a/tools/perf/util/map.c
+++ b/tools/perf/util/map.c
@@ -267,6 +267,11 @@ bool __map__is_bpf_prog(const struct map *map)
        return name && (strstr(name, "bpf_prog_") == name);
 }
 
+bool __map__is_ool(const struct map *map)
+{
+       return map->dso && map->dso->binary_type == DSO_BINARY_TYPE__OOL;
+}
+
 bool map__has_symbols(const struct map *map)
 {
        return dso__has_symbols(map->dso);

diff --git a/tools/perf/util/map.h b/tools/perf/util/map.h
index 067036e8970c8804da2500c911e6da4b86808db2..9e312ae2d656339dfe01e97a2e28ca70fe36d267 100644 (file)
--- a/tools/perf/util/map.h
+++ b/tools/perf/util/map.h
@@ -147,11 +147,12 @@ int map__set_kallsyms_ref_reloc_sym(struct map *map, const char *symbol_name,
 bool __map__is_kernel(const struct map *map);
 bool __map__is_extra_kernel_map(const struct map *map);
 bool __map__is_bpf_prog(const struct map *map);
+bool __map__is_ool(const struct map *map);
 
 static inline bool __map__is_kmodule(const struct map *map)
 {
        return !__map__is_kernel(map) && !__map__is_extra_kernel_map(map) &&
-              !__map__is_bpf_prog(map);
+              !__map__is_bpf_prog(map) && !__map__is_ool(map);
 }
 
 bool map__has_symbols(const struct map *map);

diff --git a/tools/perf/util/symbol.c b/tools/perf/util/symbol.c
index d33d24c61d249a213349b454abceb479d7341ef9..053468ffcb8af5f2a02f130a0f1e82ac472afdba 100644 (file)
--- a/tools/perf/util/symbol.c
+++ b/tools/perf/util/symbol.c
@@ -1565,6 +1565,7 @@ static bool dso__is_compatible_symtab_type(struct dso *dso, bool kmod,
 
        case DSO_BINARY_TYPE__BPF_PROG_INFO:
        case DSO_BINARY_TYPE__BPF_IMAGE:
+       case DSO_BINARY_TYPE__OOL:
        case DSO_BINARY_TYPE__NOT_FOUND:
        default:
                return false;