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 15:07:57 +01:00
|
|
|
// SPDX-License-Identifier: GPL-2.0
|
2010-01-20 18:28:45 +01:00
|
|
|
/*
|
|
|
|
* builtin-buildid-cache.c
|
|
|
|
*
|
|
|
|
* Builtin buildid-cache command: Manages build-id cache
|
|
|
|
*
|
|
|
|
* Copyright (C) 2010, Red Hat Inc.
|
|
|
|
* Copyright (C) 2010, Arnaldo Carvalho de Melo <acme@redhat.com>
|
|
|
|
*/
|
2013-10-14 15:57:29 +02:00
|
|
|
#include <sys/types.h>
|
|
|
|
#include <sys/time.h>
|
|
|
|
#include <time.h>
|
|
|
|
#include <dirent.h>
|
2017-04-18 15:46:11 +02:00
|
|
|
#include <errno.h>
|
2013-10-14 15:57:29 +02:00
|
|
|
#include <unistd.h>
|
2010-01-20 18:28:45 +01:00
|
|
|
#include "builtin.h"
|
|
|
|
#include "perf.h"
|
2017-07-06 03:48:11 +02:00
|
|
|
#include "namespaces.h"
|
2010-01-20 18:28:45 +01:00
|
|
|
#include "util/cache.h"
|
|
|
|
#include "util/debug.h"
|
|
|
|
#include "util/header.h"
|
2015-12-15 16:39:39 +01:00
|
|
|
#include <subcmd/parse-options.h>
|
2010-01-20 18:28:45 +01:00
|
|
|
#include "util/strlist.h"
|
2012-10-27 23:18:28 +02:00
|
|
|
#include "util/build-id.h"
|
2012-12-07 20:28:27 +01:00
|
|
|
#include "util/session.h"
|
2012-10-27 23:18:29 +02:00
|
|
|
#include "util/symbol.h"
|
2017-04-19 21:12:39 +02:00
|
|
|
#include "util/time-utils.h"
|
2010-01-20 18:28:45 +01:00
|
|
|
|
2013-10-14 15:57:29 +02:00
|
|
|
static int build_id_cache__kcore_buildid(const char *proc_dir, char *sbuildid)
|
|
|
|
{
|
|
|
|
char root_dir[PATH_MAX];
|
|
|
|
char *p;
|
|
|
|
|
|
|
|
strlcpy(root_dir, proc_dir, sizeof(root_dir));
|
|
|
|
|
|
|
|
p = strrchr(root_dir, '/');
|
|
|
|
if (!p)
|
|
|
|
return -1;
|
|
|
|
*p = '\0';
|
2015-08-15 13:42:59 +02:00
|
|
|
return sysfs__sprintf_build_id(root_dir, sbuildid);
|
2013-10-14 15:57:29 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
static int build_id_cache__kcore_dir(char *dir, size_t sz)
|
|
|
|
{
|
2016-01-25 10:56:13 +01:00
|
|
|
return fetch_current_timestamp(dir, sz);
|
2013-10-14 15:57:29 +02:00
|
|
|
}
|
|
|
|
|
2014-01-29 15:14:44 +01:00
|
|
|
static bool same_kallsyms_reloc(const char *from_dir, char *to_dir)
|
|
|
|
{
|
|
|
|
char from[PATH_MAX];
|
|
|
|
char to[PATH_MAX];
|
|
|
|
const char *name;
|
|
|
|
u64 addr1 = 0, addr2 = 0;
|
perf symbols: Accept symbols starting at address 0
That is the case of _text on s390, and we have some functions that return an
address, using address zero to report problems, oops.
This would lead the symbol loading routines to not use "_text" as the reference
relocation symbol, or the first symbol for the kernel, but use instead
"_stext", that is at the same address on x86_64 and others, but not on s390:
[acme@localhost perf-4.11.0-rc6]$ head -15 /proc/kallsyms
0000000000000000 T _text
0000000000000418 t iplstart
0000000000000800 T start
000000000000080a t .base
000000000000082e t .sk8x8
0000000000000834 t .gotr
0000000000000842 t .cmd
0000000000000846 t .parm
000000000000084a t .lowcase
0000000000010000 T startup
0000000000010010 T startup_kdump
0000000000010214 t startup_kdump_relocated
0000000000011000 T startup_continue
00000000000112a0 T _ehead
0000000000100000 T _stext
[acme@localhost perf-4.11.0-rc6]$
Which in turn would make 'perf test vmlinux' to fail because it wouldn't find
the symbols before "_stext" in kallsyms.
Fix it by using the return value only for errors and storing the
address, when the symbol is successfully found, in a provided pointer
arg.
Before this patch:
After:
[acme@localhost perf-4.11.0-rc6]$ tools/perf/perf test -v 1
1: vmlinux symtab matches kallsyms :
--- start ---
test child forked, pid 40693
Looking at the vmlinux_path (8 entries long)
Using /usr/lib/debug/lib/modules/3.10.0-654.el7.s390x/vmlinux for symbols
ERR : 0: _text not on kallsyms
ERR : 0x418: iplstart not on kallsyms
ERR : 0x800: start not on kallsyms
ERR : 0x80a: .base not on kallsyms
ERR : 0x82e: .sk8x8 not on kallsyms
ERR : 0x834: .gotr not on kallsyms
ERR : 0x842: .cmd not on kallsyms
ERR : 0x846: .parm not on kallsyms
ERR : 0x84a: .lowcase not on kallsyms
ERR : 0x10000: startup not on kallsyms
ERR : 0x10010: startup_kdump not on kallsyms
ERR : 0x10214: startup_kdump_relocated not on kallsyms
ERR : 0x11000: startup_continue not on kallsyms
ERR : 0x112a0: _ehead not on kallsyms
<SNIP warnings>
test child finished with -1
---- end ----
vmlinux symtab matches kallsyms: FAILED!
[acme@localhost perf-4.11.0-rc6]$
After:
[acme@localhost perf-4.11.0-rc6]$ tools/perf/perf test -v 1
1: vmlinux symtab matches kallsyms :
--- start ---
test child forked, pid 47160
<SNIP warnings>
test child finished with 0
---- end ----
vmlinux symtab matches kallsyms: Ok
[acme@localhost perf-4.11.0-rc6]$
Reported-by: Michael Petlan <mpetlan@redhat.com>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Wang Nan <wangnan0@huawei.com>
Link: http://lkml.kernel.org/n/tip-9x9bwgd3btwdk1u51xie93fz@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2017-04-28 02:21:09 +02:00
|
|
|
int i, err = -1;
|
2014-01-29 15:14:44 +01:00
|
|
|
|
|
|
|
scnprintf(from, sizeof(from), "%s/kallsyms", from_dir);
|
|
|
|
scnprintf(to, sizeof(to), "%s/kallsyms", to_dir);
|
|
|
|
|
|
|
|
for (i = 0; (name = ref_reloc_sym_names[i]) != NULL; i++) {
|
perf symbols: Accept symbols starting at address 0
That is the case of _text on s390, and we have some functions that return an
address, using address zero to report problems, oops.
This would lead the symbol loading routines to not use "_text" as the reference
relocation symbol, or the first symbol for the kernel, but use instead
"_stext", that is at the same address on x86_64 and others, but not on s390:
[acme@localhost perf-4.11.0-rc6]$ head -15 /proc/kallsyms
0000000000000000 T _text
0000000000000418 t iplstart
0000000000000800 T start
000000000000080a t .base
000000000000082e t .sk8x8
0000000000000834 t .gotr
0000000000000842 t .cmd
0000000000000846 t .parm
000000000000084a t .lowcase
0000000000010000 T startup
0000000000010010 T startup_kdump
0000000000010214 t startup_kdump_relocated
0000000000011000 T startup_continue
00000000000112a0 T _ehead
0000000000100000 T _stext
[acme@localhost perf-4.11.0-rc6]$
Which in turn would make 'perf test vmlinux' to fail because it wouldn't find
the symbols before "_stext" in kallsyms.
Fix it by using the return value only for errors and storing the
address, when the symbol is successfully found, in a provided pointer
arg.
Before this patch:
After:
[acme@localhost perf-4.11.0-rc6]$ tools/perf/perf test -v 1
1: vmlinux symtab matches kallsyms :
--- start ---
test child forked, pid 40693
Looking at the vmlinux_path (8 entries long)
Using /usr/lib/debug/lib/modules/3.10.0-654.el7.s390x/vmlinux for symbols
ERR : 0: _text not on kallsyms
ERR : 0x418: iplstart not on kallsyms
ERR : 0x800: start not on kallsyms
ERR : 0x80a: .base not on kallsyms
ERR : 0x82e: .sk8x8 not on kallsyms
ERR : 0x834: .gotr not on kallsyms
ERR : 0x842: .cmd not on kallsyms
ERR : 0x846: .parm not on kallsyms
ERR : 0x84a: .lowcase not on kallsyms
ERR : 0x10000: startup not on kallsyms
ERR : 0x10010: startup_kdump not on kallsyms
ERR : 0x10214: startup_kdump_relocated not on kallsyms
ERR : 0x11000: startup_continue not on kallsyms
ERR : 0x112a0: _ehead not on kallsyms
<SNIP warnings>
test child finished with -1
---- end ----
vmlinux symtab matches kallsyms: FAILED!
[acme@localhost perf-4.11.0-rc6]$
After:
[acme@localhost perf-4.11.0-rc6]$ tools/perf/perf test -v 1
1: vmlinux symtab matches kallsyms :
--- start ---
test child forked, pid 47160
<SNIP warnings>
test child finished with 0
---- end ----
vmlinux symtab matches kallsyms: Ok
[acme@localhost perf-4.11.0-rc6]$
Reported-by: Michael Petlan <mpetlan@redhat.com>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Wang Nan <wangnan0@huawei.com>
Link: http://lkml.kernel.org/n/tip-9x9bwgd3btwdk1u51xie93fz@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2017-04-28 02:21:09 +02:00
|
|
|
err = kallsyms__get_function_start(from, name, &addr1);
|
|
|
|
if (!err)
|
2014-01-29 15:14:44 +01:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
perf symbols: Accept symbols starting at address 0
That is the case of _text on s390, and we have some functions that return an
address, using address zero to report problems, oops.
This would lead the symbol loading routines to not use "_text" as the reference
relocation symbol, or the first symbol for the kernel, but use instead
"_stext", that is at the same address on x86_64 and others, but not on s390:
[acme@localhost perf-4.11.0-rc6]$ head -15 /proc/kallsyms
0000000000000000 T _text
0000000000000418 t iplstart
0000000000000800 T start
000000000000080a t .base
000000000000082e t .sk8x8
0000000000000834 t .gotr
0000000000000842 t .cmd
0000000000000846 t .parm
000000000000084a t .lowcase
0000000000010000 T startup
0000000000010010 T startup_kdump
0000000000010214 t startup_kdump_relocated
0000000000011000 T startup_continue
00000000000112a0 T _ehead
0000000000100000 T _stext
[acme@localhost perf-4.11.0-rc6]$
Which in turn would make 'perf test vmlinux' to fail because it wouldn't find
the symbols before "_stext" in kallsyms.
Fix it by using the return value only for errors and storing the
address, when the symbol is successfully found, in a provided pointer
arg.
Before this patch:
After:
[acme@localhost perf-4.11.0-rc6]$ tools/perf/perf test -v 1
1: vmlinux symtab matches kallsyms :
--- start ---
test child forked, pid 40693
Looking at the vmlinux_path (8 entries long)
Using /usr/lib/debug/lib/modules/3.10.0-654.el7.s390x/vmlinux for symbols
ERR : 0: _text not on kallsyms
ERR : 0x418: iplstart not on kallsyms
ERR : 0x800: start not on kallsyms
ERR : 0x80a: .base not on kallsyms
ERR : 0x82e: .sk8x8 not on kallsyms
ERR : 0x834: .gotr not on kallsyms
ERR : 0x842: .cmd not on kallsyms
ERR : 0x846: .parm not on kallsyms
ERR : 0x84a: .lowcase not on kallsyms
ERR : 0x10000: startup not on kallsyms
ERR : 0x10010: startup_kdump not on kallsyms
ERR : 0x10214: startup_kdump_relocated not on kallsyms
ERR : 0x11000: startup_continue not on kallsyms
ERR : 0x112a0: _ehead not on kallsyms
<SNIP warnings>
test child finished with -1
---- end ----
vmlinux symtab matches kallsyms: FAILED!
[acme@localhost perf-4.11.0-rc6]$
After:
[acme@localhost perf-4.11.0-rc6]$ tools/perf/perf test -v 1
1: vmlinux symtab matches kallsyms :
--- start ---
test child forked, pid 47160
<SNIP warnings>
test child finished with 0
---- end ----
vmlinux symtab matches kallsyms: Ok
[acme@localhost perf-4.11.0-rc6]$
Reported-by: Michael Petlan <mpetlan@redhat.com>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Wang Nan <wangnan0@huawei.com>
Link: http://lkml.kernel.org/n/tip-9x9bwgd3btwdk1u51xie93fz@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2017-04-28 02:21:09 +02:00
|
|
|
if (err)
|
|
|
|
return false;
|
|
|
|
|
|
|
|
if (kallsyms__get_function_start(to, name, &addr2))
|
|
|
|
return false;
|
2014-01-29 15:14:44 +01:00
|
|
|
|
|
|
|
return addr1 == addr2;
|
|
|
|
}
|
|
|
|
|
2013-10-14 15:57:29 +02:00
|
|
|
static int build_id_cache__kcore_existing(const char *from_dir, char *to_dir,
|
|
|
|
size_t to_dir_sz)
|
|
|
|
{
|
|
|
|
char from[PATH_MAX];
|
|
|
|
char to[PATH_MAX];
|
2014-01-29 15:14:44 +01:00
|
|
|
char to_subdir[PATH_MAX];
|
2013-10-14 15:57:29 +02:00
|
|
|
struct dirent *dent;
|
|
|
|
int ret = -1;
|
|
|
|
DIR *d;
|
|
|
|
|
|
|
|
d = opendir(to_dir);
|
|
|
|
if (!d)
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
scnprintf(from, sizeof(from), "%s/modules", from_dir);
|
|
|
|
|
|
|
|
while (1) {
|
|
|
|
dent = readdir(d);
|
|
|
|
if (!dent)
|
|
|
|
break;
|
|
|
|
if (dent->d_type != DT_DIR)
|
|
|
|
continue;
|
|
|
|
scnprintf(to, sizeof(to), "%s/%s/modules", to_dir,
|
|
|
|
dent->d_name);
|
2014-01-29 15:14:44 +01:00
|
|
|
scnprintf(to_subdir, sizeof(to_subdir), "%s/%s",
|
|
|
|
to_dir, dent->d_name);
|
|
|
|
if (!compare_proc_modules(from, to) &&
|
|
|
|
same_kallsyms_reloc(from_dir, to_subdir)) {
|
|
|
|
strlcpy(to_dir, to_subdir, to_dir_sz);
|
2013-10-14 15:57:29 +02:00
|
|
|
ret = 0;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
closedir(d);
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2015-02-10 10:18:51 +01:00
|
|
|
static int build_id_cache__add_kcore(const char *filename, bool force)
|
2013-10-14 15:57:29 +02:00
|
|
|
{
|
2015-07-15 11:14:28 +02:00
|
|
|
char dir[32], sbuildid[SBUILD_ID_SIZE];
|
2013-10-14 15:57:29 +02:00
|
|
|
char from_dir[PATH_MAX], to_dir[PATH_MAX];
|
|
|
|
char *p;
|
|
|
|
|
|
|
|
strlcpy(from_dir, filename, sizeof(from_dir));
|
|
|
|
|
|
|
|
p = strrchr(from_dir, '/');
|
|
|
|
if (!p || strcmp(p + 1, "kcore"))
|
|
|
|
return -1;
|
|
|
|
*p = '\0';
|
|
|
|
|
2015-08-15 13:42:59 +02:00
|
|
|
if (build_id_cache__kcore_buildid(from_dir, sbuildid) < 0)
|
2013-10-14 15:57:29 +02:00
|
|
|
return -1;
|
|
|
|
|
2016-05-15 05:19:40 +02:00
|
|
|
scnprintf(to_dir, sizeof(to_dir), "%s/%s/%s",
|
|
|
|
buildid_dir, DSO__NAME_KCORE, sbuildid);
|
2013-10-14 15:57:29 +02:00
|
|
|
|
2014-07-14 12:02:38 +02:00
|
|
|
if (!force &&
|
|
|
|
!build_id_cache__kcore_existing(from_dir, to_dir, sizeof(to_dir))) {
|
2013-10-14 15:57:29 +02:00
|
|
|
pr_debug("same kcore found in %s\n", to_dir);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (build_id_cache__kcore_dir(dir, sizeof(dir)))
|
|
|
|
return -1;
|
|
|
|
|
2016-05-15 05:19:40 +02:00
|
|
|
scnprintf(to_dir, sizeof(to_dir), "%s/%s/%s/%s",
|
|
|
|
buildid_dir, DSO__NAME_KCORE, sbuildid, dir);
|
2013-10-14 15:57:29 +02:00
|
|
|
|
|
|
|
if (mkdir_p(to_dir, 0755))
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
if (kcore_copy(from_dir, to_dir)) {
|
|
|
|
/* Remove YYYYmmddHHMMSShh directory */
|
|
|
|
if (!rmdir(to_dir)) {
|
|
|
|
p = strrchr(to_dir, '/');
|
|
|
|
if (p)
|
|
|
|
*p = '\0';
|
|
|
|
/* Try to remove buildid directory */
|
|
|
|
if (!rmdir(to_dir)) {
|
|
|
|
p = strrchr(to_dir, '/');
|
|
|
|
if (p)
|
|
|
|
*p = '\0';
|
|
|
|
/* Try to remove [kernel.kcore] directory */
|
|
|
|
rmdir(to_dir);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
pr_debug("kcore added to build-id cache directory %s\n", to_dir);
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2017-07-06 03:48:11 +02:00
|
|
|
static int build_id_cache__add_file(const char *filename, struct nsinfo *nsi)
|
2010-01-20 18:28:45 +01:00
|
|
|
{
|
2015-07-15 11:14:28 +02:00
|
|
|
char sbuild_id[SBUILD_ID_SIZE];
|
2010-01-20 18:28:45 +01:00
|
|
|
u8 build_id[BUILD_ID_SIZE];
|
|
|
|
int err;
|
2017-07-06 03:48:11 +02:00
|
|
|
struct nscookie nsc;
|
2010-01-20 18:28:45 +01:00
|
|
|
|
2017-07-06 03:48:11 +02:00
|
|
|
nsinfo__mountns_enter(nsi, &nsc);
|
|
|
|
err = filename__read_build_id(filename, &build_id, sizeof(build_id));
|
|
|
|
nsinfo__mountns_exit(&nsc);
|
|
|
|
if (err < 0) {
|
2010-01-20 18:28:45 +01:00
|
|
|
pr_debug("Couldn't read a build-id in %s\n", filename);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
build_id__sprintf(build_id, sizeof(build_id), sbuild_id);
|
2017-07-06 03:48:11 +02:00
|
|
|
err = build_id_cache__add_s(sbuild_id, filename, nsi,
|
2012-09-10 18:50:19 +02:00
|
|
|
false, false);
|
2015-02-27 05:50:28 +01:00
|
|
|
pr_debug("Adding %s %s: %s\n", sbuild_id, filename,
|
|
|
|
err ? "FAIL" : "Ok");
|
2010-01-20 18:28:45 +01:00
|
|
|
return err;
|
|
|
|
}
|
|
|
|
|
2017-07-06 03:48:11 +02:00
|
|
|
static int build_id_cache__remove_file(const char *filename, struct nsinfo *nsi)
|
2010-01-20 18:28:45 +01:00
|
|
|
{
|
|
|
|
u8 build_id[BUILD_ID_SIZE];
|
2015-07-15 11:14:28 +02:00
|
|
|
char sbuild_id[SBUILD_ID_SIZE];
|
2017-07-06 03:48:11 +02:00
|
|
|
struct nscookie nsc;
|
2010-01-20 18:28:45 +01:00
|
|
|
|
|
|
|
int err;
|
|
|
|
|
2017-07-06 03:48:11 +02:00
|
|
|
nsinfo__mountns_enter(nsi, &nsc);
|
|
|
|
err = filename__read_build_id(filename, &build_id, sizeof(build_id));
|
|
|
|
nsinfo__mountns_exit(&nsc);
|
|
|
|
if (err < 0) {
|
2010-01-20 18:28:45 +01:00
|
|
|
pr_debug("Couldn't read a build-id in %s\n", filename);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
build_id__sprintf(build_id, sizeof(build_id), sbuild_id);
|
2015-02-10 10:18:51 +01:00
|
|
|
err = build_id_cache__remove_s(sbuild_id);
|
2015-02-27 05:50:28 +01:00
|
|
|
pr_debug("Removing %s %s: %s\n", sbuild_id, filename,
|
|
|
|
err ? "FAIL" : "Ok");
|
2010-01-20 18:28:45 +01:00
|
|
|
|
|
|
|
return err;
|
|
|
|
}
|
|
|
|
|
2017-07-06 03:48:11 +02:00
|
|
|
static int build_id_cache__purge_path(const char *pathname, struct nsinfo *nsi)
|
2015-02-27 05:50:26 +01:00
|
|
|
{
|
|
|
|
struct strlist *list;
|
|
|
|
struct str_node *pos;
|
|
|
|
int err;
|
|
|
|
|
2017-07-06 03:48:11 +02:00
|
|
|
err = build_id_cache__list_build_ids(pathname, nsi, &list);
|
2015-02-27 05:50:26 +01:00
|
|
|
if (err)
|
|
|
|
goto out;
|
|
|
|
|
2016-06-23 16:31:20 +02:00
|
|
|
strlist__for_each_entry(pos, list) {
|
2015-02-27 05:50:26 +01:00
|
|
|
err = build_id_cache__remove_s(pos->s);
|
2015-02-27 05:50:28 +01:00
|
|
|
pr_debug("Removing %s %s: %s\n", pos->s, pathname,
|
|
|
|
err ? "FAIL" : "Ok");
|
2015-02-27 05:50:26 +01:00
|
|
|
if (err)
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
strlist__delete(list);
|
|
|
|
|
|
|
|
out:
|
2015-02-27 05:50:28 +01:00
|
|
|
pr_debug("Purging %s: %s\n", pathname, err ? "FAIL" : "Ok");
|
2015-02-27 05:50:26 +01:00
|
|
|
|
|
|
|
return err;
|
|
|
|
}
|
|
|
|
|
2012-12-07 20:28:27 +01:00
|
|
|
static bool dso__missing_buildid_cache(struct dso *dso, int parm __maybe_unused)
|
|
|
|
{
|
|
|
|
char filename[PATH_MAX];
|
|
|
|
u8 build_id[BUILD_ID_SIZE];
|
|
|
|
|
2017-07-06 03:48:13 +02:00
|
|
|
if (dso__build_id_filename(dso, filename, sizeof(filename), false) &&
|
2012-12-07 20:28:27 +01:00
|
|
|
filename__read_build_id(filename, build_id,
|
|
|
|
sizeof(build_id)) != sizeof(build_id)) {
|
|
|
|
if (errno == ENOENT)
|
|
|
|
return false;
|
|
|
|
|
2014-12-17 21:24:45 +01:00
|
|
|
pr_warning("Problems with %s file, consider removing it from the cache\n",
|
2012-12-07 20:28:27 +01:00
|
|
|
filename);
|
|
|
|
} else if (memcmp(dso->build_id, build_id, sizeof(dso->build_id))) {
|
2014-12-17 21:24:45 +01:00
|
|
|
pr_warning("Problems with %s file, consider removing it from the cache\n",
|
2012-12-07 20:28:27 +01:00
|
|
|
filename);
|
|
|
|
}
|
|
|
|
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
2014-08-12 08:40:36 +02:00
|
|
|
static int build_id_cache__fprintf_missing(struct perf_session *session, FILE *fp)
|
2012-12-07 20:28:27 +01:00
|
|
|
{
|
|
|
|
perf_session__fprintf_dsos_buildid(session, fp, dso__missing_buildid_cache, 0);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2017-07-06 03:48:11 +02:00
|
|
|
static int build_id_cache__update_file(const char *filename, struct nsinfo *nsi)
|
2013-02-07 10:02:11 +01:00
|
|
|
{
|
|
|
|
u8 build_id[BUILD_ID_SIZE];
|
2015-07-15 11:14:28 +02:00
|
|
|
char sbuild_id[SBUILD_ID_SIZE];
|
2017-07-06 03:48:11 +02:00
|
|
|
struct nscookie nsc;
|
2013-02-07 10:02:11 +01:00
|
|
|
|
2017-07-06 03:48:11 +02:00
|
|
|
int err;
|
2013-02-07 10:02:11 +01:00
|
|
|
|
2017-07-06 03:48:11 +02:00
|
|
|
nsinfo__mountns_enter(nsi, &nsc);
|
|
|
|
err = filename__read_build_id(filename, &build_id, sizeof(build_id));
|
|
|
|
nsinfo__mountns_exit(&nsc);
|
|
|
|
if (err < 0) {
|
2013-02-07 10:02:11 +01:00
|
|
|
pr_debug("Couldn't read a build-id in %s\n", filename);
|
|
|
|
return -1;
|
|
|
|
}
|
2017-07-06 03:48:11 +02:00
|
|
|
err = 0;
|
2013-02-07 10:02:11 +01:00
|
|
|
|
|
|
|
build_id__sprintf(build_id, sizeof(build_id), sbuild_id);
|
2015-02-26 07:54:40 +01:00
|
|
|
if (build_id_cache__cached(sbuild_id))
|
|
|
|
err = build_id_cache__remove_s(sbuild_id);
|
|
|
|
|
2015-02-10 10:18:51 +01:00
|
|
|
if (!err)
|
2017-07-06 03:48:11 +02:00
|
|
|
err = build_id_cache__add_s(sbuild_id, filename, nsi, false,
|
|
|
|
false);
|
2015-02-10 10:18:51 +01:00
|
|
|
|
2015-02-27 05:50:28 +01:00
|
|
|
pr_debug("Updating %s %s: %s\n", sbuild_id, filename,
|
|
|
|
err ? "FAIL" : "Ok");
|
2013-02-07 10:02:11 +01:00
|
|
|
|
|
|
|
return err;
|
|
|
|
}
|
|
|
|
|
2017-03-27 16:47:20 +02:00
|
|
|
int cmd_buildid_cache(int argc, const char **argv)
|
2010-01-20 18:28:45 +01:00
|
|
|
{
|
|
|
|
struct strlist *list;
|
|
|
|
struct str_node *pos;
|
2012-12-07 20:28:27 +01:00
|
|
|
int ret = 0;
|
2017-07-06 03:48:11 +02:00
|
|
|
int ns_id = -1;
|
2012-12-07 20:28:27 +01:00
|
|
|
bool force = false;
|
2012-10-01 20:20:58 +02:00
|
|
|
char const *add_name_list_str = NULL,
|
2012-12-07 20:28:27 +01:00
|
|
|
*remove_name_list_str = NULL,
|
2015-02-27 05:50:26 +01:00
|
|
|
*purge_name_list_str = NULL,
|
2013-02-07 10:02:11 +01:00
|
|
|
*missing_filename = NULL,
|
2013-10-14 15:57:29 +02:00
|
|
|
*update_name_list_str = NULL,
|
2014-12-01 20:06:27 +01:00
|
|
|
*kcore_filename = NULL;
|
2014-08-14 04:22:49 +02:00
|
|
|
char sbuf[STRERR_BUFSIZE];
|
2013-02-07 10:02:11 +01:00
|
|
|
|
2017-01-23 22:07:59 +01:00
|
|
|
struct perf_data data = {
|
2014-08-12 08:40:36 +02:00
|
|
|
.mode = PERF_DATA_MODE_READ,
|
|
|
|
};
|
|
|
|
struct perf_session *session = NULL;
|
2017-07-06 03:48:11 +02:00
|
|
|
struct nsinfo *nsi = NULL;
|
2014-08-12 08:40:36 +02:00
|
|
|
|
2012-10-01 20:20:58 +02:00
|
|
|
const struct option buildid_cache_options[] = {
|
|
|
|
OPT_STRING('a', "add", &add_name_list_str,
|
|
|
|
"file list", "file(s) to add"),
|
2013-10-14 15:57:29 +02:00
|
|
|
OPT_STRING('k', "kcore", &kcore_filename,
|
|
|
|
"file", "kcore file to add"),
|
2012-10-01 20:20:58 +02:00
|
|
|
OPT_STRING('r', "remove", &remove_name_list_str, "file list",
|
|
|
|
"file(s) to remove"),
|
2017-11-07 15:48:53 +01:00
|
|
|
OPT_STRING('p', "purge", &purge_name_list_str, "file list",
|
|
|
|
"file(s) to remove (remove old caches too)"),
|
2012-12-07 20:28:27 +01:00
|
|
|
OPT_STRING('M', "missing", &missing_filename, "file",
|
|
|
|
"to find missing build ids in the cache"),
|
|
|
|
OPT_BOOLEAN('f', "force", &force, "don't complain, do it"),
|
2013-02-07 10:02:11 +01:00
|
|
|
OPT_STRING('u', "update", &update_name_list_str, "file list",
|
|
|
|
"file(s) to update"),
|
2012-10-01 20:20:58 +02:00
|
|
|
OPT_INCR('v', "verbose", &verbose, "be more verbose"),
|
2017-07-06 03:48:11 +02:00
|
|
|
OPT_INTEGER(0, "target-ns", &ns_id, "target pid for namespace context"),
|
2012-10-01 20:20:58 +02:00
|
|
|
OPT_END()
|
|
|
|
};
|
|
|
|
const char * const buildid_cache_usage[] = {
|
|
|
|
"perf buildid-cache [<options>]",
|
|
|
|
NULL
|
|
|
|
};
|
|
|
|
|
|
|
|
argc = parse_options(argc, argv, buildid_cache_options,
|
|
|
|
buildid_cache_usage, 0);
|
|
|
|
|
2015-02-27 05:50:31 +01:00
|
|
|
if (argc || (!add_name_list_str && !kcore_filename &&
|
|
|
|
!remove_name_list_str && !purge_name_list_str &&
|
|
|
|
!missing_filename && !update_name_list_str))
|
|
|
|
usage_with_options(buildid_cache_usage, buildid_cache_options);
|
|
|
|
|
2017-07-06 03:48:11 +02:00
|
|
|
if (ns_id > 0)
|
|
|
|
nsi = nsinfo__new(ns_id);
|
|
|
|
|
2014-08-12 08:40:36 +02:00
|
|
|
if (missing_filename) {
|
2017-01-23 22:25:41 +01:00
|
|
|
data.file.path = missing_filename;
|
|
|
|
data.force = force;
|
2014-08-12 08:40:36 +02:00
|
|
|
|
2017-01-23 22:07:59 +01:00
|
|
|
session = perf_session__new(&data, false, NULL);
|
2014-08-12 08:40:36 +02:00
|
|
|
if (session == NULL)
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
2014-08-12 08:40:45 +02:00
|
|
|
if (symbol__init(session ? &session->header.env : NULL) < 0)
|
2014-08-12 08:40:36 +02:00
|
|
|
goto out;
|
2012-10-01 20:20:58 +02:00
|
|
|
|
|
|
|
setup_pager();
|
2010-01-20 18:28:45 +01:00
|
|
|
|
|
|
|
if (add_name_list_str) {
|
2015-07-20 17:13:34 +02:00
|
|
|
list = strlist__new(add_name_list_str, NULL);
|
2010-01-20 18:28:45 +01:00
|
|
|
if (list) {
|
2016-06-23 16:31:20 +02:00
|
|
|
strlist__for_each_entry(pos, list)
|
2017-07-06 03:48:11 +02:00
|
|
|
if (build_id_cache__add_file(pos->s, nsi)) {
|
2010-01-20 18:28:45 +01:00
|
|
|
if (errno == EEXIST) {
|
|
|
|
pr_debug("%s already in the cache\n",
|
|
|
|
pos->s);
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
pr_warning("Couldn't add %s: %s\n",
|
tools: Introduce str_error_r()
The tools so far have been using the strerror_r() GNU variant, that
returns a string, be it the buffer passed or something else.
But that, besides being tricky in cases where we expect that the
function using strerror_r() returns the error formatted in a provided
buffer (we have to check if it returned something else and copy that
instead), breaks the build on systems not using glibc, like Alpine
Linux, where musl libc is used.
So, introduce yet another wrapper, str_error_r(), that has the GNU
interface, but uses the portable XSI variant of strerror_r(), so that
users rest asured that the provided buffer is used and it is what is
returned.
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Wang Nan <wangnan0@huawei.com>
Link: http://lkml.kernel.org/n/tip-d4t42fnf48ytlk8rjxs822tf@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2016-07-06 16:56:20 +02:00
|
|
|
pos->s, str_error_r(errno, sbuf, sizeof(sbuf)));
|
2010-01-20 18:28:45 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
strlist__delete(list);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (remove_name_list_str) {
|
2015-07-20 17:13:34 +02:00
|
|
|
list = strlist__new(remove_name_list_str, NULL);
|
2010-01-20 18:28:45 +01:00
|
|
|
if (list) {
|
2016-06-23 16:31:20 +02:00
|
|
|
strlist__for_each_entry(pos, list)
|
2017-07-06 03:48:11 +02:00
|
|
|
if (build_id_cache__remove_file(pos->s, nsi)) {
|
2010-01-20 18:28:45 +01:00
|
|
|
if (errno == ENOENT) {
|
|
|
|
pr_debug("%s wasn't in the cache\n",
|
|
|
|
pos->s);
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
pr_warning("Couldn't remove %s: %s\n",
|
tools: Introduce str_error_r()
The tools so far have been using the strerror_r() GNU variant, that
returns a string, be it the buffer passed or something else.
But that, besides being tricky in cases where we expect that the
function using strerror_r() returns the error formatted in a provided
buffer (we have to check if it returned something else and copy that
instead), breaks the build on systems not using glibc, like Alpine
Linux, where musl libc is used.
So, introduce yet another wrapper, str_error_r(), that has the GNU
interface, but uses the portable XSI variant of strerror_r(), so that
users rest asured that the provided buffer is used and it is what is
returned.
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Wang Nan <wangnan0@huawei.com>
Link: http://lkml.kernel.org/n/tip-d4t42fnf48ytlk8rjxs822tf@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2016-07-06 16:56:20 +02:00
|
|
|
pos->s, str_error_r(errno, sbuf, sizeof(sbuf)));
|
2010-01-20 18:28:45 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
strlist__delete(list);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2015-02-27 05:50:26 +01:00
|
|
|
if (purge_name_list_str) {
|
2015-07-20 17:13:34 +02:00
|
|
|
list = strlist__new(purge_name_list_str, NULL);
|
2015-02-27 05:50:26 +01:00
|
|
|
if (list) {
|
2016-06-23 16:31:20 +02:00
|
|
|
strlist__for_each_entry(pos, list)
|
2017-07-06 03:48:11 +02:00
|
|
|
if (build_id_cache__purge_path(pos->s, nsi)) {
|
2015-02-27 05:50:26 +01:00
|
|
|
if (errno == ENOENT) {
|
|
|
|
pr_debug("%s wasn't in the cache\n",
|
|
|
|
pos->s);
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
pr_warning("Couldn't remove %s: %s\n",
|
tools: Introduce str_error_r()
The tools so far have been using the strerror_r() GNU variant, that
returns a string, be it the buffer passed or something else.
But that, besides being tricky in cases where we expect that the
function using strerror_r() returns the error formatted in a provided
buffer (we have to check if it returned something else and copy that
instead), breaks the build on systems not using glibc, like Alpine
Linux, where musl libc is used.
So, introduce yet another wrapper, str_error_r(), that has the GNU
interface, but uses the portable XSI variant of strerror_r(), so that
users rest asured that the provided buffer is used and it is what is
returned.
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Wang Nan <wangnan0@huawei.com>
Link: http://lkml.kernel.org/n/tip-d4t42fnf48ytlk8rjxs822tf@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2016-07-06 16:56:20 +02:00
|
|
|
pos->s, str_error_r(errno, sbuf, sizeof(sbuf)));
|
2015-02-27 05:50:26 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
strlist__delete(list);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2012-12-07 20:28:27 +01:00
|
|
|
if (missing_filename)
|
2014-08-12 08:40:36 +02:00
|
|
|
ret = build_id_cache__fprintf_missing(session, stdout);
|
2012-12-07 20:28:27 +01:00
|
|
|
|
2013-02-07 10:02:11 +01:00
|
|
|
if (update_name_list_str) {
|
2015-07-20 17:13:34 +02:00
|
|
|
list = strlist__new(update_name_list_str, NULL);
|
2013-02-07 10:02:11 +01:00
|
|
|
if (list) {
|
2016-06-23 16:31:20 +02:00
|
|
|
strlist__for_each_entry(pos, list)
|
2017-07-06 03:48:11 +02:00
|
|
|
if (build_id_cache__update_file(pos->s, nsi)) {
|
2013-02-07 10:02:11 +01:00
|
|
|
if (errno == ENOENT) {
|
|
|
|
pr_debug("%s wasn't in the cache\n",
|
|
|
|
pos->s);
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
pr_warning("Couldn't update %s: %s\n",
|
tools: Introduce str_error_r()
The tools so far have been using the strerror_r() GNU variant, that
returns a string, be it the buffer passed or something else.
But that, besides being tricky in cases where we expect that the
function using strerror_r() returns the error formatted in a provided
buffer (we have to check if it returned something else and copy that
instead), breaks the build on systems not using glibc, like Alpine
Linux, where musl libc is used.
So, introduce yet another wrapper, str_error_r(), that has the GNU
interface, but uses the portable XSI variant of strerror_r(), so that
users rest asured that the provided buffer is used and it is what is
returned.
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Wang Nan <wangnan0@huawei.com>
Link: http://lkml.kernel.org/n/tip-d4t42fnf48ytlk8rjxs822tf@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2016-07-06 16:56:20 +02:00
|
|
|
pos->s, str_error_r(errno, sbuf, sizeof(sbuf)));
|
2013-02-07 10:02:11 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
strlist__delete(list);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2015-02-10 10:18:51 +01:00
|
|
|
if (kcore_filename && build_id_cache__add_kcore(kcore_filename, force))
|
2013-10-14 15:57:29 +02:00
|
|
|
pr_warning("Couldn't add %s\n", kcore_filename);
|
|
|
|
|
2014-08-12 08:40:36 +02:00
|
|
|
out:
|
2016-06-22 15:02:16 +02:00
|
|
|
perf_session__delete(session);
|
2017-07-06 03:48:11 +02:00
|
|
|
nsinfo__zput(nsi);
|
2014-08-12 08:40:36 +02:00
|
|
|
|
2012-12-07 20:28:27 +01:00
|
|
|
return ret;
|
2010-01-20 18:28:45 +01:00
|
|
|
}
|