License cleanup: add SPDX GPL-2.0 license identifier to files with no license
Many source files in the tree are missing licensing information, which
makes it harder for compliance tools to determine the correct license.
By default all files without license information are under the default
license of the kernel, which is GPL version 2.
Update the files which contain no license information with the 'GPL-2.0'
SPDX license identifier. The SPDX identifier is a legally binding
shorthand, which can be used instead of the full boiler plate text.
This patch is based on work done by Thomas Gleixner and Kate Stewart and
Philippe Ombredanne.
How this work was done:
Patches were generated and checked against linux-4.14-rc6 for a subset of
the use cases:
- file had no licensing information it it.
- file was a */uapi/* one with no licensing information in it,
- file was a */uapi/* one with existing licensing information,
Further patches will be generated in subsequent months to fix up cases
where non-standard license headers were used, and references to license
had to be inferred by heuristics based on keywords.
The analysis to determine which SPDX License Identifier to be applied to
a file was done in a spreadsheet of side by side results from of the
output of two independent scanners (ScanCode & Windriver) producing SPDX
tag:value files created by Philippe Ombredanne. Philippe prepared the
base worksheet, and did an initial spot review of a few 1000 files.
The 4.13 kernel was the starting point of the analysis with 60,537 files
assessed. Kate Stewart did a file by file comparison of the scanner
results in the spreadsheet to determine which SPDX license identifier(s)
to be applied to the file. She confirmed any determination that was not
immediately clear with lawyers working with the Linux Foundation.
Criteria used to select files for SPDX license identifier tagging was:
- Files considered eligible had to be source code files.
- Make and config files were included as candidates if they contained >5
lines of source
- File already had some variant of a license header in it (even if <5
lines).
All documentation files were explicitly excluded.
The following heuristics were used to determine which SPDX license
identifiers to apply.
- when both scanners couldn't find any license traces, file was
considered to have no license information in it, and the top level
COPYING file license applied.
For non */uapi/* files that summary was:
SPDX license identifier # files
---------------------------------------------------|-------
GPL-2.0 11139
and resulted in the first patch in this series.
If that file was a */uapi/* path one, it was "GPL-2.0 WITH
Linux-syscall-note" otherwise it was "GPL-2.0". Results of that was:
SPDX license identifier # files
---------------------------------------------------|-------
GPL-2.0 WITH Linux-syscall-note 930
and resulted in the second patch in this series.
- if a file had some form of licensing information in it, and was one
of the */uapi/* ones, it was denoted with the Linux-syscall-note if
any GPL family license was found in the file or had no licensing in
it (per prior point). Results summary:
SPDX license identifier # files
---------------------------------------------------|------
GPL-2.0 WITH Linux-syscall-note 270
GPL-2.0+ WITH Linux-syscall-note 169
((GPL-2.0 WITH Linux-syscall-note) OR BSD-2-Clause) 21
((GPL-2.0 WITH Linux-syscall-note) OR BSD-3-Clause) 17
LGPL-2.1+ WITH Linux-syscall-note 15
GPL-1.0+ WITH Linux-syscall-note 14
((GPL-2.0+ WITH Linux-syscall-note) OR BSD-3-Clause) 5
LGPL-2.0+ WITH Linux-syscall-note 4
LGPL-2.1 WITH Linux-syscall-note 3
((GPL-2.0 WITH Linux-syscall-note) OR MIT) 3
((GPL-2.0 WITH Linux-syscall-note) AND MIT) 1
and that resulted in the third patch in this series.
- when the two scanners agreed on the detected license(s), that became
the concluded license(s).
- when there was disagreement between the two scanners (one detected a
license but the other didn't, or they both detected different
licenses) a manual inspection of the file occurred.
- In most cases a manual inspection of the information in the file
resulted in a clear resolution of the license that should apply (and
which scanner probably needed to revisit its heuristics).
- When it was not immediately clear, the license identifier was
confirmed with lawyers working with the Linux Foundation.
- If there was any question as to the appropriate license identifier,
the file was flagged for further research and to be revisited later
in time.
In total, over 70 hours of logged manual review was done on the
spreadsheet to determine the SPDX license identifiers to apply to the
source files by Kate, Philippe, Thomas and, in some cases, confirmation
by lawyers working with the Linux Foundation.
Kate also obtained a third independent scan of the 4.13 code base from
FOSSology, and compared selected files where the other two scanners
disagreed against that SPDX file, to see if there was new insights. The
Windriver scanner is based on an older version of FOSSology in part, so
they are related.
Thomas did random spot checks in about 500 files from the spreadsheets
for the uapi headers and agreed with SPDX license identifier in the
files he inspected. For the non-uapi files Thomas did random spot checks
in about 15000 files.
In initial set of patches against 4.14-rc6, 3 files were found to have
copy/paste license identifier errors, and have been fixed to reflect the
correct identifier.
Additionally Philippe spent 10 hours this week doing a detailed manual
inspection and review of the 12,461 patched files from the initial patch
version early this week with:
- a full scancode scan run, collecting the matched texts, detected
license ids and scores
- reviewing anything where there was a license detected (about 500+
files) to ensure that the applied SPDX license was correct
- reviewing anything where there was no detection but the patch license
was not GPL-2.0 WITH Linux-syscall-note to ensure that the applied
SPDX license was correct
This produced a worksheet with 20 files needing minor correction. This
worksheet was then exported into 3 different .csv files for the
different types of files to be modified.
These .csv files were then reviewed by Greg. Thomas wrote a script to
parse the csv files and add the proper SPDX tag to the file, in the
format that the file expected. This script was further refined by Greg
based on the output to detect more types of files automatically and to
distinguish between header and source .c files (which need different
comment types.) Finally Greg ran the script using the .csv files to
generate the patches.
Reviewed-by: Kate Stewart <kstewart@linuxfoundation.org>
Reviewed-by: Philippe Ombredanne <pombredanne@nexb.com>
Reviewed-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2017-11-01 22:07:57 +08:00
|
|
|
// SPDX-License-Identifier: GPL-2.0
|
2009-08-12 17:07:25 +08:00
|
|
|
#include "symbol.h"
|
2010-03-26 23:11:06 +08:00
|
|
|
#include <errno.h>
|
2011-01-23 06:37:02 +08:00
|
|
|
#include <inttypes.h>
|
2010-03-26 06:58:58 +08:00
|
|
|
#include <limits.h>
|
2009-08-12 17:07:25 +08:00
|
|
|
#include <stdlib.h>
|
|
|
|
#include <string.h>
|
|
|
|
#include <stdio.h>
|
2010-04-19 13:32:50 +08:00
|
|
|
#include <unistd.h>
|
2016-09-13 03:47:57 +08:00
|
|
|
#include <uapi/linux/mman.h> /* To get things like MAP_HUGETLB even on older libc headers */
|
2010-03-26 06:58:58 +08:00
|
|
|
#include "map.h"
|
2012-07-21 07:25:47 +08:00
|
|
|
#include "thread.h"
|
2012-09-11 00:50:19 +08:00
|
|
|
#include "vdso.h"
|
2012-10-28 05:18:28 +08:00
|
|
|
#include "build-id.h"
|
2013-12-06 15:42:57 +08:00
|
|
|
#include "util.h"
|
2014-07-15 05:46:47 +08:00
|
|
|
#include "debug.h"
|
2014-07-22 21:17:53 +08:00
|
|
|
#include "machine.h"
|
2013-01-25 09:16:43 +08:00
|
|
|
#include <linux/string.h>
|
2017-04-18 03:30:49 +08:00
|
|
|
#include "srcline.h"
|
2017-07-06 09:48:08 +08:00
|
|
|
#include "namespaces.h"
|
2016-07-04 20:16:23 +08:00
|
|
|
#include "unwind.h"
|
2009-08-12 17:07:25 +08:00
|
|
|
|
2015-05-23 00:45:24 +08:00
|
|
|
static void __maps__insert(struct maps *maps, struct map *map);
|
|
|
|
|
2010-02-23 03:15:39 +08:00
|
|
|
const char *map_type__name[MAP__NR_TYPES] = {
|
|
|
|
[MAP__FUNCTION] = "Functions",
|
|
|
|
[MAP__VARIABLE] = "Variables",
|
|
|
|
};
|
|
|
|
|
2016-09-06 12:58:27 +08:00
|
|
|
static inline int is_anon_memory(const char *filename, u32 flags)
|
2009-08-12 17:07:25 +08:00
|
|
|
{
|
2016-09-13 03:47:57 +08:00
|
|
|
return flags & MAP_HUGETLB ||
|
2016-09-06 12:58:27 +08:00
|
|
|
!strcmp(filename, "//anon") ||
|
2015-11-26 19:42:32 +08:00
|
|
|
!strncmp(filename, "/dev/zero", sizeof("/dev/zero") - 1) ||
|
|
|
|
!strncmp(filename, "/anon_hugepage", sizeof("/anon_hugepage") - 1);
|
2009-08-12 17:07:25 +08:00
|
|
|
}
|
|
|
|
|
2011-08-24 21:18:34 +08:00
|
|
|
static inline int is_no_dso_memory(const char *filename)
|
|
|
|
{
|
2012-11-07 15:27:11 +08:00
|
|
|
return !strncmp(filename, "[stack", 6) ||
|
2014-08-20 10:31:14 +08:00
|
|
|
!strncmp(filename, "/SYSV",5) ||
|
2011-08-24 21:18:34 +08:00
|
|
|
!strcmp(filename, "[heap]");
|
|
|
|
}
|
|
|
|
|
2014-05-20 17:48:50 +08:00
|
|
|
static inline int is_android_lib(const char *filename)
|
|
|
|
{
|
|
|
|
return !strncmp(filename, "/data/app-lib", 13) ||
|
|
|
|
!strncmp(filename, "/system/lib", 11);
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline bool replace_android_lib(const char *filename, char *newfilename)
|
|
|
|
{
|
|
|
|
const char *libname;
|
|
|
|
char *app_abi;
|
|
|
|
size_t app_abi_length, new_length;
|
|
|
|
size_t lib_length = 0;
|
|
|
|
|
|
|
|
libname = strrchr(filename, '/');
|
|
|
|
if (libname)
|
|
|
|
lib_length = strlen(libname);
|
|
|
|
|
|
|
|
app_abi = getenv("APP_ABI");
|
|
|
|
if (!app_abi)
|
|
|
|
return false;
|
|
|
|
|
|
|
|
app_abi_length = strlen(app_abi);
|
|
|
|
|
|
|
|
if (!strncmp(filename, "/data/app-lib", 13)) {
|
|
|
|
char *apk_path;
|
|
|
|
|
|
|
|
if (!app_abi_length)
|
|
|
|
return false;
|
|
|
|
|
|
|
|
new_length = 7 + app_abi_length + lib_length;
|
|
|
|
|
|
|
|
apk_path = getenv("APK_PATH");
|
|
|
|
if (apk_path) {
|
|
|
|
new_length += strlen(apk_path) + 1;
|
|
|
|
if (new_length > PATH_MAX)
|
|
|
|
return false;
|
|
|
|
snprintf(newfilename, new_length,
|
|
|
|
"%s/libs/%s/%s", apk_path, app_abi, libname);
|
|
|
|
} else {
|
|
|
|
if (new_length > PATH_MAX)
|
|
|
|
return false;
|
|
|
|
snprintf(newfilename, new_length,
|
|
|
|
"libs/%s/%s", app_abi, libname);
|
|
|
|
}
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!strncmp(filename, "/system/lib/", 11)) {
|
|
|
|
char *ndk, *app;
|
|
|
|
const char *arch;
|
|
|
|
size_t ndk_length;
|
|
|
|
size_t app_length;
|
|
|
|
|
|
|
|
ndk = getenv("NDK_ROOT");
|
|
|
|
app = getenv("APP_PLATFORM");
|
|
|
|
|
|
|
|
if (!(ndk && app))
|
|
|
|
return false;
|
|
|
|
|
|
|
|
ndk_length = strlen(ndk);
|
|
|
|
app_length = strlen(app);
|
|
|
|
|
|
|
|
if (!(ndk_length && app_length && app_abi_length))
|
|
|
|
return false;
|
|
|
|
|
|
|
|
arch = !strncmp(app_abi, "arm", 3) ? "arm" :
|
|
|
|
!strncmp(app_abi, "mips", 4) ? "mips" :
|
|
|
|
!strncmp(app_abi, "x86", 3) ? "x86" : NULL;
|
|
|
|
|
|
|
|
if (!arch)
|
|
|
|
return false;
|
|
|
|
|
|
|
|
new_length = 27 + ndk_length +
|
|
|
|
app_length + lib_length
|
|
|
|
+ strlen(arch);
|
|
|
|
|
|
|
|
if (new_length > PATH_MAX)
|
|
|
|
return false;
|
|
|
|
snprintf(newfilename, new_length,
|
|
|
|
"%s/platforms/%s/arch-%s/usr/lib/%s",
|
|
|
|
ndk, app, arch, libname);
|
|
|
|
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
2013-01-25 08:59:59 +08:00
|
|
|
void map__init(struct map *map, enum map_type type,
|
2009-11-28 02:29:16 +08:00
|
|
|
u64 start, u64 end, u64 pgoff, struct dso *dso)
|
2009-10-31 02:28:23 +08:00
|
|
|
{
|
2013-01-25 08:59:59 +08:00
|
|
|
map->type = type;
|
|
|
|
map->start = start;
|
|
|
|
map->end = end;
|
|
|
|
map->pgoff = pgoff;
|
2014-01-29 22:14:36 +08:00
|
|
|
map->reloc = 0;
|
2015-06-02 22:53:26 +08:00
|
|
|
map->dso = dso__get(dso);
|
2013-01-25 08:59:59 +08:00
|
|
|
map->map_ip = map__map_ip;
|
|
|
|
map->unmap_ip = map__unmap_ip;
|
|
|
|
RB_CLEAR_NODE(&map->rb_node);
|
|
|
|
map->groups = NULL;
|
|
|
|
map->erange_warned = false;
|
2017-02-21 23:34:59 +08:00
|
|
|
refcount_set(&map->refcnt, 1);
|
2009-10-31 02:28:23 +08:00
|
|
|
}
|
|
|
|
|
2014-07-22 21:17:53 +08:00
|
|
|
struct map *map__new(struct machine *machine, u64 start, u64 len,
|
2017-07-06 09:48:09 +08:00
|
|
|
u64 pgoff, u32 d_maj, u32 d_min, u64 ino,
|
2014-05-20 03:13:49 +08:00
|
|
|
u64 ino_gen, u32 prot, u32 flags, char *filename,
|
2014-07-22 21:18:00 +08:00
|
|
|
enum map_type type, struct thread *thread)
|
2009-08-12 17:07:25 +08:00
|
|
|
{
|
2013-01-25 08:59:59 +08:00
|
|
|
struct map *map = malloc(sizeof(*map));
|
2017-07-06 09:48:09 +08:00
|
|
|
struct nsinfo *nsi = NULL;
|
|
|
|
struct nsinfo *nnsi;
|
2009-08-12 17:07:25 +08:00
|
|
|
|
2013-01-25 08:59:59 +08:00
|
|
|
if (map != NULL) {
|
2009-08-12 17:07:25 +08:00
|
|
|
char newfilename[PATH_MAX];
|
2009-10-31 02:28:23 +08:00
|
|
|
struct dso *dso;
|
2014-05-20 17:48:50 +08:00
|
|
|
int anon, no_dso, vdso, android;
|
2009-08-12 17:07:25 +08:00
|
|
|
|
2014-05-20 17:48:50 +08:00
|
|
|
android = is_android_lib(filename);
|
2016-09-06 12:58:27 +08:00
|
|
|
anon = is_anon_memory(filename, flags);
|
2012-09-11 00:50:19 +08:00
|
|
|
vdso = is_vdso_map(filename);
|
2011-08-24 21:18:34 +08:00
|
|
|
no_dso = is_no_dso_memory(filename);
|
2009-08-12 17:07:25 +08:00
|
|
|
|
2013-08-21 18:10:25 +08:00
|
|
|
map->maj = d_maj;
|
|
|
|
map->min = d_min;
|
|
|
|
map->ino = ino;
|
|
|
|
map->ino_generation = ino_gen;
|
2014-05-20 03:13:49 +08:00
|
|
|
map->prot = prot;
|
|
|
|
map->flags = flags;
|
2017-07-06 09:48:09 +08:00
|
|
|
nsi = nsinfo__get(thread->nsinfo);
|
2013-08-21 18:10:25 +08:00
|
|
|
|
2017-07-06 09:48:09 +08:00
|
|
|
if ((anon || no_dso) && nsi && type == MAP__FUNCTION) {
|
|
|
|
snprintf(newfilename, sizeof(newfilename),
|
|
|
|
"/tmp/perf-%d.map", nsi->pid);
|
2009-08-12 17:07:25 +08:00
|
|
|
filename = newfilename;
|
|
|
|
}
|
|
|
|
|
2014-05-20 17:48:50 +08:00
|
|
|
if (android) {
|
|
|
|
if (replace_android_lib(filename, newfilename))
|
|
|
|
filename = newfilename;
|
|
|
|
}
|
|
|
|
|
2012-09-11 00:50:19 +08:00
|
|
|
if (vdso) {
|
2017-07-06 09:48:09 +08:00
|
|
|
/* The vdso maps are always on the host and not the
|
|
|
|
* container. Ensure that we don't use setns to look
|
|
|
|
* them up.
|
|
|
|
*/
|
|
|
|
nnsi = nsinfo__copy(nsi);
|
|
|
|
if (nnsi) {
|
|
|
|
nsinfo__put(nsi);
|
|
|
|
nnsi->need_setns = false;
|
|
|
|
nsi = nnsi;
|
|
|
|
}
|
2012-09-11 00:50:19 +08:00
|
|
|
pgoff = 0;
|
perf machine: Fix up vdso methods names
To make it consistent with the other dso lifetime routines.
For instance:
struct dso *vdso__new(struct machine *machine, const char *short_name,
const char *long_name)
Becomes:
struct dso *machine__addnew_vdso(struct machine *machine, const
char *short_name, const char *long_name)
Because:
1) There is no 'struct vdso' for us to have vdso__ prefixed routines.
2) Because it will not really just create a new instance of 'struct
dso', it'll call dso__new() but it will also insert it into the
DSO's list/rbtree, and we have a method name for that: 'addnew',
just like we have dsos__addnew().
3) So it is really a 'struct machine' operation, it is the first
argument, etc.
This way the place where this is used gets consistent:
if (vdso) {
pgoff = 0;
- dso = vdso__dso_findnew(machine, thread);
+ dso = machine__findnew_vdso(machine, thread);
} else
dso = machine__findnew_dso(machine, filename);
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Link: http://lkml.kernel.org/n/tip-r3w3tvh8exm9xfz3p4tz9qbz@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2015-05-29 22:54:08 +08:00
|
|
|
dso = machine__findnew_vdso(machine, thread);
|
2012-09-11 00:50:19 +08:00
|
|
|
} else
|
2015-05-29 22:31:12 +08:00
|
|
|
dso = machine__findnew_dso(machine, filename);
|
2012-09-11 00:50:19 +08:00
|
|
|
|
2009-10-31 02:28:23 +08:00
|
|
|
if (dso == NULL)
|
2009-08-12 17:07:25 +08:00
|
|
|
goto out_delete;
|
|
|
|
|
2013-01-25 08:59:59 +08:00
|
|
|
map__init(map, type, start, start + len, pgoff, dso);
|
2009-10-31 02:28:23 +08:00
|
|
|
|
2011-08-24 21:18:34 +08:00
|
|
|
if (anon || no_dso) {
|
2013-01-25 08:59:59 +08:00
|
|
|
map->map_ip = map->unmap_ip = identity__map_ip;
|
2011-08-24 21:18:34 +08:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Set memory without DSO as loaded. All map__find_*
|
|
|
|
* functions still return NULL, and we avoid the
|
|
|
|
* unnecessary map__load warning.
|
|
|
|
*/
|
2014-01-16 09:49:31 +08:00
|
|
|
if (type != MAP__FUNCTION)
|
2013-01-25 08:59:59 +08:00
|
|
|
dso__set_loaded(dso, map->type);
|
2010-02-04 02:52:02 +08:00
|
|
|
}
|
2017-07-06 09:48:09 +08:00
|
|
|
dso->nsinfo = nsi;
|
2015-06-02 22:53:26 +08:00
|
|
|
dso__put(dso);
|
2009-08-12 17:07:25 +08:00
|
|
|
}
|
2013-01-25 08:59:59 +08:00
|
|
|
return map;
|
2009-08-12 17:07:25 +08:00
|
|
|
out_delete:
|
2017-07-06 09:48:09 +08:00
|
|
|
nsinfo__put(nsi);
|
2013-01-25 08:59:59 +08:00
|
|
|
free(map);
|
2009-08-12 17:07:25 +08:00
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2012-08-06 12:41:20 +08:00
|
|
|
/*
|
|
|
|
* Constructor variant for modules (where we know from /proc/modules where
|
|
|
|
* they are loaded) and for vmlinux, where only after we load all the
|
|
|
|
* symbols we'll know where it starts and ends.
|
|
|
|
*/
|
|
|
|
struct map *map__new2(u64 start, struct dso *dso, enum map_type type)
|
|
|
|
{
|
|
|
|
struct map *map = calloc(1, (sizeof(*map) +
|
|
|
|
(dso->kernel ? sizeof(struct kmap) : 0)));
|
|
|
|
if (map != NULL) {
|
|
|
|
/*
|
|
|
|
* ->end will be filled after we load all the symbols
|
|
|
|
*/
|
|
|
|
map__init(map, type, start, 0, 0, dso);
|
|
|
|
}
|
|
|
|
|
|
|
|
return map;
|
|
|
|
}
|
|
|
|
|
2015-07-23 22:06:16 +08:00
|
|
|
/*
|
|
|
|
* Use this and __map__is_kmodule() for map instances that are in
|
|
|
|
* machine->kmaps, and thus have map->groups->machine all properly set, to
|
|
|
|
* disambiguate between the kernel and modules.
|
|
|
|
*
|
|
|
|
* When the need arises, introduce map__is_{kernel,kmodule)() that
|
|
|
|
* checks (map->groups != NULL && map->groups->machine != NULL &&
|
|
|
|
* map->dso->kernel) before calling __map__is_{kernel,kmodule}())
|
|
|
|
*/
|
|
|
|
bool __map__is_kernel(const struct map *map)
|
|
|
|
{
|
2015-09-30 22:54:04 +08:00
|
|
|
return __machine__kernel_map(map->groups->machine, map->type) == map;
|
2015-07-23 22:06:16 +08:00
|
|
|
}
|
|
|
|
|
2018-04-24 04:13:49 +08:00
|
|
|
bool map__has_symbols(const struct map *map)
|
|
|
|
{
|
|
|
|
return dso__has_symbols(map->dso, map->type);
|
|
|
|
}
|
|
|
|
|
2015-06-02 22:53:26 +08:00
|
|
|
static void map__exit(struct map *map)
|
2009-11-21 06:51:27 +08:00
|
|
|
{
|
2015-05-26 02:30:09 +08:00
|
|
|
BUG_ON(!RB_EMPTY_NODE(&map->rb_node));
|
2015-06-02 22:53:26 +08:00
|
|
|
dso__zput(map->dso);
|
|
|
|
}
|
|
|
|
|
|
|
|
void map__delete(struct map *map)
|
|
|
|
{
|
|
|
|
map__exit(map);
|
2013-01-25 08:59:59 +08:00
|
|
|
free(map);
|
2009-11-21 06:51:27 +08:00
|
|
|
}
|
|
|
|
|
2015-05-26 03:59:56 +08:00
|
|
|
void map__put(struct map *map)
|
|
|
|
{
|
2017-02-21 23:34:59 +08:00
|
|
|
if (map && refcount_dec_and_test(&map->refcnt))
|
2015-05-26 03:59:56 +08:00
|
|
|
map__delete(map);
|
|
|
|
}
|
|
|
|
|
2013-01-25 08:59:59 +08:00
|
|
|
void map__fixup_start(struct map *map)
|
2009-11-21 06:51:27 +08:00
|
|
|
{
|
2013-01-25 08:59:59 +08:00
|
|
|
struct rb_root *symbols = &map->dso->symbols[map->type];
|
2009-11-24 23:01:52 +08:00
|
|
|
struct rb_node *nd = rb_first(symbols);
|
2009-11-21 06:51:27 +08:00
|
|
|
if (nd != NULL) {
|
|
|
|
struct symbol *sym = rb_entry(nd, struct symbol, rb_node);
|
2013-01-25 08:59:59 +08:00
|
|
|
map->start = sym->start;
|
2009-11-21 06:51:27 +08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2013-01-25 08:59:59 +08:00
|
|
|
void map__fixup_end(struct map *map)
|
2009-11-21 06:51:27 +08:00
|
|
|
{
|
2013-01-25 08:59:59 +08:00
|
|
|
struct rb_root *symbols = &map->dso->symbols[map->type];
|
2009-11-24 23:01:52 +08:00
|
|
|
struct rb_node *nd = rb_last(symbols);
|
2009-11-21 06:51:27 +08:00
|
|
|
if (nd != NULL) {
|
|
|
|
struct symbol *sym = rb_entry(nd, struct symbol, rb_node);
|
2013-01-25 08:59:59 +08:00
|
|
|
map->end = sym->end;
|
2009-11-21 06:51:27 +08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2009-10-31 02:28:25 +08:00
|
|
|
#define DSO__DELETED "(deleted)"
|
|
|
|
|
2016-09-02 06:25:52 +08:00
|
|
|
int map__load(struct map *map)
|
2009-10-29 07:51:21 +08:00
|
|
|
{
|
2013-01-25 08:59:59 +08:00
|
|
|
const char *name = map->dso->long_name;
|
2009-12-15 23:32:33 +08:00
|
|
|
int nr;
|
perf symbols: Allow lookups by symbol name too
Configurable via symbol_conf.sort_by_name, so that the cost of an
extra rb_node on all 'struct symbol' instances is not paid by tools
that only want to decode addresses.
How to use it:
symbol_conf.sort_by_name = true;
symbol_init(&symbol_conf);
struct map *map = map_groups__find_by_name(kmaps, MAP__VARIABLE, "[kernel.kallsyms]");
if (map == NULL) {
pr_err("couldn't find map!\n");
kernel_maps__fprintf(stdout);
} else {
struct symbol *sym = map__find_symbol_by_name(map, sym_filter, NULL);
if (sym == NULL)
pr_err("couldn't find symbol %s!\n", sym_filter);
else
pr_info("symbol %s: %#Lx-%#Lx \n", sym_filter, sym->start, sym->end);
}
Looking over the vmlinux/kallsyms is common enough that I'll add a
variable to the upcoming struct perf_session to avoid the need to
use map_groups__find_by_name to get the main vmlinux/kallsyms map.
The above example looks on the 'variable' symtab, but it is just
like that for the functions one.
Also the sort operation is done when we first use
map__find_symbol_by_name, in a lazy way.
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Frédéric Weisbecker <fweisbec@gmail.com>
Cc: Masami Hiramatsu <mhiramat@redhat.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Paul Mackerras <paulus@samba.org>
LKML-Reference: <1260564622-12392-1-git-send-email-acme@infradead.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
2009-12-12 04:50:22 +08:00
|
|
|
|
2013-01-25 08:59:59 +08:00
|
|
|
if (dso__loaded(map->dso, map->type))
|
2009-12-15 23:32:33 +08:00
|
|
|
return 0;
|
|
|
|
|
2016-09-02 06:25:52 +08:00
|
|
|
nr = dso__load(map->dso, map);
|
perf symbols: Allow lookups by symbol name too
Configurable via symbol_conf.sort_by_name, so that the cost of an
extra rb_node on all 'struct symbol' instances is not paid by tools
that only want to decode addresses.
How to use it:
symbol_conf.sort_by_name = true;
symbol_init(&symbol_conf);
struct map *map = map_groups__find_by_name(kmaps, MAP__VARIABLE, "[kernel.kallsyms]");
if (map == NULL) {
pr_err("couldn't find map!\n");
kernel_maps__fprintf(stdout);
} else {
struct symbol *sym = map__find_symbol_by_name(map, sym_filter, NULL);
if (sym == NULL)
pr_err("couldn't find symbol %s!\n", sym_filter);
else
pr_info("symbol %s: %#Lx-%#Lx \n", sym_filter, sym->start, sym->end);
}
Looking over the vmlinux/kallsyms is common enough that I'll add a
variable to the upcoming struct perf_session to avoid the need to
use map_groups__find_by_name to get the main vmlinux/kallsyms map.
The above example looks on the 'variable' symtab, but it is just
like that for the functions one.
Also the sort operation is done when we first use
map__find_symbol_by_name, in a lazy way.
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Frédéric Weisbecker <fweisbec@gmail.com>
Cc: Masami Hiramatsu <mhiramat@redhat.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Paul Mackerras <paulus@samba.org>
LKML-Reference: <1260564622-12392-1-git-send-email-acme@infradead.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
2009-12-12 04:50:22 +08:00
|
|
|
if (nr < 0) {
|
2013-01-25 08:59:59 +08:00
|
|
|
if (map->dso->has_build_id) {
|
2016-05-11 21:51:59 +08:00
|
|
|
char sbuild_id[SBUILD_ID_SIZE];
|
perf symbols: Allow lookups by symbol name too
Configurable via symbol_conf.sort_by_name, so that the cost of an
extra rb_node on all 'struct symbol' instances is not paid by tools
that only want to decode addresses.
How to use it:
symbol_conf.sort_by_name = true;
symbol_init(&symbol_conf);
struct map *map = map_groups__find_by_name(kmaps, MAP__VARIABLE, "[kernel.kallsyms]");
if (map == NULL) {
pr_err("couldn't find map!\n");
kernel_maps__fprintf(stdout);
} else {
struct symbol *sym = map__find_symbol_by_name(map, sym_filter, NULL);
if (sym == NULL)
pr_err("couldn't find symbol %s!\n", sym_filter);
else
pr_info("symbol %s: %#Lx-%#Lx \n", sym_filter, sym->start, sym->end);
}
Looking over the vmlinux/kallsyms is common enough that I'll add a
variable to the upcoming struct perf_session to avoid the need to
use map_groups__find_by_name to get the main vmlinux/kallsyms map.
The above example looks on the 'variable' symtab, but it is just
like that for the functions one.
Also the sort operation is done when we first use
map__find_symbol_by_name, in a lazy way.
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Frédéric Weisbecker <fweisbec@gmail.com>
Cc: Masami Hiramatsu <mhiramat@redhat.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Paul Mackerras <paulus@samba.org>
LKML-Reference: <1260564622-12392-1-git-send-email-acme@infradead.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
2009-12-12 04:50:22 +08:00
|
|
|
|
2013-01-25 08:59:59 +08:00
|
|
|
build_id__sprintf(map->dso->build_id,
|
|
|
|
sizeof(map->dso->build_id),
|
perf symbols: Allow lookups by symbol name too
Configurable via symbol_conf.sort_by_name, so that the cost of an
extra rb_node on all 'struct symbol' instances is not paid by tools
that only want to decode addresses.
How to use it:
symbol_conf.sort_by_name = true;
symbol_init(&symbol_conf);
struct map *map = map_groups__find_by_name(kmaps, MAP__VARIABLE, "[kernel.kallsyms]");
if (map == NULL) {
pr_err("couldn't find map!\n");
kernel_maps__fprintf(stdout);
} else {
struct symbol *sym = map__find_symbol_by_name(map, sym_filter, NULL);
if (sym == NULL)
pr_err("couldn't find symbol %s!\n", sym_filter);
else
pr_info("symbol %s: %#Lx-%#Lx \n", sym_filter, sym->start, sym->end);
}
Looking over the vmlinux/kallsyms is common enough that I'll add a
variable to the upcoming struct perf_session to avoid the need to
use map_groups__find_by_name to get the main vmlinux/kallsyms map.
The above example looks on the 'variable' symtab, but it is just
like that for the functions one.
Also the sort operation is done when we first use
map__find_symbol_by_name, in a lazy way.
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Frédéric Weisbecker <fweisbec@gmail.com>
Cc: Masami Hiramatsu <mhiramat@redhat.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Paul Mackerras <paulus@samba.org>
LKML-Reference: <1260564622-12392-1-git-send-email-acme@infradead.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
2009-12-12 04:50:22 +08:00
|
|
|
sbuild_id);
|
|
|
|
pr_warning("%s with build id %s not found",
|
|
|
|
name, sbuild_id);
|
|
|
|
} else
|
|
|
|
pr_warning("Failed to open %s", name);
|
|
|
|
|
|
|
|
pr_warning(", continuing without symbols\n");
|
|
|
|
return -1;
|
|
|
|
} else if (nr == 0) {
|
2013-09-30 18:07:11 +08:00
|
|
|
#ifdef HAVE_LIBELF_SUPPORT
|
perf symbols: Allow lookups by symbol name too
Configurable via symbol_conf.sort_by_name, so that the cost of an
extra rb_node on all 'struct symbol' instances is not paid by tools
that only want to decode addresses.
How to use it:
symbol_conf.sort_by_name = true;
symbol_init(&symbol_conf);
struct map *map = map_groups__find_by_name(kmaps, MAP__VARIABLE, "[kernel.kallsyms]");
if (map == NULL) {
pr_err("couldn't find map!\n");
kernel_maps__fprintf(stdout);
} else {
struct symbol *sym = map__find_symbol_by_name(map, sym_filter, NULL);
if (sym == NULL)
pr_err("couldn't find symbol %s!\n", sym_filter);
else
pr_info("symbol %s: %#Lx-%#Lx \n", sym_filter, sym->start, sym->end);
}
Looking over the vmlinux/kallsyms is common enough that I'll add a
variable to the upcoming struct perf_session to avoid the need to
use map_groups__find_by_name to get the main vmlinux/kallsyms map.
The above example looks on the 'variable' symtab, but it is just
like that for the functions one.
Also the sort operation is done when we first use
map__find_symbol_by_name, in a lazy way.
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Frédéric Weisbecker <fweisbec@gmail.com>
Cc: Masami Hiramatsu <mhiramat@redhat.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Paul Mackerras <paulus@samba.org>
LKML-Reference: <1260564622-12392-1-git-send-email-acme@infradead.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
2009-12-12 04:50:22 +08:00
|
|
|
const size_t len = strlen(name);
|
|
|
|
const size_t real_len = len - sizeof(DSO__DELETED);
|
|
|
|
|
|
|
|
if (len > sizeof(DSO__DELETED) &&
|
|
|
|
strcmp(name + real_len + 1, DSO__DELETED) == 0) {
|
2011-10-19 08:44:45 +08:00
|
|
|
pr_warning("%.*s was updated (is prelink enabled?). "
|
|
|
|
"Restart the long running apps that use it!\n",
|
perf symbols: Allow lookups by symbol name too
Configurable via symbol_conf.sort_by_name, so that the cost of an
extra rb_node on all 'struct symbol' instances is not paid by tools
that only want to decode addresses.
How to use it:
symbol_conf.sort_by_name = true;
symbol_init(&symbol_conf);
struct map *map = map_groups__find_by_name(kmaps, MAP__VARIABLE, "[kernel.kallsyms]");
if (map == NULL) {
pr_err("couldn't find map!\n");
kernel_maps__fprintf(stdout);
} else {
struct symbol *sym = map__find_symbol_by_name(map, sym_filter, NULL);
if (sym == NULL)
pr_err("couldn't find symbol %s!\n", sym_filter);
else
pr_info("symbol %s: %#Lx-%#Lx \n", sym_filter, sym->start, sym->end);
}
Looking over the vmlinux/kallsyms is common enough that I'll add a
variable to the upcoming struct perf_session to avoid the need to
use map_groups__find_by_name to get the main vmlinux/kallsyms map.
The above example looks on the 'variable' symtab, but it is just
like that for the functions one.
Also the sort operation is done when we first use
map__find_symbol_by_name, in a lazy way.
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Frédéric Weisbecker <fweisbec@gmail.com>
Cc: Masami Hiramatsu <mhiramat@redhat.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Paul Mackerras <paulus@samba.org>
LKML-Reference: <1260564622-12392-1-git-send-email-acme@infradead.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
2009-12-12 04:50:22 +08:00
|
|
|
(int)real_len, name);
|
|
|
|
} else {
|
|
|
|
pr_warning("no symbols found in %s, maybe install "
|
|
|
|
"a debug package?\n", name);
|
2009-10-29 07:51:21 +08:00
|
|
|
}
|
2012-08-06 12:41:21 +08:00
|
|
|
#endif
|
perf symbols: Allow lookups by symbol name too
Configurable via symbol_conf.sort_by_name, so that the cost of an
extra rb_node on all 'struct symbol' instances is not paid by tools
that only want to decode addresses.
How to use it:
symbol_conf.sort_by_name = true;
symbol_init(&symbol_conf);
struct map *map = map_groups__find_by_name(kmaps, MAP__VARIABLE, "[kernel.kallsyms]");
if (map == NULL) {
pr_err("couldn't find map!\n");
kernel_maps__fprintf(stdout);
} else {
struct symbol *sym = map__find_symbol_by_name(map, sym_filter, NULL);
if (sym == NULL)
pr_err("couldn't find symbol %s!\n", sym_filter);
else
pr_info("symbol %s: %#Lx-%#Lx \n", sym_filter, sym->start, sym->end);
}
Looking over the vmlinux/kallsyms is common enough that I'll add a
variable to the upcoming struct perf_session to avoid the need to
use map_groups__find_by_name to get the main vmlinux/kallsyms map.
The above example looks on the 'variable' symtab, but it is just
like that for the functions one.
Also the sort operation is done when we first use
map__find_symbol_by_name, in a lazy way.
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Frédéric Weisbecker <fweisbec@gmail.com>
Cc: Masami Hiramatsu <mhiramat@redhat.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Paul Mackerras <paulus@samba.org>
LKML-Reference: <1260564622-12392-1-git-send-email-acme@infradead.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
2009-12-12 04:50:22 +08:00
|
|
|
return -1;
|
2009-10-29 07:51:21 +08:00
|
|
|
}
|
|
|
|
|
perf symbols: Allow lookups by symbol name too
Configurable via symbol_conf.sort_by_name, so that the cost of an
extra rb_node on all 'struct symbol' instances is not paid by tools
that only want to decode addresses.
How to use it:
symbol_conf.sort_by_name = true;
symbol_init(&symbol_conf);
struct map *map = map_groups__find_by_name(kmaps, MAP__VARIABLE, "[kernel.kallsyms]");
if (map == NULL) {
pr_err("couldn't find map!\n");
kernel_maps__fprintf(stdout);
} else {
struct symbol *sym = map__find_symbol_by_name(map, sym_filter, NULL);
if (sym == NULL)
pr_err("couldn't find symbol %s!\n", sym_filter);
else
pr_info("symbol %s: %#Lx-%#Lx \n", sym_filter, sym->start, sym->end);
}
Looking over the vmlinux/kallsyms is common enough that I'll add a
variable to the upcoming struct perf_session to avoid the need to
use map_groups__find_by_name to get the main vmlinux/kallsyms map.
The above example looks on the 'variable' symtab, but it is just
like that for the functions one.
Also the sort operation is done when we first use
map__find_symbol_by_name, in a lazy way.
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Frédéric Weisbecker <fweisbec@gmail.com>
Cc: Masami Hiramatsu <mhiramat@redhat.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Paul Mackerras <paulus@samba.org>
LKML-Reference: <1260564622-12392-1-git-send-email-acme@infradead.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
2009-12-12 04:50:22 +08:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2016-09-02 06:25:52 +08:00
|
|
|
struct symbol *map__find_symbol(struct map *map, u64 addr)
|
perf symbols: Allow lookups by symbol name too
Configurable via symbol_conf.sort_by_name, so that the cost of an
extra rb_node on all 'struct symbol' instances is not paid by tools
that only want to decode addresses.
How to use it:
symbol_conf.sort_by_name = true;
symbol_init(&symbol_conf);
struct map *map = map_groups__find_by_name(kmaps, MAP__VARIABLE, "[kernel.kallsyms]");
if (map == NULL) {
pr_err("couldn't find map!\n");
kernel_maps__fprintf(stdout);
} else {
struct symbol *sym = map__find_symbol_by_name(map, sym_filter, NULL);
if (sym == NULL)
pr_err("couldn't find symbol %s!\n", sym_filter);
else
pr_info("symbol %s: %#Lx-%#Lx \n", sym_filter, sym->start, sym->end);
}
Looking over the vmlinux/kallsyms is common enough that I'll add a
variable to the upcoming struct perf_session to avoid the need to
use map_groups__find_by_name to get the main vmlinux/kallsyms map.
The above example looks on the 'variable' symtab, but it is just
like that for the functions one.
Also the sort operation is done when we first use
map__find_symbol_by_name, in a lazy way.
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Frédéric Weisbecker <fweisbec@gmail.com>
Cc: Masami Hiramatsu <mhiramat@redhat.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Paul Mackerras <paulus@samba.org>
LKML-Reference: <1260564622-12392-1-git-send-email-acme@infradead.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
2009-12-12 04:50:22 +08:00
|
|
|
{
|
2016-09-02 06:25:52 +08:00
|
|
|
if (map__load(map) < 0)
|
perf symbols: Allow lookups by symbol name too
Configurable via symbol_conf.sort_by_name, so that the cost of an
extra rb_node on all 'struct symbol' instances is not paid by tools
that only want to decode addresses.
How to use it:
symbol_conf.sort_by_name = true;
symbol_init(&symbol_conf);
struct map *map = map_groups__find_by_name(kmaps, MAP__VARIABLE, "[kernel.kallsyms]");
if (map == NULL) {
pr_err("couldn't find map!\n");
kernel_maps__fprintf(stdout);
} else {
struct symbol *sym = map__find_symbol_by_name(map, sym_filter, NULL);
if (sym == NULL)
pr_err("couldn't find symbol %s!\n", sym_filter);
else
pr_info("symbol %s: %#Lx-%#Lx \n", sym_filter, sym->start, sym->end);
}
Looking over the vmlinux/kallsyms is common enough that I'll add a
variable to the upcoming struct perf_session to avoid the need to
use map_groups__find_by_name to get the main vmlinux/kallsyms map.
The above example looks on the 'variable' symtab, but it is just
like that for the functions one.
Also the sort operation is done when we first use
map__find_symbol_by_name, in a lazy way.
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Frédéric Weisbecker <fweisbec@gmail.com>
Cc: Masami Hiramatsu <mhiramat@redhat.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Paul Mackerras <paulus@samba.org>
LKML-Reference: <1260564622-12392-1-git-send-email-acme@infradead.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
2009-12-12 04:50:22 +08:00
|
|
|
return NULL;
|
|
|
|
|
2018-04-26 04:46:28 +08:00
|
|
|
return __dso__find_symbol(map->dso, map->type, addr);
|
2009-10-29 07:51:21 +08:00
|
|
|
}
|
|
|
|
|
2016-09-02 06:25:52 +08:00
|
|
|
struct symbol *map__find_symbol_by_name(struct map *map, const char *name)
|
perf symbols: Allow lookups by symbol name too
Configurable via symbol_conf.sort_by_name, so that the cost of an
extra rb_node on all 'struct symbol' instances is not paid by tools
that only want to decode addresses.
How to use it:
symbol_conf.sort_by_name = true;
symbol_init(&symbol_conf);
struct map *map = map_groups__find_by_name(kmaps, MAP__VARIABLE, "[kernel.kallsyms]");
if (map == NULL) {
pr_err("couldn't find map!\n");
kernel_maps__fprintf(stdout);
} else {
struct symbol *sym = map__find_symbol_by_name(map, sym_filter, NULL);
if (sym == NULL)
pr_err("couldn't find symbol %s!\n", sym_filter);
else
pr_info("symbol %s: %#Lx-%#Lx \n", sym_filter, sym->start, sym->end);
}
Looking over the vmlinux/kallsyms is common enough that I'll add a
variable to the upcoming struct perf_session to avoid the need to
use map_groups__find_by_name to get the main vmlinux/kallsyms map.
The above example looks on the 'variable' symtab, but it is just
like that for the functions one.
Also the sort operation is done when we first use
map__find_symbol_by_name, in a lazy way.
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Frédéric Weisbecker <fweisbec@gmail.com>
Cc: Masami Hiramatsu <mhiramat@redhat.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Paul Mackerras <paulus@samba.org>
LKML-Reference: <1260564622-12392-1-git-send-email-acme@infradead.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
2009-12-12 04:50:22 +08:00
|
|
|
{
|
2016-09-02 06:25:52 +08:00
|
|
|
if (map__load(map) < 0)
|
perf symbols: Allow lookups by symbol name too
Configurable via symbol_conf.sort_by_name, so that the cost of an
extra rb_node on all 'struct symbol' instances is not paid by tools
that only want to decode addresses.
How to use it:
symbol_conf.sort_by_name = true;
symbol_init(&symbol_conf);
struct map *map = map_groups__find_by_name(kmaps, MAP__VARIABLE, "[kernel.kallsyms]");
if (map == NULL) {
pr_err("couldn't find map!\n");
kernel_maps__fprintf(stdout);
} else {
struct symbol *sym = map__find_symbol_by_name(map, sym_filter, NULL);
if (sym == NULL)
pr_err("couldn't find symbol %s!\n", sym_filter);
else
pr_info("symbol %s: %#Lx-%#Lx \n", sym_filter, sym->start, sym->end);
}
Looking over the vmlinux/kallsyms is common enough that I'll add a
variable to the upcoming struct perf_session to avoid the need to
use map_groups__find_by_name to get the main vmlinux/kallsyms map.
The above example looks on the 'variable' symtab, but it is just
like that for the functions one.
Also the sort operation is done when we first use
map__find_symbol_by_name, in a lazy way.
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Frédéric Weisbecker <fweisbec@gmail.com>
Cc: Masami Hiramatsu <mhiramat@redhat.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Paul Mackerras <paulus@samba.org>
LKML-Reference: <1260564622-12392-1-git-send-email-acme@infradead.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
2009-12-12 04:50:22 +08:00
|
|
|
return NULL;
|
|
|
|
|
2013-01-25 08:59:59 +08:00
|
|
|
if (!dso__sorted_by_name(map->dso, map->type))
|
|
|
|
dso__sort_by_name(map->dso, map->type);
|
perf symbols: Allow lookups by symbol name too
Configurable via symbol_conf.sort_by_name, so that the cost of an
extra rb_node on all 'struct symbol' instances is not paid by tools
that only want to decode addresses.
How to use it:
symbol_conf.sort_by_name = true;
symbol_init(&symbol_conf);
struct map *map = map_groups__find_by_name(kmaps, MAP__VARIABLE, "[kernel.kallsyms]");
if (map == NULL) {
pr_err("couldn't find map!\n");
kernel_maps__fprintf(stdout);
} else {
struct symbol *sym = map__find_symbol_by_name(map, sym_filter, NULL);
if (sym == NULL)
pr_err("couldn't find symbol %s!\n", sym_filter);
else
pr_info("symbol %s: %#Lx-%#Lx \n", sym_filter, sym->start, sym->end);
}
Looking over the vmlinux/kallsyms is common enough that I'll add a
variable to the upcoming struct perf_session to avoid the need to
use map_groups__find_by_name to get the main vmlinux/kallsyms map.
The above example looks on the 'variable' symtab, but it is just
like that for the functions one.
Also the sort operation is done when we first use
map__find_symbol_by_name, in a lazy way.
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Frédéric Weisbecker <fweisbec@gmail.com>
Cc: Masami Hiramatsu <mhiramat@redhat.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Paul Mackerras <paulus@samba.org>
LKML-Reference: <1260564622-12392-1-git-send-email-acme@infradead.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
2009-12-12 04:50:22 +08:00
|
|
|
|
2018-04-26 04:46:28 +08:00
|
|
|
return __dso__find_symbol_by_name(map->dso, map->type, name);
|
perf symbols: Allow lookups by symbol name too
Configurable via symbol_conf.sort_by_name, so that the cost of an
extra rb_node on all 'struct symbol' instances is not paid by tools
that only want to decode addresses.
How to use it:
symbol_conf.sort_by_name = true;
symbol_init(&symbol_conf);
struct map *map = map_groups__find_by_name(kmaps, MAP__VARIABLE, "[kernel.kallsyms]");
if (map == NULL) {
pr_err("couldn't find map!\n");
kernel_maps__fprintf(stdout);
} else {
struct symbol *sym = map__find_symbol_by_name(map, sym_filter, NULL);
if (sym == NULL)
pr_err("couldn't find symbol %s!\n", sym_filter);
else
pr_info("symbol %s: %#Lx-%#Lx \n", sym_filter, sym->start, sym->end);
}
Looking over the vmlinux/kallsyms is common enough that I'll add a
variable to the upcoming struct perf_session to avoid the need to
use map_groups__find_by_name to get the main vmlinux/kallsyms map.
The above example looks on the 'variable' symtab, but it is just
like that for the functions one.
Also the sort operation is done when we first use
map__find_symbol_by_name, in a lazy way.
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Frédéric Weisbecker <fweisbec@gmail.com>
Cc: Masami Hiramatsu <mhiramat@redhat.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Paul Mackerras <paulus@samba.org>
LKML-Reference: <1260564622-12392-1-git-send-email-acme@infradead.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
2009-12-12 04:50:22 +08:00
|
|
|
}
|
|
|
|
|
2015-08-19 02:19:50 +08:00
|
|
|
struct map *map__clone(struct map *from)
|
2009-08-12 17:07:25 +08:00
|
|
|
{
|
2015-08-19 02:19:50 +08:00
|
|
|
struct map *map = memdup(from, sizeof(*map));
|
|
|
|
|
|
|
|
if (map != NULL) {
|
2017-02-21 23:34:59 +08:00
|
|
|
refcount_set(&map->refcnt, 1);
|
2015-08-19 02:19:50 +08:00
|
|
|
RB_CLEAR_NODE(&map->rb_node);
|
|
|
|
dso__get(map->dso);
|
|
|
|
map->groups = NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
return map;
|
2009-08-12 17:07:25 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
int map__overlap(struct map *l, struct map *r)
|
|
|
|
{
|
|
|
|
if (l->start > r->start) {
|
|
|
|
struct map *t = l;
|
|
|
|
l = r;
|
|
|
|
r = t;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (l->end > r->start)
|
|
|
|
return 1;
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2013-01-25 08:59:59 +08:00
|
|
|
size_t map__fprintf(struct map *map, FILE *fp)
|
2009-08-12 17:07:25 +08:00
|
|
|
{
|
2011-01-23 06:37:02 +08:00
|
|
|
return fprintf(fp, " %" PRIx64 "-%" PRIx64 " %" PRIx64 " %s\n",
|
2013-01-25 08:59:59 +08:00
|
|
|
map->start, map->end, map->pgoff, map->dso->name);
|
2009-08-12 17:07:25 +08:00
|
|
|
}
|
perf annotate: Fix it for non-prelinked *.so
The problem was we were incorrectly calculating objdump
addresses for sym->start and sym->end, look:
For simple ET_DYN type DSO (*.so) with one function, objdump -dS
output is something like this:
000004ac <my_strlen>:
int my_strlen(const char *s)
4ac: 55 push %ebp
4ad: 89 e5 mov %esp,%ebp
4af: 83 ec 10 sub $0x10,%esp
{
i.e. we have relative-to-dso-mapping IPs (=RIP) there.
For ET_EXEC type and probably for prelinked libs as well (sorry
can't test - I don't use prelink) objdump outputs absolute IPs,
e.g.
08048604 <zz_strlen>:
extern "C"
int zz_strlen(const char *s)
8048604: 55 push %ebp
8048605: 89 e5 mov %esp,%ebp
8048607: 83 ec 10 sub $0x10,%esp
{
So, if sym->start is always relative to dso mapping(*), we'll
have to unmap it for ET_EXEC like cases, and leave as is for
ET_DYN cases.
(*) and it is - we've explicitely made it relative. Look for
adjust_symbols handling in dso__load_sym()
Previously we were always unmapping sym->start and for ET_DYN
dsos resulting addresses were wrong, and so objdump output was
empty.
The end result was that perf annotate output for symbols from
non-prelinked *.so had always 0.00% percents only, which is
wrong.
To fix it, let's introduce a helper for converting rip to
objdump address, and also let's document what map_ip() and
unmap_ip() do -- I had to study sources for several hours to
understand it.
Signed-off-by: Kirill Smelkov <kirr@landau.phys.spbu.ru>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Mike Galbraith <efault@gmx.de>
LKML-Reference: <1265223128-11786-8-git-send-email-acme@infradead.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
2010-02-04 02:52:07 +08:00
|
|
|
|
2012-01-30 12:42:57 +08:00
|
|
|
size_t map__fprintf_dsoname(struct map *map, FILE *fp)
|
|
|
|
{
|
2012-08-27 15:38:26 +08:00
|
|
|
const char *dsoname = "[unknown]";
|
2012-01-30 12:42:57 +08:00
|
|
|
|
2017-02-14 04:11:03 +08:00
|
|
|
if (map && map->dso) {
|
2012-01-30 12:43:20 +08:00
|
|
|
if (symbol_conf.show_kernel_path && map->dso->long_name)
|
|
|
|
dsoname = map->dso->long_name;
|
2017-02-14 04:11:03 +08:00
|
|
|
else
|
2012-01-30 12:43:20 +08:00
|
|
|
dsoname = map->dso->name;
|
2012-08-27 15:38:26 +08:00
|
|
|
}
|
2012-01-30 12:42:57 +08:00
|
|
|
|
|
|
|
return fprintf(fp, "%s", dsoname);
|
|
|
|
}
|
|
|
|
|
2013-12-06 15:42:57 +08:00
|
|
|
int map__fprintf_srcline(struct map *map, u64 addr, const char *prefix,
|
|
|
|
FILE *fp)
|
|
|
|
{
|
|
|
|
char *srcline;
|
|
|
|
int ret = 0;
|
|
|
|
|
|
|
|
if (map && map->dso) {
|
|
|
|
srcline = get_srcline(map->dso,
|
2017-03-19 05:49:28 +08:00
|
|
|
map__rip_2objdump(map, addr), NULL,
|
2017-12-30 00:26:52 +08:00
|
|
|
true, true, addr);
|
2013-12-06 15:42:57 +08:00
|
|
|
if (srcline != SRCLINE_UNKNOWN)
|
|
|
|
ret = fprintf(fp, "%s%s", prefix, srcline);
|
|
|
|
free_srcline(srcline);
|
|
|
|
}
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2013-10-14 18:43:44 +08:00
|
|
|
/**
|
|
|
|
* map__rip_2objdump - convert symbol start address to objdump address.
|
|
|
|
* @map: memory map
|
|
|
|
* @rip: symbol start address
|
|
|
|
*
|
perf annotate: Fix it for non-prelinked *.so
The problem was we were incorrectly calculating objdump
addresses for sym->start and sym->end, look:
For simple ET_DYN type DSO (*.so) with one function, objdump -dS
output is something like this:
000004ac <my_strlen>:
int my_strlen(const char *s)
4ac: 55 push %ebp
4ad: 89 e5 mov %esp,%ebp
4af: 83 ec 10 sub $0x10,%esp
{
i.e. we have relative-to-dso-mapping IPs (=RIP) there.
For ET_EXEC type and probably for prelinked libs as well (sorry
can't test - I don't use prelink) objdump outputs absolute IPs,
e.g.
08048604 <zz_strlen>:
extern "C"
int zz_strlen(const char *s)
8048604: 55 push %ebp
8048605: 89 e5 mov %esp,%ebp
8048607: 83 ec 10 sub $0x10,%esp
{
So, if sym->start is always relative to dso mapping(*), we'll
have to unmap it for ET_EXEC like cases, and leave as is for
ET_DYN cases.
(*) and it is - we've explicitely made it relative. Look for
adjust_symbols handling in dso__load_sym()
Previously we were always unmapping sym->start and for ET_DYN
dsos resulting addresses were wrong, and so objdump output was
empty.
The end result was that perf annotate output for symbols from
non-prelinked *.so had always 0.00% percents only, which is
wrong.
To fix it, let's introduce a helper for converting rip to
objdump address, and also let's document what map_ip() and
unmap_ip() do -- I had to study sources for several hours to
understand it.
Signed-off-by: Kirill Smelkov <kirr@landau.phys.spbu.ru>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Mike Galbraith <efault@gmx.de>
LKML-Reference: <1265223128-11786-8-git-send-email-acme@infradead.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
2010-02-04 02:52:07 +08:00
|
|
|
* objdump wants/reports absolute IPs for ET_EXEC, and RIPs for ET_DYN.
|
2013-08-07 19:38:50 +08:00
|
|
|
* map->dso->adjust_symbols==1 for ET_EXEC-like cases except ET_REL which is
|
|
|
|
* relative to section start.
|
2013-10-14 18:43:44 +08:00
|
|
|
*
|
|
|
|
* Return: Address suitable for passing to "objdump --start-address="
|
perf annotate: Fix it for non-prelinked *.so
The problem was we were incorrectly calculating objdump
addresses for sym->start and sym->end, look:
For simple ET_DYN type DSO (*.so) with one function, objdump -dS
output is something like this:
000004ac <my_strlen>:
int my_strlen(const char *s)
4ac: 55 push %ebp
4ad: 89 e5 mov %esp,%ebp
4af: 83 ec 10 sub $0x10,%esp
{
i.e. we have relative-to-dso-mapping IPs (=RIP) there.
For ET_EXEC type and probably for prelinked libs as well (sorry
can't test - I don't use prelink) objdump outputs absolute IPs,
e.g.
08048604 <zz_strlen>:
extern "C"
int zz_strlen(const char *s)
8048604: 55 push %ebp
8048605: 89 e5 mov %esp,%ebp
8048607: 83 ec 10 sub $0x10,%esp
{
So, if sym->start is always relative to dso mapping(*), we'll
have to unmap it for ET_EXEC like cases, and leave as is for
ET_DYN cases.
(*) and it is - we've explicitely made it relative. Look for
adjust_symbols handling in dso__load_sym()
Previously we were always unmapping sym->start and for ET_DYN
dsos resulting addresses were wrong, and so objdump output was
empty.
The end result was that perf annotate output for symbols from
non-prelinked *.so had always 0.00% percents only, which is
wrong.
To fix it, let's introduce a helper for converting rip to
objdump address, and also let's document what map_ip() and
unmap_ip() do -- I had to study sources for several hours to
understand it.
Signed-off-by: Kirill Smelkov <kirr@landau.phys.spbu.ru>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Mike Galbraith <efault@gmx.de>
LKML-Reference: <1265223128-11786-8-git-send-email-acme@infradead.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
2010-02-04 02:52:07 +08:00
|
|
|
*/
|
|
|
|
u64 map__rip_2objdump(struct map *map, u64 rip)
|
|
|
|
{
|
2013-08-07 19:38:50 +08:00
|
|
|
if (!map->dso->adjust_symbols)
|
|
|
|
return rip;
|
|
|
|
|
|
|
|
if (map->dso->rel)
|
|
|
|
return rip - map->pgoff;
|
|
|
|
|
2016-04-07 18:24:30 +08:00
|
|
|
/*
|
|
|
|
* kernel modules also have DSO_TYPE_USER in dso->kernel,
|
|
|
|
* but all kernel modules are ET_REL, so won't get here.
|
|
|
|
*/
|
|
|
|
if (map->dso->kernel == DSO_TYPE_USER)
|
|
|
|
return rip + map->dso->text_offset;
|
|
|
|
|
2014-01-29 22:14:36 +08:00
|
|
|
return map->unmap_ip(map, rip) - map->reloc;
|
perf annotate: Fix it for non-prelinked *.so
The problem was we were incorrectly calculating objdump
addresses for sym->start and sym->end, look:
For simple ET_DYN type DSO (*.so) with one function, objdump -dS
output is something like this:
000004ac <my_strlen>:
int my_strlen(const char *s)
4ac: 55 push %ebp
4ad: 89 e5 mov %esp,%ebp
4af: 83 ec 10 sub $0x10,%esp
{
i.e. we have relative-to-dso-mapping IPs (=RIP) there.
For ET_EXEC type and probably for prelinked libs as well (sorry
can't test - I don't use prelink) objdump outputs absolute IPs,
e.g.
08048604 <zz_strlen>:
extern "C"
int zz_strlen(const char *s)
8048604: 55 push %ebp
8048605: 89 e5 mov %esp,%ebp
8048607: 83 ec 10 sub $0x10,%esp
{
So, if sym->start is always relative to dso mapping(*), we'll
have to unmap it for ET_EXEC like cases, and leave as is for
ET_DYN cases.
(*) and it is - we've explicitely made it relative. Look for
adjust_symbols handling in dso__load_sym()
Previously we were always unmapping sym->start and for ET_DYN
dsos resulting addresses were wrong, and so objdump output was
empty.
The end result was that perf annotate output for symbols from
non-prelinked *.so had always 0.00% percents only, which is
wrong.
To fix it, let's introduce a helper for converting rip to
objdump address, and also let's document what map_ip() and
unmap_ip() do -- I had to study sources for several hours to
understand it.
Signed-off-by: Kirill Smelkov <kirr@landau.phys.spbu.ru>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Mike Galbraith <efault@gmx.de>
LKML-Reference: <1265223128-11786-8-git-send-email-acme@infradead.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
2010-02-04 02:52:07 +08:00
|
|
|
}
|
perf top: Fix annotate for userspace
First, for programs and prelinked libraries, annotate code was
fooled by objdump output IPs (src->eip in the code) being
wrongly converted to absolute IPs. In such case there were no
conversion needed, but in
src->eip = strtoull(src->line, NULL, 16);
src->eip = map->unmap_ip(map, src->eip); // = eip + map->start - map->pgoff
we were reading absolute address from objdump (e.g. 8048604) and
then almost doubling it, because eip & map->start are
approximately close for small programs.
Needless to say, that later, in record_precise_ip() there was no
matching with real runtime IPs.
And second, like with `perf annotate` the problem with
non-prelinked *.so was that we were doing rip -> objdump address
conversion wrong.
Also, because unlike `perf annotate`, `perf top` code does
annotation based on absolute IPs for performance reasons(*), new
helper for mapping objdump addresse to IP is introduced.
(*) we get samples info in absolute IPs, and since we do lots of
hit-testing on absolute IPs at runtime in record_precise_ip(), it's
better to convert objdump addresses to IPs once and do no conversion
at runtime.
I also had to fix how objdump output is parsed (with hardcoded
8/16 characters format, which was inappropriate for ET_DYN dsos
with small addresses like '4ac')
Also note, that not all objdump output lines has associtated
IPs, e.g. look at source lines here:
000004ac <my_strlen>:
extern "C"
int my_strlen(const char *s)
4ac: 55 push %ebp
4ad: 89 e5 mov %esp,%ebp
4af: 83 ec 10 sub $0x10,%esp
{
int len = 0;
4b2: c7 45 fc 00 00 00 00 movl $0x0,-0x4(%ebp)
4b9: eb 08 jmp 4c3 <my_strlen+0x17>
while (*s) {
++len;
4bb: 83 45 fc 01 addl $0x1,-0x4(%ebp)
++s;
4bf: 83 45 08 01 addl $0x1,0x8(%ebp)
So we mark them with eip=0, and ignore such lines in annotate
lookup code.
Signed-off-by: Kirill Smelkov <kirr@landau.phys.spbu.ru>
[ Note: one hunk of this patch was applied by Mike in 57d8188 ]
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Mike Galbraith <efault@gmx.de>
LKML-Reference: <1265550376-12665-1-git-send-email-acme@infradead.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
2010-02-07 21:46:15 +08:00
|
|
|
|
2013-10-14 18:43:44 +08:00
|
|
|
/**
|
|
|
|
* map__objdump_2mem - convert objdump address to a memory address.
|
|
|
|
* @map: memory map
|
|
|
|
* @ip: objdump address
|
|
|
|
*
|
|
|
|
* Closely related to map__rip_2objdump(), this function takes an address from
|
|
|
|
* objdump and converts it to a memory address. Note this assumes that @map
|
|
|
|
* contains the address. To be sure the result is valid, check it forwards
|
|
|
|
* e.g. map__rip_2objdump(map->map_ip(map, map__objdump_2mem(map, ip))) == ip
|
|
|
|
*
|
|
|
|
* Return: Memory address.
|
|
|
|
*/
|
|
|
|
u64 map__objdump_2mem(struct map *map, u64 ip)
|
|
|
|
{
|
|
|
|
if (!map->dso->adjust_symbols)
|
|
|
|
return map->unmap_ip(map, ip);
|
|
|
|
|
|
|
|
if (map->dso->rel)
|
|
|
|
return map->unmap_ip(map, ip + map->pgoff);
|
|
|
|
|
2016-04-07 18:24:30 +08:00
|
|
|
/*
|
|
|
|
* kernel modules also have DSO_TYPE_USER in dso->kernel,
|
|
|
|
* but all kernel modules are ET_REL, so won't get here.
|
|
|
|
*/
|
|
|
|
if (map->dso->kernel == DSO_TYPE_USER)
|
|
|
|
return map->unmap_ip(map, ip - map->dso->text_offset);
|
|
|
|
|
2014-01-29 22:14:36 +08:00
|
|
|
return ip + map->reloc;
|
2013-10-14 18:43:44 +08:00
|
|
|
}
|
|
|
|
|
2015-05-22 23:58:53 +08:00
|
|
|
static void maps__init(struct maps *maps)
|
|
|
|
{
|
|
|
|
maps->entries = RB_ROOT;
|
2017-04-05 00:15:04 +08:00
|
|
|
init_rwsem(&maps->lock);
|
2015-05-22 23:58:53 +08:00
|
|
|
}
|
|
|
|
|
2014-10-22 04:29:02 +08:00
|
|
|
void map_groups__init(struct map_groups *mg, struct machine *machine)
|
2010-03-26 23:11:06 +08:00
|
|
|
{
|
|
|
|
int i;
|
|
|
|
for (i = 0; i < MAP__NR_TYPES; ++i) {
|
2015-05-22 23:58:53 +08:00
|
|
|
maps__init(&mg->maps[i]);
|
2010-03-26 23:11:06 +08:00
|
|
|
}
|
2014-10-22 04:29:02 +08:00
|
|
|
mg->machine = machine;
|
2017-02-21 23:35:00 +08:00
|
|
|
refcount_set(&mg->refcnt, 1);
|
2010-03-26 23:11:06 +08:00
|
|
|
}
|
|
|
|
|
2015-05-23 00:45:24 +08:00
|
|
|
static void __maps__purge(struct maps *maps)
|
2010-07-31 05:28:42 +08:00
|
|
|
{
|
2015-05-22 23:58:53 +08:00
|
|
|
struct rb_root *root = &maps->entries;
|
|
|
|
struct rb_node *next = rb_first(root);
|
2010-07-31 05:28:42 +08:00
|
|
|
|
|
|
|
while (next) {
|
|
|
|
struct map *pos = rb_entry(next, struct map, rb_node);
|
|
|
|
|
|
|
|
next = rb_next(&pos->rb_node);
|
2015-05-26 02:30:09 +08:00
|
|
|
rb_erase_init(&pos->rb_node, root);
|
2015-05-26 03:59:56 +08:00
|
|
|
map__put(pos);
|
2010-07-31 05:28:42 +08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2015-05-22 23:58:53 +08:00
|
|
|
static void maps__exit(struct maps *maps)
|
|
|
|
{
|
2017-04-05 00:15:04 +08:00
|
|
|
down_write(&maps->lock);
|
2015-05-23 00:45:24 +08:00
|
|
|
__maps__purge(maps);
|
2017-04-05 00:15:04 +08:00
|
|
|
up_write(&maps->lock);
|
2015-05-22 23:58:53 +08:00
|
|
|
}
|
|
|
|
|
2011-08-24 01:31:30 +08:00
|
|
|
void map_groups__exit(struct map_groups *mg)
|
2010-07-31 05:28:42 +08:00
|
|
|
{
|
|
|
|
int i;
|
|
|
|
|
2015-05-22 23:58:53 +08:00
|
|
|
for (i = 0; i < MAP__NR_TYPES; ++i)
|
|
|
|
maps__exit(&mg->maps[i]);
|
2010-07-31 05:28:42 +08:00
|
|
|
}
|
|
|
|
|
2014-07-16 16:07:13 +08:00
|
|
|
bool map_groups__empty(struct map_groups *mg)
|
|
|
|
{
|
|
|
|
int i;
|
|
|
|
|
|
|
|
for (i = 0; i < MAP__NR_TYPES; ++i) {
|
|
|
|
if (maps__first(&mg->maps[i]))
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
2014-10-22 04:29:02 +08:00
|
|
|
struct map_groups *map_groups__new(struct machine *machine)
|
2014-03-22 04:57:01 +08:00
|
|
|
{
|
|
|
|
struct map_groups *mg = malloc(sizeof(*mg));
|
|
|
|
|
|
|
|
if (mg != NULL)
|
2014-10-22 04:29:02 +08:00
|
|
|
map_groups__init(mg, machine);
|
2014-03-22 04:57:01 +08:00
|
|
|
|
|
|
|
return mg;
|
|
|
|
}
|
|
|
|
|
|
|
|
void map_groups__delete(struct map_groups *mg)
|
|
|
|
{
|
|
|
|
map_groups__exit(mg);
|
|
|
|
free(mg);
|
|
|
|
}
|
|
|
|
|
2014-03-26 02:26:44 +08:00
|
|
|
void map_groups__put(struct map_groups *mg)
|
|
|
|
{
|
2017-02-21 23:35:00 +08:00
|
|
|
if (mg && refcount_dec_and_test(&mg->refcnt))
|
2014-03-26 02:26:44 +08:00
|
|
|
map_groups__delete(mg);
|
|
|
|
}
|
|
|
|
|
2011-08-24 01:31:30 +08:00
|
|
|
struct symbol *map_groups__find_symbol(struct map_groups *mg,
|
2010-03-26 06:58:58 +08:00
|
|
|
enum map_type type, u64 addr,
|
2016-09-02 06:25:52 +08:00
|
|
|
struct map **mapp)
|
2010-03-26 06:58:58 +08:00
|
|
|
{
|
2018-04-25 23:39:22 +08:00
|
|
|
struct map *map = __map_groups__find(mg, type, addr);
|
2010-03-26 06:58:58 +08:00
|
|
|
|
2014-01-23 10:29:50 +08:00
|
|
|
/* Ensure map is loaded before using map->map_ip */
|
2016-09-02 06:25:52 +08:00
|
|
|
if (map != NULL && map__load(map) >= 0) {
|
2010-03-26 23:30:40 +08:00
|
|
|
if (mapp != NULL)
|
|
|
|
*mapp = map;
|
2016-09-02 06:25:52 +08:00
|
|
|
return map__find_symbol(map, map->map_ip(map, addr));
|
2010-03-26 23:30:40 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2015-09-30 04:34:46 +08:00
|
|
|
struct symbol *maps__find_symbol_by_name(struct maps *maps, const char *name,
|
2016-09-02 06:25:52 +08:00
|
|
|
struct map **mapp)
|
2010-03-26 23:30:40 +08:00
|
|
|
{
|
2015-05-23 00:45:24 +08:00
|
|
|
struct symbol *sym;
|
2010-03-26 23:30:40 +08:00
|
|
|
struct rb_node *nd;
|
|
|
|
|
2017-04-05 00:15:04 +08:00
|
|
|
down_read(&maps->lock);
|
2015-05-23 00:45:24 +08:00
|
|
|
|
|
|
|
for (nd = rb_first(&maps->entries); nd; nd = rb_next(nd)) {
|
2010-03-26 23:30:40 +08:00
|
|
|
struct map *pos = rb_entry(nd, struct map, rb_node);
|
2015-05-23 00:45:24 +08:00
|
|
|
|
2016-09-02 06:25:52 +08:00
|
|
|
sym = map__find_symbol_by_name(pos, name);
|
2010-03-26 23:30:40 +08:00
|
|
|
|
|
|
|
if (sym == NULL)
|
|
|
|
continue;
|
|
|
|
if (mapp != NULL)
|
|
|
|
*mapp = pos;
|
2015-05-23 00:45:24 +08:00
|
|
|
goto out;
|
2010-03-26 23:30:40 +08:00
|
|
|
}
|
2010-03-26 06:58:58 +08:00
|
|
|
|
2015-05-23 00:45:24 +08:00
|
|
|
sym = NULL;
|
|
|
|
out:
|
2017-04-05 00:15:04 +08:00
|
|
|
up_read(&maps->lock);
|
2015-05-23 00:45:24 +08:00
|
|
|
return sym;
|
2010-03-26 06:58:58 +08:00
|
|
|
}
|
|
|
|
|
2015-09-30 04:34:46 +08:00
|
|
|
struct symbol *map_groups__find_symbol_by_name(struct map_groups *mg,
|
|
|
|
enum map_type type,
|
|
|
|
const char *name,
|
2016-09-02 06:25:52 +08:00
|
|
|
struct map **mapp)
|
2015-09-30 04:34:46 +08:00
|
|
|
{
|
2016-09-02 06:25:52 +08:00
|
|
|
struct symbol *sym = maps__find_symbol_by_name(&mg->maps[type], name, mapp);
|
2015-09-30 04:34:46 +08:00
|
|
|
|
|
|
|
return sym;
|
|
|
|
}
|
|
|
|
|
2016-09-02 06:25:52 +08:00
|
|
|
int map_groups__find_ams(struct addr_map_symbol *ams)
|
2013-10-14 18:43:38 +08:00
|
|
|
{
|
2014-10-06 16:35:32 +08:00
|
|
|
if (ams->addr < ams->map->start || ams->addr >= ams->map->end) {
|
2013-10-14 18:43:38 +08:00
|
|
|
if (ams->map->groups == NULL)
|
|
|
|
return -1;
|
2018-04-25 23:39:22 +08:00
|
|
|
ams->map = __map_groups__find(ams->map->groups, ams->map->type, ams->addr);
|
2013-10-14 18:43:38 +08:00
|
|
|
if (ams->map == NULL)
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
ams->al_addr = ams->map->map_ip(ams->map, ams->addr);
|
2016-09-02 06:25:52 +08:00
|
|
|
ams->sym = map__find_symbol(ams->map, ams->al_addr);
|
2013-10-14 18:43:38 +08:00
|
|
|
|
|
|
|
return ams->sym ? 0 : -1;
|
|
|
|
}
|
|
|
|
|
2015-05-23 00:45:24 +08:00
|
|
|
static size_t maps__fprintf(struct maps *maps, FILE *fp)
|
2010-03-26 23:11:06 +08:00
|
|
|
{
|
2015-05-23 00:45:24 +08:00
|
|
|
size_t printed = 0;
|
2010-03-26 23:11:06 +08:00
|
|
|
struct rb_node *nd;
|
|
|
|
|
2017-04-05 00:15:04 +08:00
|
|
|
down_read(&maps->lock);
|
2015-05-23 00:45:24 +08:00
|
|
|
|
|
|
|
for (nd = rb_first(&maps->entries); nd; nd = rb_next(nd)) {
|
2010-03-26 23:11:06 +08:00
|
|
|
struct map *pos = rb_entry(nd, struct map, rb_node);
|
|
|
|
printed += fprintf(fp, "Map:");
|
|
|
|
printed += map__fprintf(pos, fp);
|
|
|
|
if (verbose > 2) {
|
2015-05-23 00:45:24 +08:00
|
|
|
printed += dso__fprintf(pos->dso, pos->type, fp);
|
2010-03-26 23:11:06 +08:00
|
|
|
printed += fprintf(fp, "--\n");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-04-05 00:15:04 +08:00
|
|
|
up_read(&maps->lock);
|
2015-05-23 00:45:24 +08:00
|
|
|
|
2010-03-26 23:11:06 +08:00
|
|
|
return printed;
|
|
|
|
}
|
|
|
|
|
2015-05-23 00:45:24 +08:00
|
|
|
size_t __map_groups__fprintf_maps(struct map_groups *mg, enum map_type type,
|
|
|
|
FILE *fp)
|
|
|
|
{
|
|
|
|
size_t printed = fprintf(fp, "%s:\n", map_type__name[type]);
|
|
|
|
return printed += maps__fprintf(&mg->maps[type], fp);
|
|
|
|
}
|
|
|
|
|
2015-06-16 10:29:51 +08:00
|
|
|
size_t map_groups__fprintf(struct map_groups *mg, FILE *fp)
|
2010-03-26 23:11:06 +08:00
|
|
|
{
|
|
|
|
size_t printed = 0, i;
|
|
|
|
for (i = 0; i < MAP__NR_TYPES; ++i)
|
2014-07-15 05:46:47 +08:00
|
|
|
printed += __map_groups__fprintf_maps(mg, i, fp);
|
2010-03-26 23:11:06 +08:00
|
|
|
return printed;
|
|
|
|
}
|
|
|
|
|
perf tools: Insert split maps correctly into origin group
When new maps are cloned out of split map they are added into origin
map's group, but their groups pointer is not updated.
This could lead to a segfault, because map->groups is expected to be
always set as reported by Markus:
__map__is_kernel (map=map@entry=0x1abb7a0) at util/map.c:238
238 return __machine__kernel_map(map->groups->machine, map->type) =
(gdb) bt
#0 __map__is_kernel (map=map@entry=0x1abb7a0) at util/map.c:238
#1 0x00000000004393e4 in symbol_filter (map=map@entry=0x1abb7a0, sym=sym@entry
#2 0x00000000004fcd4d in dso__load_sym (dso=dso@entry=0x166dae0, map=map@entry
#3 0x00000000004a64e0 in dso__load (dso=0x166dae0, map=map@entry=0x1abb7a0, fi
#4 0x00000000004b941f in map__load (filter=0x4393c0 <symbol_filter>, map=<opti
#5 map__find_symbol (map=0x1abb7a0, addr=40188, filter=0x4393c0 <symbol_filter
...
Adding __map_groups__insert function to add map into groups together
with map->groups pointer update. It takes no lock as opposed to existing
map_groups__insert, as maps__fixup_overlappings(), where it is being
called, already has the necessary lock held.
Using __map_groups__insert to add new maps after map split.
Reported-by: Markus Trippelsdorf <markus@trippelsdorf.de>
Signed-off-by: Jiri Olsa <jolsa@kernel.org>
Tested-by: Markus Trippelsdorf <markus@trippelsdorf.de>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Thomas Gleixner <tglx@linutronix.de>
Link: http://lkml.kernel.org/r/20151104140811.GA32664@krava.brq.redhat.com
Fixes: cfc5acd4c80b ("perf top: Filter symbols based on __map__is_kernel(map)")
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2015-11-04 22:08:11 +08:00
|
|
|
static void __map_groups__insert(struct map_groups *mg, struct map *map)
|
|
|
|
{
|
|
|
|
__maps__insert(&mg->maps[map->type], map);
|
|
|
|
map->groups = mg;
|
|
|
|
}
|
|
|
|
|
2015-05-23 00:45:24 +08:00
|
|
|
static int maps__fixup_overlappings(struct maps *maps, struct map *map, FILE *fp)
|
2010-03-26 23:11:06 +08:00
|
|
|
{
|
2015-05-23 00:45:24 +08:00
|
|
|
struct rb_root *root;
|
|
|
|
struct rb_node *next;
|
perf tools: Don't keep unreferenced maps when unmaps are detected
For a file with:
[root@emilia linux-2.6-tip]# perf report -D -fi allmodconfig-j32.perf.data | grep events:
TOTAL events: 36933
MMAP events: 9056
LOST events: 0
COMM events: 1702
EXIT events: 1887
THROTTLE events: 8
UNTHROTTLE events: 8
FORK events: 1894
READ events: 0
SAMPLE events: 22378
ATTR events: 0
EVENT_TYPE events: 0
TRACING_DATA events: 0
BUILD_ID events: 0
[root@emilia linux-2.6-tip]#
Testing with valgrind and making perf_session__delete() a nop, so that
we can notice how many maps were actually deleted due to not having any
samples on it:
==== HEAP SUMMARY:
Before:
==10339== in use at exit: 8,909,997 bytes in 68,690 blocks
==10339== total heap usage: 78,696 allocs, 10,007 frees, 11,925,853 bytes allocated
After:
==10506== in use at exit: 8,902,605 bytes in 68,606 blocks
==10506== total heap usage: 78,696 allocs, 10,091 frees, 11,925,853 bytes allocated
I.e. just 84 detected unmaps with no hits out of 9056 for this workload,
not much, but in some other long running workload this may save more
bytes.
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
LKML-Reference: <new-submission>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2010-08-03 06:45:23 +08:00
|
|
|
int err = 0;
|
2010-03-26 23:11:06 +08:00
|
|
|
|
2017-04-05 00:15:04 +08:00
|
|
|
down_write(&maps->lock);
|
2015-05-23 00:45:24 +08:00
|
|
|
|
|
|
|
root = &maps->entries;
|
|
|
|
next = rb_first(root);
|
|
|
|
|
2010-03-26 23:11:06 +08:00
|
|
|
while (next) {
|
|
|
|
struct map *pos = rb_entry(next, struct map, rb_node);
|
|
|
|
next = rb_next(&pos->rb_node);
|
|
|
|
|
|
|
|
if (!map__overlap(pos, map))
|
|
|
|
continue;
|
|
|
|
|
|
|
|
if (verbose >= 2) {
|
2016-10-13 05:48:23 +08:00
|
|
|
|
|
|
|
if (use_browser) {
|
|
|
|
pr_warning("overlapping maps in %s "
|
|
|
|
"(disable tui for more info)\n",
|
|
|
|
map->dso->name);
|
|
|
|
} else {
|
|
|
|
fputs("overlapping maps:\n", fp);
|
|
|
|
map__fprintf(map, fp);
|
|
|
|
map__fprintf(pos, fp);
|
|
|
|
}
|
2010-03-26 23:11:06 +08:00
|
|
|
}
|
|
|
|
|
2015-05-26 02:30:09 +08:00
|
|
|
rb_erase_init(&pos->rb_node, root);
|
2010-03-26 23:11:06 +08:00
|
|
|
/*
|
|
|
|
* Now check if we need to create new maps for areas not
|
|
|
|
* overlapped by the new map:
|
|
|
|
*/
|
|
|
|
if (map->start > pos->start) {
|
|
|
|
struct map *before = map__clone(pos);
|
|
|
|
|
perf tools: Don't keep unreferenced maps when unmaps are detected
For a file with:
[root@emilia linux-2.6-tip]# perf report -D -fi allmodconfig-j32.perf.data | grep events:
TOTAL events: 36933
MMAP events: 9056
LOST events: 0
COMM events: 1702
EXIT events: 1887
THROTTLE events: 8
UNTHROTTLE events: 8
FORK events: 1894
READ events: 0
SAMPLE events: 22378
ATTR events: 0
EVENT_TYPE events: 0
TRACING_DATA events: 0
BUILD_ID events: 0
[root@emilia linux-2.6-tip]#
Testing with valgrind and making perf_session__delete() a nop, so that
we can notice how many maps were actually deleted due to not having any
samples on it:
==== HEAP SUMMARY:
Before:
==10339== in use at exit: 8,909,997 bytes in 68,690 blocks
==10339== total heap usage: 78,696 allocs, 10,007 frees, 11,925,853 bytes allocated
After:
==10506== in use at exit: 8,902,605 bytes in 68,606 blocks
==10506== total heap usage: 78,696 allocs, 10,091 frees, 11,925,853 bytes allocated
I.e. just 84 detected unmaps with no hits out of 9056 for this workload,
not much, but in some other long running workload this may save more
bytes.
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
LKML-Reference: <new-submission>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2010-08-03 06:45:23 +08:00
|
|
|
if (before == NULL) {
|
|
|
|
err = -ENOMEM;
|
2015-05-26 03:59:56 +08:00
|
|
|
goto put_map;
|
perf tools: Don't keep unreferenced maps when unmaps are detected
For a file with:
[root@emilia linux-2.6-tip]# perf report -D -fi allmodconfig-j32.perf.data | grep events:
TOTAL events: 36933
MMAP events: 9056
LOST events: 0
COMM events: 1702
EXIT events: 1887
THROTTLE events: 8
UNTHROTTLE events: 8
FORK events: 1894
READ events: 0
SAMPLE events: 22378
ATTR events: 0
EVENT_TYPE events: 0
TRACING_DATA events: 0
BUILD_ID events: 0
[root@emilia linux-2.6-tip]#
Testing with valgrind and making perf_session__delete() a nop, so that
we can notice how many maps were actually deleted due to not having any
samples on it:
==== HEAP SUMMARY:
Before:
==10339== in use at exit: 8,909,997 bytes in 68,690 blocks
==10339== total heap usage: 78,696 allocs, 10,007 frees, 11,925,853 bytes allocated
After:
==10506== in use at exit: 8,902,605 bytes in 68,606 blocks
==10506== total heap usage: 78,696 allocs, 10,091 frees, 11,925,853 bytes allocated
I.e. just 84 detected unmaps with no hits out of 9056 for this workload,
not much, but in some other long running workload this may save more
bytes.
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
LKML-Reference: <new-submission>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2010-08-03 06:45:23 +08:00
|
|
|
}
|
2010-03-26 23:11:06 +08:00
|
|
|
|
2014-10-06 16:35:32 +08:00
|
|
|
before->end = map->start;
|
perf tools: Insert split maps correctly into origin group
When new maps are cloned out of split map they are added into origin
map's group, but their groups pointer is not updated.
This could lead to a segfault, because map->groups is expected to be
always set as reported by Markus:
__map__is_kernel (map=map@entry=0x1abb7a0) at util/map.c:238
238 return __machine__kernel_map(map->groups->machine, map->type) =
(gdb) bt
#0 __map__is_kernel (map=map@entry=0x1abb7a0) at util/map.c:238
#1 0x00000000004393e4 in symbol_filter (map=map@entry=0x1abb7a0, sym=sym@entry
#2 0x00000000004fcd4d in dso__load_sym (dso=dso@entry=0x166dae0, map=map@entry
#3 0x00000000004a64e0 in dso__load (dso=0x166dae0, map=map@entry=0x1abb7a0, fi
#4 0x00000000004b941f in map__load (filter=0x4393c0 <symbol_filter>, map=<opti
#5 map__find_symbol (map=0x1abb7a0, addr=40188, filter=0x4393c0 <symbol_filter
...
Adding __map_groups__insert function to add map into groups together
with map->groups pointer update. It takes no lock as opposed to existing
map_groups__insert, as maps__fixup_overlappings(), where it is being
called, already has the necessary lock held.
Using __map_groups__insert to add new maps after map split.
Reported-by: Markus Trippelsdorf <markus@trippelsdorf.de>
Signed-off-by: Jiri Olsa <jolsa@kernel.org>
Tested-by: Markus Trippelsdorf <markus@trippelsdorf.de>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Thomas Gleixner <tglx@linutronix.de>
Link: http://lkml.kernel.org/r/20151104140811.GA32664@krava.brq.redhat.com
Fixes: cfc5acd4c80b ("perf top: Filter symbols based on __map__is_kernel(map)")
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2015-11-04 22:08:11 +08:00
|
|
|
__map_groups__insert(pos->groups, before);
|
2016-10-13 05:48:23 +08:00
|
|
|
if (verbose >= 2 && !use_browser)
|
2010-03-26 23:11:06 +08:00
|
|
|
map__fprintf(before, fp);
|
2015-12-09 10:11:31 +08:00
|
|
|
map__put(before);
|
2010-03-26 23:11:06 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
if (map->end < pos->end) {
|
|
|
|
struct map *after = map__clone(pos);
|
|
|
|
|
perf tools: Don't keep unreferenced maps when unmaps are detected
For a file with:
[root@emilia linux-2.6-tip]# perf report -D -fi allmodconfig-j32.perf.data | grep events:
TOTAL events: 36933
MMAP events: 9056
LOST events: 0
COMM events: 1702
EXIT events: 1887
THROTTLE events: 8
UNTHROTTLE events: 8
FORK events: 1894
READ events: 0
SAMPLE events: 22378
ATTR events: 0
EVENT_TYPE events: 0
TRACING_DATA events: 0
BUILD_ID events: 0
[root@emilia linux-2.6-tip]#
Testing with valgrind and making perf_session__delete() a nop, so that
we can notice how many maps were actually deleted due to not having any
samples on it:
==== HEAP SUMMARY:
Before:
==10339== in use at exit: 8,909,997 bytes in 68,690 blocks
==10339== total heap usage: 78,696 allocs, 10,007 frees, 11,925,853 bytes allocated
After:
==10506== in use at exit: 8,902,605 bytes in 68,606 blocks
==10506== total heap usage: 78,696 allocs, 10,091 frees, 11,925,853 bytes allocated
I.e. just 84 detected unmaps with no hits out of 9056 for this workload,
not much, but in some other long running workload this may save more
bytes.
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
LKML-Reference: <new-submission>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2010-08-03 06:45:23 +08:00
|
|
|
if (after == NULL) {
|
|
|
|
err = -ENOMEM;
|
2015-05-26 03:59:56 +08:00
|
|
|
goto put_map;
|
perf tools: Don't keep unreferenced maps when unmaps are detected
For a file with:
[root@emilia linux-2.6-tip]# perf report -D -fi allmodconfig-j32.perf.data | grep events:
TOTAL events: 36933
MMAP events: 9056
LOST events: 0
COMM events: 1702
EXIT events: 1887
THROTTLE events: 8
UNTHROTTLE events: 8
FORK events: 1894
READ events: 0
SAMPLE events: 22378
ATTR events: 0
EVENT_TYPE events: 0
TRACING_DATA events: 0
BUILD_ID events: 0
[root@emilia linux-2.6-tip]#
Testing with valgrind and making perf_session__delete() a nop, so that
we can notice how many maps were actually deleted due to not having any
samples on it:
==== HEAP SUMMARY:
Before:
==10339== in use at exit: 8,909,997 bytes in 68,690 blocks
==10339== total heap usage: 78,696 allocs, 10,007 frees, 11,925,853 bytes allocated
After:
==10506== in use at exit: 8,902,605 bytes in 68,606 blocks
==10506== total heap usage: 78,696 allocs, 10,091 frees, 11,925,853 bytes allocated
I.e. just 84 detected unmaps with no hits out of 9056 for this workload,
not much, but in some other long running workload this may save more
bytes.
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
LKML-Reference: <new-submission>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2010-08-03 06:45:23 +08:00
|
|
|
}
|
2010-03-26 23:11:06 +08:00
|
|
|
|
2014-10-06 16:35:32 +08:00
|
|
|
after->start = map->end;
|
perf tools: Insert split maps correctly into origin group
When new maps are cloned out of split map they are added into origin
map's group, but their groups pointer is not updated.
This could lead to a segfault, because map->groups is expected to be
always set as reported by Markus:
__map__is_kernel (map=map@entry=0x1abb7a0) at util/map.c:238
238 return __machine__kernel_map(map->groups->machine, map->type) =
(gdb) bt
#0 __map__is_kernel (map=map@entry=0x1abb7a0) at util/map.c:238
#1 0x00000000004393e4 in symbol_filter (map=map@entry=0x1abb7a0, sym=sym@entry
#2 0x00000000004fcd4d in dso__load_sym (dso=dso@entry=0x166dae0, map=map@entry
#3 0x00000000004a64e0 in dso__load (dso=0x166dae0, map=map@entry=0x1abb7a0, fi
#4 0x00000000004b941f in map__load (filter=0x4393c0 <symbol_filter>, map=<opti
#5 map__find_symbol (map=0x1abb7a0, addr=40188, filter=0x4393c0 <symbol_filter
...
Adding __map_groups__insert function to add map into groups together
with map->groups pointer update. It takes no lock as opposed to existing
map_groups__insert, as maps__fixup_overlappings(), where it is being
called, already has the necessary lock held.
Using __map_groups__insert to add new maps after map split.
Reported-by: Markus Trippelsdorf <markus@trippelsdorf.de>
Signed-off-by: Jiri Olsa <jolsa@kernel.org>
Tested-by: Markus Trippelsdorf <markus@trippelsdorf.de>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Thomas Gleixner <tglx@linutronix.de>
Link: http://lkml.kernel.org/r/20151104140811.GA32664@krava.brq.redhat.com
Fixes: cfc5acd4c80b ("perf top: Filter symbols based on __map__is_kernel(map)")
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2015-11-04 22:08:11 +08:00
|
|
|
__map_groups__insert(pos->groups, after);
|
2016-10-13 05:48:23 +08:00
|
|
|
if (verbose >= 2 && !use_browser)
|
2010-03-26 23:11:06 +08:00
|
|
|
map__fprintf(after, fp);
|
2015-12-09 10:11:31 +08:00
|
|
|
map__put(after);
|
2010-03-26 23:11:06 +08:00
|
|
|
}
|
2015-05-26 03:59:56 +08:00
|
|
|
put_map:
|
2015-06-16 10:29:51 +08:00
|
|
|
map__put(pos);
|
perf tools: Don't keep unreferenced maps when unmaps are detected
For a file with:
[root@emilia linux-2.6-tip]# perf report -D -fi allmodconfig-j32.perf.data | grep events:
TOTAL events: 36933
MMAP events: 9056
LOST events: 0
COMM events: 1702
EXIT events: 1887
THROTTLE events: 8
UNTHROTTLE events: 8
FORK events: 1894
READ events: 0
SAMPLE events: 22378
ATTR events: 0
EVENT_TYPE events: 0
TRACING_DATA events: 0
BUILD_ID events: 0
[root@emilia linux-2.6-tip]#
Testing with valgrind and making perf_session__delete() a nop, so that
we can notice how many maps were actually deleted due to not having any
samples on it:
==== HEAP SUMMARY:
Before:
==10339== in use at exit: 8,909,997 bytes in 68,690 blocks
==10339== total heap usage: 78,696 allocs, 10,007 frees, 11,925,853 bytes allocated
After:
==10506== in use at exit: 8,902,605 bytes in 68,606 blocks
==10506== total heap usage: 78,696 allocs, 10,091 frees, 11,925,853 bytes allocated
I.e. just 84 detected unmaps with no hits out of 9056 for this workload,
not much, but in some other long running workload this may save more
bytes.
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
LKML-Reference: <new-submission>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2010-08-03 06:45:23 +08:00
|
|
|
|
|
|
|
if (err)
|
2015-05-23 00:45:24 +08:00
|
|
|
goto out;
|
2010-03-26 23:11:06 +08:00
|
|
|
}
|
|
|
|
|
2015-05-23 00:45:24 +08:00
|
|
|
err = 0;
|
|
|
|
out:
|
2017-04-05 00:15:04 +08:00
|
|
|
up_write(&maps->lock);
|
2015-05-23 00:45:24 +08:00
|
|
|
return err;
|
|
|
|
}
|
|
|
|
|
|
|
|
int map_groups__fixup_overlappings(struct map_groups *mg, struct map *map,
|
|
|
|
FILE *fp)
|
|
|
|
{
|
|
|
|
return maps__fixup_overlappings(&mg->maps[map->type], map, fp);
|
2010-03-26 23:11:06 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* XXX This should not really _copy_ te maps, but refcount them.
|
|
|
|
*/
|
2016-07-04 20:16:23 +08:00
|
|
|
int map_groups__clone(struct thread *thread,
|
2010-03-26 23:11:06 +08:00
|
|
|
struct map_groups *parent, enum map_type type)
|
|
|
|
{
|
2016-07-04 20:16:23 +08:00
|
|
|
struct map_groups *mg = thread->mg;
|
2015-05-23 00:45:24 +08:00
|
|
|
int err = -ENOMEM;
|
2015-05-22 22:52:22 +08:00
|
|
|
struct map *map;
|
2015-05-22 23:58:53 +08:00
|
|
|
struct maps *maps = &parent->maps[type];
|
2015-05-22 22:52:22 +08:00
|
|
|
|
2017-04-05 00:15:04 +08:00
|
|
|
down_read(&maps->lock);
|
2015-05-23 00:45:24 +08:00
|
|
|
|
2015-05-22 22:52:22 +08:00
|
|
|
for (map = maps__first(maps); map; map = map__next(map)) {
|
2010-03-26 23:11:06 +08:00
|
|
|
struct map *new = map__clone(map);
|
|
|
|
if (new == NULL)
|
2015-05-23 00:45:24 +08:00
|
|
|
goto out_unlock;
|
2016-07-04 20:16:23 +08:00
|
|
|
|
|
|
|
err = unwind__prepare_access(thread, new, NULL);
|
|
|
|
if (err)
|
|
|
|
goto out_unlock;
|
|
|
|
|
2011-08-24 01:31:30 +08:00
|
|
|
map_groups__insert(mg, new);
|
2015-12-09 10:11:20 +08:00
|
|
|
map__put(new);
|
2010-03-26 23:11:06 +08:00
|
|
|
}
|
2015-05-23 00:45:24 +08:00
|
|
|
|
|
|
|
err = 0;
|
|
|
|
out_unlock:
|
2017-04-05 00:15:04 +08:00
|
|
|
up_read(&maps->lock);
|
2015-05-23 00:45:24 +08:00
|
|
|
return err;
|
2010-03-26 23:11:06 +08:00
|
|
|
}
|
|
|
|
|
2015-05-23 00:45:24 +08:00
|
|
|
static void __maps__insert(struct maps *maps, struct map *map)
|
2010-03-26 06:58:58 +08:00
|
|
|
{
|
2015-05-22 23:58:53 +08:00
|
|
|
struct rb_node **p = &maps->entries.rb_node;
|
2010-03-26 06:58:58 +08:00
|
|
|
struct rb_node *parent = NULL;
|
|
|
|
const u64 ip = map->start;
|
|
|
|
struct map *m;
|
|
|
|
|
|
|
|
while (*p != NULL) {
|
|
|
|
parent = *p;
|
|
|
|
m = rb_entry(parent, struct map, rb_node);
|
|
|
|
if (ip < m->start)
|
|
|
|
p = &(*p)->rb_left;
|
|
|
|
else
|
|
|
|
p = &(*p)->rb_right;
|
|
|
|
}
|
|
|
|
|
|
|
|
rb_link_node(&map->rb_node, parent, p);
|
2015-05-22 23:58:53 +08:00
|
|
|
rb_insert_color(&map->rb_node, &maps->entries);
|
2015-05-26 03:59:56 +08:00
|
|
|
map__get(map);
|
2010-03-26 06:58:58 +08:00
|
|
|
}
|
|
|
|
|
2015-05-23 00:45:24 +08:00
|
|
|
void maps__insert(struct maps *maps, struct map *map)
|
|
|
|
{
|
2017-04-05 00:15:04 +08:00
|
|
|
down_write(&maps->lock);
|
2015-05-23 00:45:24 +08:00
|
|
|
__maps__insert(maps, map);
|
2017-04-05 00:15:04 +08:00
|
|
|
up_write(&maps->lock);
|
2015-05-23 00:45:24 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
static void __maps__remove(struct maps *maps, struct map *map)
|
perf session: Free the ref_reloc_sym memory at the right place
Which is at perf_session__destroy_kernel_maps, counterpart to the
perf_session__create_kernel_maps where the kmap structure is located, just
after the vmlinux_maps.
Make it also check if the kernel maps were actually created, which may not
be the case if, for instance, perf_session__new can't complete due to
permission problems in, for instance, a 'perf report' case, when a
segfault will take place, that is how this was noticed.
The problem was introduced in d65a458, thus post .35.
This also adds code to release guest machines as them are also created
in perf_session__create_kernel_maps, so should be deleted on this newly
introduced counterpart, perf_session__destroy_kernel_maps.
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
LKML-Reference: <new-submission>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2010-08-03 05:18:28 +08:00
|
|
|
{
|
2015-05-26 02:30:09 +08:00
|
|
|
rb_erase_init(&map->rb_node, &maps->entries);
|
2015-05-26 03:59:56 +08:00
|
|
|
map__put(map);
|
perf session: Free the ref_reloc_sym memory at the right place
Which is at perf_session__destroy_kernel_maps, counterpart to the
perf_session__create_kernel_maps where the kmap structure is located, just
after the vmlinux_maps.
Make it also check if the kernel maps were actually created, which may not
be the case if, for instance, perf_session__new can't complete due to
permission problems in, for instance, a 'perf report' case, when a
segfault will take place, that is how this was noticed.
The problem was introduced in d65a458, thus post .35.
This also adds code to release guest machines as them are also created
in perf_session__create_kernel_maps, so should be deleted on this newly
introduced counterpart, perf_session__destroy_kernel_maps.
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
LKML-Reference: <new-submission>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2010-08-03 05:18:28 +08:00
|
|
|
}
|
|
|
|
|
2015-05-23 00:45:24 +08:00
|
|
|
void maps__remove(struct maps *maps, struct map *map)
|
|
|
|
{
|
2017-04-05 00:15:04 +08:00
|
|
|
down_write(&maps->lock);
|
2015-05-23 00:45:24 +08:00
|
|
|
__maps__remove(maps, map);
|
2017-04-05 00:15:04 +08:00
|
|
|
up_write(&maps->lock);
|
2015-05-23 00:45:24 +08:00
|
|
|
}
|
|
|
|
|
2015-05-22 23:58:53 +08:00
|
|
|
struct map *maps__find(struct maps *maps, u64 ip)
|
2010-03-26 06:58:58 +08:00
|
|
|
{
|
2015-05-23 00:45:24 +08:00
|
|
|
struct rb_node **p, *parent = NULL;
|
2010-03-26 06:58:58 +08:00
|
|
|
struct map *m;
|
|
|
|
|
2017-04-05 00:15:04 +08:00
|
|
|
down_read(&maps->lock);
|
2015-05-23 00:45:24 +08:00
|
|
|
|
|
|
|
p = &maps->entries.rb_node;
|
2010-03-26 06:58:58 +08:00
|
|
|
while (*p != NULL) {
|
|
|
|
parent = *p;
|
|
|
|
m = rb_entry(parent, struct map, rb_node);
|
|
|
|
if (ip < m->start)
|
|
|
|
p = &(*p)->rb_left;
|
2014-10-15 03:05:38 +08:00
|
|
|
else if (ip >= m->end)
|
2010-03-26 06:58:58 +08:00
|
|
|
p = &(*p)->rb_right;
|
|
|
|
else
|
2015-05-23 00:45:24 +08:00
|
|
|
goto out;
|
2010-03-26 06:58:58 +08:00
|
|
|
}
|
|
|
|
|
2015-05-23 00:45:24 +08:00
|
|
|
m = NULL;
|
|
|
|
out:
|
2017-04-05 00:15:04 +08:00
|
|
|
up_read(&maps->lock);
|
2015-05-23 00:45:24 +08:00
|
|
|
return m;
|
2010-03-26 06:58:58 +08:00
|
|
|
}
|
2013-08-07 19:38:51 +08:00
|
|
|
|
2015-05-22 23:58:53 +08:00
|
|
|
struct map *maps__first(struct maps *maps)
|
2013-08-07 19:38:51 +08:00
|
|
|
{
|
2015-05-22 23:58:53 +08:00
|
|
|
struct rb_node *first = rb_first(&maps->entries);
|
2013-08-07 19:38:51 +08:00
|
|
|
|
|
|
|
if (first)
|
|
|
|
return rb_entry(first, struct map, rb_node);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2015-05-22 04:48:33 +08:00
|
|
|
struct map *map__next(struct map *map)
|
2013-08-07 19:38:51 +08:00
|
|
|
{
|
|
|
|
struct rb_node *next = rb_next(&map->rb_node);
|
|
|
|
|
|
|
|
if (next)
|
|
|
|
return rb_entry(next, struct map, rb_node);
|
|
|
|
return NULL;
|
|
|
|
}
|
2015-04-07 16:22:45 +08:00
|
|
|
|
|
|
|
struct kmap *map__kmap(struct map *map)
|
|
|
|
{
|
|
|
|
if (!map->dso || !map->dso->kernel) {
|
|
|
|
pr_err("Internal error: map__kmap with a non-kernel map\n");
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
return (struct kmap *)(map + 1);
|
|
|
|
}
|
|
|
|
|
|
|
|
struct map_groups *map__kmaps(struct map *map)
|
|
|
|
{
|
|
|
|
struct kmap *kmap = map__kmap(map);
|
|
|
|
|
|
|
|
if (!kmap || !kmap->kmaps) {
|
|
|
|
pr_err("Internal error: map__kmaps with a non-kernel map\n");
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
return kmap->kmaps;
|
|
|
|
}
|