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
|
2017-04-18 21:46:11 +08:00
|
|
|
#include <errno.h>
|
2012-09-11 00:50:19 +08:00
|
|
|
#include <unistd.h>
|
|
|
|
|
#include <stdio.h>
|
|
|
|
|
#include <string.h>
|
|
|
|
|
#include <sys/types.h>
|
|
|
|
|
#include <sys/stat.h>
|
|
|
|
|
#include <fcntl.h>
|
|
|
|
|
#include <stdlib.h>
|
|
|
|
|
#include <linux/kernel.h>
|
|
|
|
|
|
|
|
|
|
#include "vdso.h"
|
2019-08-30 22:11:01 +08:00
|
|
|
#include "dso.h"
|
2019-09-03 21:56:06 +08:00
|
|
|
#include <internal/lib.h>
|
2019-01-27 20:42:37 +08:00
|
|
|
#include "map.h"
|
2012-09-11 00:50:19 +08:00
|
|
|
#include "symbol.h"
|
2014-07-22 21:17:53 +08:00
|
|
|
#include "machine.h"
|
2014-10-23 18:45:23 +08:00
|
|
|
#include "thread.h"
|
2012-09-11 00:50:19 +08:00
|
|
|
#include "linux/string.h"
|
2019-07-04 22:32:27 +08:00
|
|
|
#include <linux/zalloc.h>
|
2014-07-15 05:46:48 +08:00
|
|
|
#include "debug.h"
|
2012-09-11 00:50:19 +08:00
|
|
|
|
2014-10-24 05:16:03 +08:00
|
|
|
/*
|
2018-12-21 11:43:36 +08:00
|
|
|
* Include definition of find_map() also used in perf-read-vdso.c for
|
2014-10-24 05:16:03 +08:00
|
|
|
* building perf-read-vdso32 and perf-read-vdsox32.
|
|
|
|
|
*/
|
2018-12-21 11:43:36 +08:00
|
|
|
#include "find-map.c"
|
2014-10-24 05:16:03 +08:00
|
|
|
|
2014-07-22 21:17:54 +08:00
|
|
|
#define VDSO__TEMP_FILE_NAME "/tmp/perf-vdso.so-XXXXXX"
|
|
|
|
|
|
|
|
|
|
struct vdso_file {
|
|
|
|
|
bool found;
|
|
|
|
|
bool error;
|
|
|
|
|
char temp_file_name[sizeof(VDSO__TEMP_FILE_NAME)];
|
|
|
|
|
const char *dso_name;
|
2014-10-23 18:45:23 +08:00
|
|
|
const char *read_prog;
|
2014-07-22 21:17:54 +08:00
|
|
|
};
|
|
|
|
|
|
|
|
|
|
struct vdso_info {
|
|
|
|
|
struct vdso_file vdso;
|
2014-10-23 18:45:23 +08:00
|
|
|
#if BITS_PER_LONG == 64
|
|
|
|
|
struct vdso_file vdso32;
|
|
|
|
|
struct vdso_file vdsox32;
|
|
|
|
|
#endif
|
2014-07-22 21:17:54 +08:00
|
|
|
};
|
|
|
|
|
|
2014-07-23 19:23:00 +08:00
|
|
|
static struct vdso_info *vdso_info__new(void)
|
|
|
|
|
{
|
|
|
|
|
static const struct vdso_info vdso_info_init = {
|
|
|
|
|
.vdso = {
|
|
|
|
|
.temp_file_name = VDSO__TEMP_FILE_NAME,
|
2014-07-22 21:17:57 +08:00
|
|
|
.dso_name = DSO__NAME_VDSO,
|
2014-07-23 19:23:00 +08:00
|
|
|
},
|
2014-10-23 18:45:23 +08:00
|
|
|
#if BITS_PER_LONG == 64
|
|
|
|
|
.vdso32 = {
|
|
|
|
|
.temp_file_name = VDSO__TEMP_FILE_NAME,
|
|
|
|
|
.dso_name = DSO__NAME_VDSO32,
|
|
|
|
|
.read_prog = "perf-read-vdso32",
|
|
|
|
|
},
|
|
|
|
|
.vdsox32 = {
|
|
|
|
|
.temp_file_name = VDSO__TEMP_FILE_NAME,
|
|
|
|
|
.dso_name = DSO__NAME_VDSOX32,
|
|
|
|
|
.read_prog = "perf-read-vdsox32",
|
|
|
|
|
},
|
|
|
|
|
#endif
|
2014-07-23 19:23:00 +08:00
|
|
|
};
|
|
|
|
|
|
|
|
|
|
return memdup(&vdso_info_init, sizeof(vdso_info_init));
|
|
|
|
|
}
|
2012-09-11 00:50:19 +08:00
|
|
|
|
2014-07-22 21:17:54 +08:00
|
|
|
static char *get_file(struct vdso_file *vdso_file)
|
2012-09-11 00:50:19 +08:00
|
|
|
{
|
|
|
|
|
char *vdso = NULL;
|
|
|
|
|
char *buf = NULL;
|
|
|
|
|
void *start, *end;
|
|
|
|
|
size_t size;
|
|
|
|
|
int fd;
|
|
|
|
|
|
2014-07-22 21:17:54 +08:00
|
|
|
if (vdso_file->found)
|
|
|
|
|
return vdso_file->temp_file_name;
|
2012-09-11 00:50:19 +08:00
|
|
|
|
2018-12-21 11:43:36 +08:00
|
|
|
if (vdso_file->error || find_map(&start, &end, VDSO__MAP_NAME))
|
2012-09-11 00:50:19 +08:00
|
|
|
return NULL;
|
|
|
|
|
|
|
|
|
|
size = end - start;
|
|
|
|
|
|
|
|
|
|
buf = memdup(start, size);
|
|
|
|
|
if (!buf)
|
|
|
|
|
return NULL;
|
|
|
|
|
|
2014-07-22 21:17:54 +08:00
|
|
|
fd = mkstemp(vdso_file->temp_file_name);
|
2012-09-11 00:50:19 +08:00
|
|
|
if (fd < 0)
|
|
|
|
|
goto out;
|
|
|
|
|
|
|
|
|
|
if (size == (size_t) write(fd, buf, size))
|
2014-07-22 21:17:54 +08:00
|
|
|
vdso = vdso_file->temp_file_name;
|
2012-09-11 00:50:19 +08:00
|
|
|
|
|
|
|
|
close(fd);
|
|
|
|
|
|
|
|
|
|
out:
|
|
|
|
|
free(buf);
|
|
|
|
|
|
2014-07-22 21:17:54 +08:00
|
|
|
vdso_file->found = (vdso != NULL);
|
|
|
|
|
vdso_file->error = !vdso_file->found;
|
2012-09-11 00:50:19 +08:00
|
|
|
return vdso;
|
|
|
|
|
}
|
|
|
|
|
|
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
|
|
|
void machine__exit_vdso(struct machine *machine)
|
2012-09-11 00:50:19 +08:00
|
|
|
{
|
2014-07-23 19:23:00 +08:00
|
|
|
struct vdso_info *vdso_info = machine->vdso_info;
|
|
|
|
|
|
|
|
|
|
if (!vdso_info)
|
|
|
|
|
return;
|
|
|
|
|
|
2014-07-22 21:17:54 +08:00
|
|
|
if (vdso_info->vdso.found)
|
|
|
|
|
unlink(vdso_info->vdso.temp_file_name);
|
2014-10-23 18:45:23 +08:00
|
|
|
#if BITS_PER_LONG == 64
|
|
|
|
|
if (vdso_info->vdso32.found)
|
|
|
|
|
unlink(vdso_info->vdso32.temp_file_name);
|
|
|
|
|
if (vdso_info->vdsox32.found)
|
|
|
|
|
unlink(vdso_info->vdsox32.temp_file_name);
|
|
|
|
|
#endif
|
2014-07-23 19:23:00 +08:00
|
|
|
|
|
|
|
|
zfree(&machine->vdso_info);
|
2012-09-11 00:50:19 +08:00
|
|
|
}
|
|
|
|
|
|
2015-06-02 02:40:01 +08:00
|
|
|
static struct dso *__machine__addnew_vdso(struct machine *machine, const char *short_name,
|
|
|
|
|
const char *long_name)
|
2014-07-22 21:17:56 +08:00
|
|
|
{
|
|
|
|
|
struct dso *dso;
|
|
|
|
|
|
|
|
|
|
dso = dso__new(short_name);
|
|
|
|
|
if (dso != NULL) {
|
2015-06-02 02:40:01 +08:00
|
|
|
__dsos__add(&machine->dsos, dso);
|
2014-07-22 21:17:56 +08:00
|
|
|
dso__set_long_name(dso, long_name, false);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return dso;
|
|
|
|
|
}
|
|
|
|
|
|
2014-10-23 18:45:23 +08:00
|
|
|
static enum dso_type machine__thread_dso_type(struct machine *machine,
|
|
|
|
|
struct thread *thread)
|
|
|
|
|
{
|
|
|
|
|
enum dso_type dso_type = DSO__TYPE_UNKNOWN;
|
2019-10-28 22:55:28 +08:00
|
|
|
struct map *map;
|
2014-10-23 18:45:23 +08:00
|
|
|
|
2019-11-26 09:07:43 +08:00
|
|
|
maps__for_each_entry(thread->maps, map) {
|
2018-04-26 04:28:55 +08:00
|
|
|
struct dso *dso = map->dso;
|
2014-10-23 18:45:23 +08:00
|
|
|
if (!dso || dso->long_name[0] != '/')
|
|
|
|
|
continue;
|
|
|
|
|
dso_type = dso__type(dso, machine);
|
|
|
|
|
if (dso_type != DSO__TYPE_UNKNOWN)
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return dso_type;
|
|
|
|
|
}
|
|
|
|
|
|
perf tools: Find right DSO taking into account if binary is 32 or 64-bit
There's a problem in machine__findnew_vdso(), vdso buildid generated by a
32-bit machine stores it with the name 'vdso', but when processing buildid on a
64-bit machine with the same 'perf.data', perf will search for vdso named as
'vdso32' and get failed.
This patch tries to find the existing dsos in machine->dsos by thread dso_type.
64-bit thread tries to find vdso with name 'vdso', because all 64-bit vdso is
named as that. 32-bit thread first tries to find vdso with name 'vdso32' if
this thread was run on 64-bit machine, if failed, then it tries 'vdso' which
indicates that the thread was run on 32-bit machine when recording.
Committer note:
Additional explanation by Adrian Hunter:
We match maps to builds ids using the file name - consider
machine__findnew_[v]dso() called in map__new(). So in the context of a perf
data file, we consider the file name to be unique.
A vdso map does not have a file name - all we know is that it is vdso. We look
at the thread to tell if it is 32-bit, 64-bit or x32. Then we need to get the
build id which has been recorded using short name "[vdso]" or "[vdso32]" or
"[vdsox32]".
The problem is that on a 32-bit machine, we use the name "[vdso]". If you take
a 32-bit perf data file to a 64-bit machine, it gets hard to figure out if
"[vdso]" is 32-bit or 64-bit.
This patch solves that problem.
----
This also merges a followup patch fixing a problem introduced by the
original submission of this patch, that would crash 'perf record' when
recording samples for a 32-bit app on a 64-bit system.
Signed-off-by: He Kuang <hekuang@huawei.com>
Acked-by: Adrian Hunter <adrian.hunter@intel.com>
Tested-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Ekaterina Tumanova <tumanova@linux.vnet.ibm.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Josh Poimboeuf <jpoimboe@redhat.com>
Cc: Kan Liang <kan.liang@intel.com>
Cc: Masami Hiramatsu <mhiramat@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Pekka Enberg <penberg@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Cc: Sukadev Bhattiprolu <sukadev@linux.vnet.ibm.com>
Cc: Wang Nan <wangnan0@huawei.com>
Link: http://lkml.kernel.org/r/1463475894-163531-1-git-send-email-hekuang@huawei.com
Link: http://lkml.kernel.org/r/1466578626-92406-6-git-send-email-hekuang@huawei.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2016-05-17 17:04:54 +08:00
|
|
|
#if BITS_PER_LONG == 64
|
|
|
|
|
|
2014-10-23 18:45:23 +08:00
|
|
|
static int vdso__do_copy_compat(FILE *f, int fd)
|
|
|
|
|
{
|
|
|
|
|
char buf[4096];
|
|
|
|
|
size_t count;
|
|
|
|
|
|
|
|
|
|
while (1) {
|
|
|
|
|
count = fread(buf, 1, sizeof(buf), f);
|
|
|
|
|
if (ferror(f))
|
|
|
|
|
return -errno;
|
|
|
|
|
if (feof(f))
|
|
|
|
|
break;
|
|
|
|
|
if (count && writen(fd, buf, count) != (ssize_t)count)
|
|
|
|
|
return -errno;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static int vdso__copy_compat(const char *prog, int fd)
|
|
|
|
|
{
|
|
|
|
|
FILE *f;
|
|
|
|
|
int err;
|
|
|
|
|
|
|
|
|
|
f = popen(prog, "r");
|
|
|
|
|
if (!f)
|
|
|
|
|
return -errno;
|
|
|
|
|
|
|
|
|
|
err = vdso__do_copy_compat(f, fd);
|
|
|
|
|
|
|
|
|
|
if (pclose(f) == -1)
|
|
|
|
|
return -errno;
|
|
|
|
|
|
|
|
|
|
return err;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static int vdso__create_compat_file(const char *prog, char *temp_name)
|
|
|
|
|
{
|
|
|
|
|
int fd, err;
|
|
|
|
|
|
|
|
|
|
fd = mkstemp(temp_name);
|
|
|
|
|
if (fd < 0)
|
|
|
|
|
return -errno;
|
|
|
|
|
|
|
|
|
|
err = vdso__copy_compat(prog, fd);
|
|
|
|
|
|
|
|
|
|
if (close(fd) == -1)
|
|
|
|
|
return -errno;
|
|
|
|
|
|
|
|
|
|
return err;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static const char *vdso__get_compat_file(struct vdso_file *vdso_file)
|
|
|
|
|
{
|
|
|
|
|
int err;
|
|
|
|
|
|
|
|
|
|
if (vdso_file->found)
|
|
|
|
|
return vdso_file->temp_file_name;
|
|
|
|
|
|
|
|
|
|
if (vdso_file->error)
|
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
|
|
err = vdso__create_compat_file(vdso_file->read_prog,
|
|
|
|
|
vdso_file->temp_file_name);
|
|
|
|
|
if (err) {
|
|
|
|
|
pr_err("%s failed, error %d\n", vdso_file->read_prog, err);
|
|
|
|
|
vdso_file->error = true;
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
vdso_file->found = true;
|
|
|
|
|
|
|
|
|
|
return vdso_file->temp_file_name;
|
|
|
|
|
}
|
|
|
|
|
|
2015-06-02 02:40:01 +08:00
|
|
|
static struct dso *__machine__findnew_compat(struct machine *machine,
|
|
|
|
|
struct vdso_file *vdso_file)
|
2014-10-23 18:45:23 +08:00
|
|
|
{
|
|
|
|
|
const char *file_name;
|
|
|
|
|
struct dso *dso;
|
|
|
|
|
|
2015-06-02 02:40:01 +08:00
|
|
|
dso = __dsos__find(&machine->dsos, vdso_file->dso_name, true);
|
2014-10-23 18:45:23 +08:00
|
|
|
if (dso)
|
2015-07-07 19:13:38 +08:00
|
|
|
goto out;
|
2014-10-23 18:45:23 +08:00
|
|
|
|
|
|
|
|
file_name = vdso__get_compat_file(vdso_file);
|
|
|
|
|
if (!file_name)
|
2015-07-07 19:13:38 +08:00
|
|
|
goto out;
|
2014-10-23 18:45:23 +08:00
|
|
|
|
2015-06-02 02:40:01 +08:00
|
|
|
dso = __machine__addnew_vdso(machine, vdso_file->dso_name, file_name);
|
2015-07-07 19:13:38 +08:00
|
|
|
out:
|
2015-06-02 02:40:01 +08:00
|
|
|
return dso;
|
2014-10-23 18:45:23 +08:00
|
|
|
}
|
|
|
|
|
|
2015-06-02 02:40:01 +08:00
|
|
|
static int __machine__findnew_vdso_compat(struct machine *machine,
|
|
|
|
|
struct thread *thread,
|
|
|
|
|
struct vdso_info *vdso_info,
|
|
|
|
|
struct dso **dso)
|
2014-10-23 18:45:23 +08:00
|
|
|
{
|
|
|
|
|
enum dso_type dso_type;
|
|
|
|
|
|
|
|
|
|
dso_type = machine__thread_dso_type(machine, thread);
|
2014-10-23 18:45:24 +08:00
|
|
|
|
|
|
|
|
#ifndef HAVE_PERF_READ_VDSO32
|
|
|
|
|
if (dso_type == DSO__TYPE_32BIT)
|
|
|
|
|
return 0;
|
|
|
|
|
#endif
|
|
|
|
|
#ifndef HAVE_PERF_READ_VDSOX32
|
|
|
|
|
if (dso_type == DSO__TYPE_X32BIT)
|
|
|
|
|
return 0;
|
|
|
|
|
#endif
|
|
|
|
|
|
2014-10-23 18:45:23 +08:00
|
|
|
switch (dso_type) {
|
|
|
|
|
case DSO__TYPE_32BIT:
|
2015-06-02 02:40:01 +08:00
|
|
|
*dso = __machine__findnew_compat(machine, &vdso_info->vdso32);
|
2014-10-23 18:45:23 +08:00
|
|
|
return 1;
|
|
|
|
|
case DSO__TYPE_X32BIT:
|
2015-06-02 02:40:01 +08:00
|
|
|
*dso = __machine__findnew_compat(machine, &vdso_info->vdsox32);
|
2014-10-23 18:45:23 +08:00
|
|
|
return 1;
|
|
|
|
|
case DSO__TYPE_UNKNOWN:
|
|
|
|
|
case DSO__TYPE_64BIT:
|
|
|
|
|
default:
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#endif
|
|
|
|
|
|
perf tools: Find right DSO taking into account if binary is 32 or 64-bit
There's a problem in machine__findnew_vdso(), vdso buildid generated by a
32-bit machine stores it with the name 'vdso', but when processing buildid on a
64-bit machine with the same 'perf.data', perf will search for vdso named as
'vdso32' and get failed.
This patch tries to find the existing dsos in machine->dsos by thread dso_type.
64-bit thread tries to find vdso with name 'vdso', because all 64-bit vdso is
named as that. 32-bit thread first tries to find vdso with name 'vdso32' if
this thread was run on 64-bit machine, if failed, then it tries 'vdso' which
indicates that the thread was run on 32-bit machine when recording.
Committer note:
Additional explanation by Adrian Hunter:
We match maps to builds ids using the file name - consider
machine__findnew_[v]dso() called in map__new(). So in the context of a perf
data file, we consider the file name to be unique.
A vdso map does not have a file name - all we know is that it is vdso. We look
at the thread to tell if it is 32-bit, 64-bit or x32. Then we need to get the
build id which has been recorded using short name "[vdso]" or "[vdso32]" or
"[vdsox32]".
The problem is that on a 32-bit machine, we use the name "[vdso]". If you take
a 32-bit perf data file to a 64-bit machine, it gets hard to figure out if
"[vdso]" is 32-bit or 64-bit.
This patch solves that problem.
----
This also merges a followup patch fixing a problem introduced by the
original submission of this patch, that would crash 'perf record' when
recording samples for a 32-bit app on a 64-bit system.
Signed-off-by: He Kuang <hekuang@huawei.com>
Acked-by: Adrian Hunter <adrian.hunter@intel.com>
Tested-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Ekaterina Tumanova <tumanova@linux.vnet.ibm.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Josh Poimboeuf <jpoimboe@redhat.com>
Cc: Kan Liang <kan.liang@intel.com>
Cc: Masami Hiramatsu <mhiramat@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Pekka Enberg <penberg@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Cc: Sukadev Bhattiprolu <sukadev@linux.vnet.ibm.com>
Cc: Wang Nan <wangnan0@huawei.com>
Link: http://lkml.kernel.org/r/1463475894-163531-1-git-send-email-hekuang@huawei.com
Link: http://lkml.kernel.org/r/1466578626-92406-6-git-send-email-hekuang@huawei.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2016-05-17 17:04:54 +08:00
|
|
|
static struct dso *machine__find_vdso(struct machine *machine,
|
|
|
|
|
struct thread *thread)
|
|
|
|
|
{
|
|
|
|
|
struct dso *dso = NULL;
|
|
|
|
|
enum dso_type dso_type;
|
|
|
|
|
|
|
|
|
|
dso_type = machine__thread_dso_type(machine, thread);
|
|
|
|
|
switch (dso_type) {
|
|
|
|
|
case DSO__TYPE_32BIT:
|
|
|
|
|
dso = __dsos__find(&machine->dsos, DSO__NAME_VDSO32, true);
|
|
|
|
|
if (!dso) {
|
|
|
|
|
dso = __dsos__find(&machine->dsos, DSO__NAME_VDSO,
|
|
|
|
|
true);
|
|
|
|
|
if (dso && dso_type != dso__type(dso, machine))
|
|
|
|
|
dso = NULL;
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
case DSO__TYPE_X32BIT:
|
|
|
|
|
dso = __dsos__find(&machine->dsos, DSO__NAME_VDSOX32, true);
|
|
|
|
|
break;
|
|
|
|
|
case DSO__TYPE_64BIT:
|
|
|
|
|
case DSO__TYPE_UNKNOWN:
|
|
|
|
|
default:
|
|
|
|
|
dso = __dsos__find(&machine->dsos, DSO__NAME_VDSO, true);
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return dso;
|
|
|
|
|
}
|
|
|
|
|
|
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
|
|
|
struct dso *machine__findnew_vdso(struct machine *machine,
|
perf tools: Find right DSO taking into account if binary is 32 or 64-bit
There's a problem in machine__findnew_vdso(), vdso buildid generated by a
32-bit machine stores it with the name 'vdso', but when processing buildid on a
64-bit machine with the same 'perf.data', perf will search for vdso named as
'vdso32' and get failed.
This patch tries to find the existing dsos in machine->dsos by thread dso_type.
64-bit thread tries to find vdso with name 'vdso', because all 64-bit vdso is
named as that. 32-bit thread first tries to find vdso with name 'vdso32' if
this thread was run on 64-bit machine, if failed, then it tries 'vdso' which
indicates that the thread was run on 32-bit machine when recording.
Committer note:
Additional explanation by Adrian Hunter:
We match maps to builds ids using the file name - consider
machine__findnew_[v]dso() called in map__new(). So in the context of a perf
data file, we consider the file name to be unique.
A vdso map does not have a file name - all we know is that it is vdso. We look
at the thread to tell if it is 32-bit, 64-bit or x32. Then we need to get the
build id which has been recorded using short name "[vdso]" or "[vdso32]" or
"[vdsox32]".
The problem is that on a 32-bit machine, we use the name "[vdso]". If you take
a 32-bit perf data file to a 64-bit machine, it gets hard to figure out if
"[vdso]" is 32-bit or 64-bit.
This patch solves that problem.
----
This also merges a followup patch fixing a problem introduced by the
original submission of this patch, that would crash 'perf record' when
recording samples for a 32-bit app on a 64-bit system.
Signed-off-by: He Kuang <hekuang@huawei.com>
Acked-by: Adrian Hunter <adrian.hunter@intel.com>
Tested-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Ekaterina Tumanova <tumanova@linux.vnet.ibm.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Josh Poimboeuf <jpoimboe@redhat.com>
Cc: Kan Liang <kan.liang@intel.com>
Cc: Masami Hiramatsu <mhiramat@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Pekka Enberg <penberg@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Cc: Sukadev Bhattiprolu <sukadev@linux.vnet.ibm.com>
Cc: Wang Nan <wangnan0@huawei.com>
Link: http://lkml.kernel.org/r/1463475894-163531-1-git-send-email-hekuang@huawei.com
Link: http://lkml.kernel.org/r/1466578626-92406-6-git-send-email-hekuang@huawei.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2016-05-17 17:04:54 +08:00
|
|
|
struct thread *thread)
|
2012-09-11 00:50:19 +08:00
|
|
|
{
|
2014-07-23 19:23:00 +08:00
|
|
|
struct vdso_info *vdso_info;
|
2015-06-02 02:40:01 +08:00
|
|
|
struct dso *dso = NULL;
|
2014-07-23 19:23:00 +08:00
|
|
|
|
2017-04-05 00:15:04 +08:00
|
|
|
down_write(&machine->dsos.lock);
|
2014-07-23 19:23:00 +08:00
|
|
|
if (!machine->vdso_info)
|
|
|
|
|
machine->vdso_info = vdso_info__new();
|
|
|
|
|
|
|
|
|
|
vdso_info = machine->vdso_info;
|
|
|
|
|
if (!vdso_info)
|
2015-06-02 02:40:01 +08:00
|
|
|
goto out_unlock;
|
2012-09-11 00:50:19 +08:00
|
|
|
|
perf tools: Find right DSO taking into account if binary is 32 or 64-bit
There's a problem in machine__findnew_vdso(), vdso buildid generated by a
32-bit machine stores it with the name 'vdso', but when processing buildid on a
64-bit machine with the same 'perf.data', perf will search for vdso named as
'vdso32' and get failed.
This patch tries to find the existing dsos in machine->dsos by thread dso_type.
64-bit thread tries to find vdso with name 'vdso', because all 64-bit vdso is
named as that. 32-bit thread first tries to find vdso with name 'vdso32' if
this thread was run on 64-bit machine, if failed, then it tries 'vdso' which
indicates that the thread was run on 32-bit machine when recording.
Committer note:
Additional explanation by Adrian Hunter:
We match maps to builds ids using the file name - consider
machine__findnew_[v]dso() called in map__new(). So in the context of a perf
data file, we consider the file name to be unique.
A vdso map does not have a file name - all we know is that it is vdso. We look
at the thread to tell if it is 32-bit, 64-bit or x32. Then we need to get the
build id which has been recorded using short name "[vdso]" or "[vdso32]" or
"[vdsox32]".
The problem is that on a 32-bit machine, we use the name "[vdso]". If you take
a 32-bit perf data file to a 64-bit machine, it gets hard to figure out if
"[vdso]" is 32-bit or 64-bit.
This patch solves that problem.
----
This also merges a followup patch fixing a problem introduced by the
original submission of this patch, that would crash 'perf record' when
recording samples for a 32-bit app on a 64-bit system.
Signed-off-by: He Kuang <hekuang@huawei.com>
Acked-by: Adrian Hunter <adrian.hunter@intel.com>
Tested-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Ekaterina Tumanova <tumanova@linux.vnet.ibm.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Josh Poimboeuf <jpoimboe@redhat.com>
Cc: Kan Liang <kan.liang@intel.com>
Cc: Masami Hiramatsu <mhiramat@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Pekka Enberg <penberg@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Cc: Sukadev Bhattiprolu <sukadev@linux.vnet.ibm.com>
Cc: Wang Nan <wangnan0@huawei.com>
Link: http://lkml.kernel.org/r/1463475894-163531-1-git-send-email-hekuang@huawei.com
Link: http://lkml.kernel.org/r/1466578626-92406-6-git-send-email-hekuang@huawei.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2016-05-17 17:04:54 +08:00
|
|
|
dso = machine__find_vdso(machine, thread);
|
|
|
|
|
if (dso)
|
|
|
|
|
goto out_unlock;
|
|
|
|
|
|
2014-10-23 18:45:23 +08:00
|
|
|
#if BITS_PER_LONG == 64
|
2015-06-02 02:40:01 +08:00
|
|
|
if (__machine__findnew_vdso_compat(machine, thread, vdso_info, &dso))
|
|
|
|
|
goto out_unlock;
|
2014-10-23 18:45:23 +08:00
|
|
|
#endif
|
|
|
|
|
|
2015-06-02 02:40:01 +08:00
|
|
|
dso = __dsos__find(&machine->dsos, DSO__NAME_VDSO, true);
|
2012-09-11 00:50:19 +08:00
|
|
|
if (!dso) {
|
|
|
|
|
char *file;
|
|
|
|
|
|
2014-07-22 21:17:54 +08:00
|
|
|
file = get_file(&vdso_info->vdso);
|
2015-06-02 02:40:01 +08:00
|
|
|
if (file)
|
|
|
|
|
dso = __machine__addnew_vdso(machine, DSO__NAME_VDSO, file);
|
2012-09-11 00:50:19 +08:00
|
|
|
}
|
|
|
|
|
|
2015-06-02 02:40:01 +08:00
|
|
|
out_unlock:
|
2015-06-02 22:53:26 +08:00
|
|
|
dso__get(dso);
|
2017-04-05 00:15:04 +08:00
|
|
|
up_write(&machine->dsos.lock);
|
2012-09-11 00:50:19 +08:00
|
|
|
return dso;
|
|
|
|
|
}
|
2014-07-22 21:17:57 +08:00
|
|
|
|
|
|
|
|
bool dso__is_vdso(struct dso *dso)
|
|
|
|
|
{
|
2014-10-23 18:45:23 +08:00
|
|
|
return !strcmp(dso->short_name, DSO__NAME_VDSO) ||
|
|
|
|
|
!strcmp(dso->short_name, DSO__NAME_VDSO32) ||
|
|
|
|
|
!strcmp(dso->short_name, DSO__NAME_VDSOX32);
|
2014-07-22 21:17:57 +08:00
|
|
|
}
|