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 */
|
2012-10-07 02:43:20 +08:00
|
|
|
#ifndef __PERF_MACHINE_H
|
|
|
|
|
#define __PERF_MACHINE_H
|
|
|
|
|
|
|
|
|
|
#include <sys/types.h>
|
2012-11-09 22:32:52 +08:00
|
|
|
#include <linux/rbtree.h>
|
|
|
|
|
#include "map.h"
|
2014-09-30 04:07:28 +08:00
|
|
|
#include "dso.h"
|
2013-11-11 22:28:02 +08:00
|
|
|
#include "event.h"
|
2017-04-05 00:15:04 +08:00
|
|
|
#include "rwsem.h"
|
2012-10-07 02:43:20 +08:00
|
|
|
|
2012-12-07 13:48:05 +08:00
|
|
|
struct addr_location;
|
2012-11-09 22:32:52 +08:00
|
|
|
struct branch_stack;
|
|
|
|
|
struct perf_evsel;
|
|
|
|
|
struct perf_sample;
|
|
|
|
|
struct symbol;
|
2012-10-07 02:43:20 +08:00
|
|
|
struct thread;
|
2012-10-07 03:26:02 +08:00
|
|
|
union perf_event;
|
2012-10-07 02:43:20 +08:00
|
|
|
|
2012-11-09 22:32:52 +08:00
|
|
|
/* Native host kernel uses -1 as pid index in machine */
|
|
|
|
|
#define HOST_KERNEL_ID (-1)
|
|
|
|
|
#define DEFAULT_GUEST_KERNEL_ID (0)
|
|
|
|
|
|
2014-01-29 22:14:39 +08:00
|
|
|
extern const char *ref_reloc_sym_names[];
|
|
|
|
|
|
2014-07-23 19:23:00 +08:00
|
|
|
struct vdso_info;
|
|
|
|
|
|
2017-09-11 10:23:14 +08:00
|
|
|
#define THREADS__TABLE_BITS 8
|
|
|
|
|
#define THREADS__TABLE_SIZE (1 << THREADS__TABLE_BITS)
|
|
|
|
|
|
|
|
|
|
struct threads {
|
|
|
|
|
struct rb_root entries;
|
2017-04-05 00:15:04 +08:00
|
|
|
struct rw_semaphore lock;
|
2017-09-11 10:23:14 +08:00
|
|
|
unsigned int nr;
|
|
|
|
|
struct list_head dead;
|
|
|
|
|
struct thread *last_match;
|
|
|
|
|
};
|
|
|
|
|
|
2012-11-09 22:32:52 +08:00
|
|
|
struct machine {
|
|
|
|
|
struct rb_node rb_node;
|
|
|
|
|
pid_t pid;
|
|
|
|
|
u16 id_hdr_size;
|
2014-07-31 14:00:45 +08:00
|
|
|
bool comm_exec;
|
2016-05-17 22:56:24 +08:00
|
|
|
bool kptr_restrict_warned;
|
2012-11-09 22:32:52 +08:00
|
|
|
char *root_dir;
|
2018-02-15 20:26:30 +08:00
|
|
|
char *mmap_name;
|
2017-09-11 10:23:14 +08:00
|
|
|
struct threads threads[THREADS__TABLE_SIZE];
|
2014-07-23 19:23:00 +08:00
|
|
|
struct vdso_info *vdso_info;
|
2015-09-09 23:25:00 +08:00
|
|
|
struct perf_env *env;
|
2015-05-29 00:06:42 +08:00
|
|
|
struct dsos dsos;
|
2012-11-09 22:32:52 +08:00
|
|
|
struct map_groups kmaps;
|
|
|
|
|
struct map *vmlinux_maps[MAP__NR_TYPES];
|
2014-08-16 03:08:39 +08:00
|
|
|
u64 kernel_start;
|
2014-07-22 21:17:25 +08:00
|
|
|
pid_t *current_tid;
|
2014-10-23 18:45:13 +08:00
|
|
|
union { /* Tool specific area */
|
|
|
|
|
void *priv;
|
|
|
|
|
u64 db_id;
|
|
|
|
|
};
|
2012-11-09 22:32:52 +08:00
|
|
|
};
|
|
|
|
|
|
2017-09-11 10:23:14 +08:00
|
|
|
static inline struct threads *machine__threads(struct machine *machine, pid_t tid)
|
|
|
|
|
{
|
|
|
|
|
/* Cast it to handle tid == -1 */
|
|
|
|
|
return &machine->threads[(unsigned int)tid % THREADS__TABLE_SIZE];
|
|
|
|
|
}
|
|
|
|
|
|
2012-11-09 22:32:52 +08:00
|
|
|
static inline
|
2015-09-30 22:54:04 +08:00
|
|
|
struct map *__machine__kernel_map(struct machine *machine, enum map_type type)
|
2012-11-09 22:32:52 +08:00
|
|
|
{
|
|
|
|
|
return machine->vmlinux_maps[type];
|
|
|
|
|
}
|
|
|
|
|
|
2015-09-30 22:54:04 +08:00
|
|
|
static inline
|
|
|
|
|
struct map *machine__kernel_map(struct machine *machine)
|
|
|
|
|
{
|
|
|
|
|
return __machine__kernel_map(machine, MAP__FUNCTION);
|
|
|
|
|
}
|
|
|
|
|
|
2014-08-16 03:08:39 +08:00
|
|
|
int machine__get_kernel_start(struct machine *machine);
|
|
|
|
|
|
|
|
|
|
static inline u64 machine__kernel_start(struct machine *machine)
|
|
|
|
|
{
|
|
|
|
|
if (!machine->kernel_start)
|
|
|
|
|
machine__get_kernel_start(machine);
|
|
|
|
|
return machine->kernel_start;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static inline bool machine__kernel_ip(struct machine *machine, u64 ip)
|
|
|
|
|
{
|
|
|
|
|
u64 kernel_start = machine__kernel_start(machine);
|
|
|
|
|
|
|
|
|
|
return ip >= kernel_start;
|
|
|
|
|
}
|
|
|
|
|
|
2014-03-14 22:00:03 +08:00
|
|
|
struct thread *machine__find_thread(struct machine *machine, pid_t pid,
|
|
|
|
|
pid_t tid);
|
2014-07-31 14:00:45 +08:00
|
|
|
struct comm *machine__thread_exec_comm(struct machine *machine,
|
|
|
|
|
struct thread *thread);
|
2012-10-07 02:43:20 +08:00
|
|
|
|
2013-09-11 22:18:24 +08:00
|
|
|
int machine__process_comm_event(struct machine *machine, union perf_event *event,
|
|
|
|
|
struct perf_sample *sample);
|
|
|
|
|
int machine__process_exit_event(struct machine *machine, union perf_event *event,
|
|
|
|
|
struct perf_sample *sample);
|
|
|
|
|
int machine__process_fork_event(struct machine *machine, union perf_event *event,
|
|
|
|
|
struct perf_sample *sample);
|
|
|
|
|
int machine__process_lost_event(struct machine *machine, union perf_event *event,
|
|
|
|
|
struct perf_sample *sample);
|
2015-05-11 03:13:15 +08:00
|
|
|
int machine__process_lost_samples_event(struct machine *machine, union perf_event *event,
|
|
|
|
|
struct perf_sample *sample);
|
2015-04-30 22:37:29 +08:00
|
|
|
int machine__process_aux_event(struct machine *machine,
|
|
|
|
|
union perf_event *event);
|
2015-04-30 22:37:30 +08:00
|
|
|
int machine__process_itrace_start_event(struct machine *machine,
|
|
|
|
|
union perf_event *event);
|
2016-03-23 00:09:37 +08:00
|
|
|
int machine__process_switch_event(struct machine *machine,
|
2015-07-21 17:44:03 +08:00
|
|
|
union perf_event *event);
|
perf tools: Add PERF_RECORD_NAMESPACES to include namespaces related info
Introduce a new option to record PERF_RECORD_NAMESPACES events emitted
by the kernel when fork, clone, setns or unshare are invoked. And update
perf-record documentation with the new option to record namespace
events.
Committer notes:
Combined it with a later patch to allow printing it via 'perf report -D'
and be able to test the feature introduced in this patch. Had to move
here also perf_ns__name(), that was introduced in another later patch.
Also used PRIu64 and PRIx64 to fix the build in some enfironments wrt:
util/event.c:1129:39: error: format '%lx' expects argument of type 'long unsigned int', but argument 6 has type 'long long unsigned int' [-Werror=format=]
ret += fprintf(fp, "%u/%s: %lu/0x%lx%s", idx
^
Testing it:
# perf record --namespaces -a
^C[ perf record: Woken up 1 times to write data ]
[ perf record: Captured and wrote 1.083 MB perf.data (423 samples) ]
#
# perf report -D
<SNIP>
3 2028902078892 0x115140 [0xa0]: PERF_RECORD_NAMESPACES 14783/14783 - nr_namespaces: 7
[0/net: 3/0xf0000081, 1/uts: 3/0xeffffffe, 2/ipc: 3/0xefffffff, 3/pid: 3/0xeffffffc,
4/user: 3/0xeffffffd, 5/mnt: 3/0xf0000000, 6/cgroup: 3/0xeffffffb]
0x1151e0 [0x30]: event: 9
.
. ... raw event: size 48 bytes
. 0000: 09 00 00 00 02 00 30 00 c4 71 82 68 0c 7f 00 00 ......0..q.h....
. 0010: a9 39 00 00 a9 39 00 00 94 28 fe 63 d8 01 00 00 .9...9...(.c....
. 0020: 03 00 00 00 00 00 00 00 ce c4 02 00 00 00 00 00 ................
<SNIP>
NAMESPACES events: 1
<SNIP>
#
Signed-off-by: Hari Bathini <hbathini@linux.vnet.ibm.com>
Acked-by: Jiri Olsa <jolsa@kernel.org>
Tested-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Alexei Starovoitov <ast@fb.com>
Cc: Ananth N Mavinakayanahalli <ananth@linux.vnet.ibm.com>
Cc: Aravinda Prasad <aravinda@linux.vnet.ibm.com>
Cc: Brendan Gregg <brendan.d.gregg@gmail.com>
Cc: Daniel Borkmann <daniel@iogearbox.net>
Cc: Eric Biederman <ebiederm@xmission.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Sargun Dhillon <sargun@sargun.me>
Cc: Steven Rostedt <rostedt@goodmis.org>
Link: http://lkml.kernel.org/r/148891930386.25309.18412039920746995488.stgit@hbathini.in.ibm.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2017-03-08 04:41:43 +08:00
|
|
|
int machine__process_namespaces_event(struct machine *machine,
|
|
|
|
|
union perf_event *event,
|
|
|
|
|
struct perf_sample *sample);
|
2013-09-11 22:18:24 +08:00
|
|
|
int machine__process_mmap_event(struct machine *machine, union perf_event *event,
|
|
|
|
|
struct perf_sample *sample);
|
|
|
|
|
int machine__process_mmap2_event(struct machine *machine, union perf_event *event,
|
|
|
|
|
struct perf_sample *sample);
|
|
|
|
|
int machine__process_event(struct machine *machine, union perf_event *event,
|
|
|
|
|
struct perf_sample *sample);
|
2012-10-07 03:26:02 +08:00
|
|
|
|
2012-11-09 22:32:52 +08:00
|
|
|
typedef void (*machine__process_t)(struct machine *machine, void *data);
|
|
|
|
|
|
2012-12-19 06:15:48 +08:00
|
|
|
struct machines {
|
|
|
|
|
struct machine host;
|
|
|
|
|
struct rb_root guests;
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
void machines__init(struct machines *machines);
|
|
|
|
|
void machines__exit(struct machines *machines);
|
|
|
|
|
|
|
|
|
|
void machines__process_guests(struct machines *machines,
|
|
|
|
|
machine__process_t process, void *data);
|
2012-11-09 22:32:52 +08:00
|
|
|
|
2012-12-19 06:15:48 +08:00
|
|
|
struct machine *machines__add(struct machines *machines, pid_t pid,
|
2012-11-09 22:32:52 +08:00
|
|
|
const char *root_dir);
|
2012-12-19 06:15:48 +08:00
|
|
|
struct machine *machines__find_host(struct machines *machines);
|
|
|
|
|
struct machine *machines__find(struct machines *machines, pid_t pid);
|
|
|
|
|
struct machine *machines__findnew(struct machines *machines, pid_t pid);
|
2012-11-09 22:32:52 +08:00
|
|
|
|
2012-12-19 06:15:48 +08:00
|
|
|
void machines__set_id_hdr_size(struct machines *machines, u16 id_hdr_size);
|
2014-07-31 14:00:45 +08:00
|
|
|
void machines__set_comm_exec(struct machines *machines, bool comm_exec);
|
2013-08-08 19:32:20 +08:00
|
|
|
|
2013-09-29 03:13:00 +08:00
|
|
|
struct machine *machine__new_host(void);
|
2017-01-06 02:31:48 +08:00
|
|
|
struct machine *machine__new_kallsyms(void);
|
2012-11-09 22:32:52 +08:00
|
|
|
int machine__init(struct machine *machine, const char *root_dir, pid_t pid);
|
|
|
|
|
void machine__exit(struct machine *machine);
|
2012-12-08 04:39:39 +08:00
|
|
|
void machine__delete_threads(struct machine *machine);
|
2012-11-09 22:32:52 +08:00
|
|
|
void machine__delete(struct machine *machine);
|
2015-04-10 17:35:00 +08:00
|
|
|
void machine__remove_thread(struct machine *machine, struct thread *th);
|
2012-11-09 22:32:52 +08:00
|
|
|
|
2014-01-23 00:15:36 +08:00
|
|
|
struct branch_info *sample__resolve_bstack(struct perf_sample *sample,
|
|
|
|
|
struct addr_location *al);
|
2014-01-23 00:05:06 +08:00
|
|
|
struct mem_info *sample__resolve_mem(struct perf_sample *sample,
|
|
|
|
|
struct addr_location *al);
|
2016-04-15 01:48:07 +08:00
|
|
|
|
|
|
|
|
struct callchain_cursor;
|
|
|
|
|
|
2014-10-24 02:26:17 +08:00
|
|
|
int thread__resolve_callchain(struct thread *thread,
|
2016-04-15 01:48:07 +08:00
|
|
|
struct callchain_cursor *cursor,
|
2014-10-24 02:26:17 +08:00
|
|
|
struct perf_evsel *evsel,
|
|
|
|
|
struct perf_sample *sample,
|
|
|
|
|
struct symbol **parent,
|
|
|
|
|
struct addr_location *root_al,
|
|
|
|
|
int max_stack);
|
2012-11-09 22:32:52 +08:00
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* Default guest kernel is defined by parameter --guestkallsyms
|
|
|
|
|
* and --guestmodules
|
|
|
|
|
*/
|
|
|
|
|
static inline bool machine__is_default_guest(struct machine *machine)
|
|
|
|
|
{
|
|
|
|
|
return machine ? machine->pid == DEFAULT_GUEST_KERNEL_ID : false;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static inline bool machine__is_host(struct machine *machine)
|
|
|
|
|
{
|
|
|
|
|
return machine ? machine->pid == HOST_KERNEL_ID : false;
|
|
|
|
|
}
|
|
|
|
|
|
perf machine: Protect the machine->threads with a rwlock
In addition to using refcounts for the struct thread lifetime
management, we need to protect access to machine->threads from
concurrent access.
That happens in 'perf top', where a thread processes events, inserting
and deleting entries from that rb_tree while another thread decays
hist_entries, that end up dropping references and ultimately deleting
threads from the rb_tree and releasing its resources when no further
hist_entry (or other data structures, like in 'perf sched') references
it.
So the rule is the same for refcounts + protected trees in the kernel,
get the tree lock, find object, bump the refcount, drop the tree lock,
return, use object, drop the refcount if no more use of it is needed,
keep it if storing it in some other data structure, drop when releasing
that data structure.
I.e. pair "t = machine__find(new)_thread()" with a "thread__put(t)", and
"perf_event__preprocess_sample(&al)" with "addr_location__put(&al)".
The addr_location__put() one is because as we return references to
several data structures, we may end up adding more reference counting
for the other data structures and then we'll drop it at
addr_location__put() time.
Acked-by: David Ahern <dsahern@gmail.com>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Borislav Petkov <bp@suse.de>
Cc: Don Zickus <dzickus@redhat.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lkml.kernel.org/n/tip-bs9rt4n0jw3hi9f3zxyy3xln@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2015-04-07 07:43:22 +08:00
|
|
|
struct thread *__machine__findnew_thread(struct machine *machine, pid_t pid, pid_t tid);
|
|
|
|
|
struct thread *machine__findnew_thread(struct machine *machine, pid_t pid, pid_t tid);
|
2012-11-09 22:32:52 +08:00
|
|
|
|
2015-05-29 22:31:12 +08:00
|
|
|
struct dso *machine__findnew_dso(struct machine *machine, const char *filename);
|
|
|
|
|
|
2012-11-09 22:32:52 +08:00
|
|
|
size_t machine__fprintf(struct machine *machine, FILE *fp);
|
|
|
|
|
|
|
|
|
|
static inline
|
|
|
|
|
struct symbol *machine__find_kernel_symbol(struct machine *machine,
|
|
|
|
|
enum map_type type, u64 addr,
|
2016-09-02 06:25:52 +08:00
|
|
|
struct map **mapp)
|
2012-11-09 22:32:52 +08:00
|
|
|
{
|
2016-09-02 06:25:52 +08:00
|
|
|
return map_groups__find_symbol(&machine->kmaps, type, addr, mapp);
|
2012-11-09 22:32:52 +08:00
|
|
|
}
|
|
|
|
|
|
2016-01-26 05:01:57 +08:00
|
|
|
static inline
|
|
|
|
|
struct symbol *machine__find_kernel_symbol_by_name(struct machine *machine,
|
|
|
|
|
enum map_type type, const char *name,
|
2016-09-02 06:25:52 +08:00
|
|
|
struct map **mapp)
|
2016-01-26 05:01:57 +08:00
|
|
|
{
|
2016-09-02 06:25:52 +08:00
|
|
|
return map_groups__find_symbol_by_name(&machine->kmaps, type, name, mapp);
|
2016-01-26 05:01:57 +08:00
|
|
|
}
|
|
|
|
|
|
2012-11-09 22:32:52 +08:00
|
|
|
static inline
|
|
|
|
|
struct symbol *machine__find_kernel_function(struct machine *machine, u64 addr,
|
2016-09-02 06:25:52 +08:00
|
|
|
struct map **mapp)
|
2012-11-09 22:32:52 +08:00
|
|
|
{
|
|
|
|
|
return machine__find_kernel_symbol(machine, MAP__FUNCTION, addr,
|
2016-09-02 06:25:52 +08:00
|
|
|
mapp);
|
2012-11-09 22:32:52 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static inline
|
|
|
|
|
struct symbol *machine__find_kernel_function_by_name(struct machine *machine,
|
|
|
|
|
const char *name,
|
2016-09-02 06:25:52 +08:00
|
|
|
struct map **mapp)
|
2012-11-09 22:32:52 +08:00
|
|
|
{
|
2016-09-02 06:25:52 +08:00
|
|
|
return map_groups__find_function_by_name(&machine->kmaps, name, mapp);
|
2012-11-09 22:32:52 +08:00
|
|
|
}
|
|
|
|
|
|
perf machine: Fix up some more method names
Calling the function 'machine__new_module' implies a new 'module' will
be allocated, when in fact what is returned is a 'struct map' instance,
that not necessarily will be instantiated, as if one already exists with
the given module name, it will be returned instead.
So be consistent with other "find and if not there, create" like
functions, like machine__findnew_thread, machine__findnew_dso, etc, and
rename it to machine__findnew_module_map(), that in turn will call
machine__findnew_module_dso().
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-acv830vd3hwww2ih5vjtbmu3@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2015-06-01 23:01:02 +08:00
|
|
|
struct map *machine__findnew_module_map(struct machine *machine, u64 start,
|
|
|
|
|
const char *filename);
|
2016-07-21 11:10:51 +08:00
|
|
|
int arch__fix_module_text_start(u64 *start, const char *name);
|
2012-11-09 22:32:52 +08:00
|
|
|
|
|
|
|
|
int machine__load_kallsyms(struct machine *machine, const char *filename,
|
2016-09-02 06:25:52 +08:00
|
|
|
enum map_type type);
|
|
|
|
|
int machine__load_vmlinux_path(struct machine *machine, enum map_type type);
|
2012-11-09 22:32:52 +08:00
|
|
|
|
2012-12-07 20:53:58 +08:00
|
|
|
size_t machine__fprintf_dsos_buildid(struct machine *machine, FILE *fp,
|
|
|
|
|
bool (skip)(struct dso *dso, int parm), int parm);
|
2012-12-19 06:15:48 +08:00
|
|
|
size_t machines__fprintf_dsos(struct machines *machines, FILE *fp);
|
|
|
|
|
size_t machines__fprintf_dsos_buildid(struct machines *machines, FILE *fp,
|
2012-12-07 20:53:58 +08:00
|
|
|
bool (skip)(struct dso *dso, int parm), int parm);
|
2012-11-09 22:32:52 +08:00
|
|
|
|
|
|
|
|
void machine__destroy_kernel_maps(struct machine *machine);
|
|
|
|
|
int machine__create_kernel_maps(struct machine *machine);
|
|
|
|
|
|
2012-12-19 06:15:48 +08:00
|
|
|
int machines__create_kernel_maps(struct machines *machines, pid_t pid);
|
|
|
|
|
int machines__create_guest_kernel_maps(struct machines *machines);
|
|
|
|
|
void machines__destroy_kernel_maps(struct machines *machines);
|
2012-11-09 22:32:52 +08:00
|
|
|
|
|
|
|
|
size_t machine__fprintf_vmlinux_path(struct machine *machine, FILE *fp);
|
|
|
|
|
|
2013-09-29 03:12:58 +08:00
|
|
|
int machine__for_each_thread(struct machine *machine,
|
|
|
|
|
int (*fn)(struct thread *thread, void *p),
|
|
|
|
|
void *priv);
|
2015-05-29 21:33:30 +08:00
|
|
|
int machines__for_each_thread(struct machines *machines,
|
|
|
|
|
int (*fn)(struct thread *thread, void *p),
|
|
|
|
|
void *priv);
|
2013-09-29 03:12:58 +08:00
|
|
|
|
2013-11-11 22:36:12 +08:00
|
|
|
int __machine__synthesize_threads(struct machine *machine, struct perf_tool *tool,
|
2013-11-13 03:46:16 +08:00
|
|
|
struct target *target, struct thread_map *threads,
|
2015-06-17 21:51:11 +08:00
|
|
|
perf_event__handler_t process, bool data_mmap,
|
perf top: Implement multithreading for perf_event__synthesize_threads
The proc files which is sorted with alphabetical order are evenly
assigned to several synthesize threads to be processed in parallel.
For 'perf top', the threads number hard code to online CPU number. The
following patch will introduce an option to set it.
For other perf tools, the thread number is 1. Because the process
function is not ready for multithreading, e.g.
process_synthesized_event.
This patch series only support event synthesize multithreading for 'perf
top'. For other tools, it can be done separately later.
With multithread applied, the total processing time can get up to 1.56x
speedup on Knights Mill for 'perf top'.
For specific single event processing, the processing time could increase
because of the lock contention. So proc_map_timeout may need to be
increased. Otherwise some proc maps will be truncated.
Based on my test, increasing the proc_map_timeout has small impact
on the total processing time. The total processing time still get 1.49x
speedup on Knights Mill after increasing the proc_map_timeout.
The patch itself doesn't increase the proc_map_timeout.
Doesn't need to implement multithreading for per task monitoring,
perf_event__synthesize_thread_map. It doesn't have performance issue.
Committer testing:
# getconf _NPROCESSORS_ONLN
4
# perf trace --no-inherit -e clone -o /tmp/output perf top
# tail -4 /tmp/bla
0.124 ( 0.041 ms): clone(flags: VM|FS|FILES|SIGHAND|THREAD|SYSVSEM|SETTLS|PARENT_SETTID|CHILD_CLEARTID, child_stack: 0x7fc3eb3a8f30, parent_tidptr: 0x7fc3eb3a99d0, child_tidptr: 0x7fc3eb3a99d0, tls: 0x7fc3eb3a9700) = 9548 (perf)
0.246 ( 0.023 ms): clone(flags: VM|FS|FILES|SIGHAND|THREAD|SYSVSEM|SETTLS|PARENT_SETTID|CHILD_CLEARTID, child_stack: 0x7fc3eaba7f30, parent_tidptr: 0x7fc3eaba89d0, child_tidptr: 0x7fc3eaba89d0, tls: 0x7fc3eaba8700) = 9549 (perf)
0.286 ( 0.019 ms): clone(flags: VM|FS|FILES|SIGHAND|THREAD|SYSVSEM|SETTLS|PARENT_SETTID|CHILD_CLEARTID, child_stack: 0x7fc3ea3a6f30, parent_tidptr: 0x7fc3ea3a79d0, child_tidptr: 0x7fc3ea3a79d0, tls: 0x7fc3ea3a7700) = 9550 (perf)
246.540 ( 0.047 ms): clone(flags: VM|FS|FILES|SIGHAND|THREAD|SYSVSEM|SETTLS|PARENT_SETTID|CHILD_CLEARTID, child_stack: 0x7fc3ea3a6f30, parent_tidptr: 0x7fc3ea3a79d0, child_tidptr: 0x7fc3ea3a79d0, tls: 0x7fc3ea3a7700) = 9551 (perf)
#
Signed-off-by: Kan Liang <kan.liang@intel.com>
Tested-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Acked-by: Jiri Olsa <jolsa@kernel.org>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Alexei Starovoitov <ast@kernel.org>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: He Kuang <hekuang@huawei.com>
Cc: Lukasz Odzioba <lukasz.odzioba@intel.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Wang Nan <wangnan0@huawei.com>
Link: http://lkml.kernel.org/r/1506696477-146932-4-git-send-email-kan.liang@intel.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2017-09-29 22:47:54 +08:00
|
|
|
unsigned int proc_map_timeout,
|
|
|
|
|
unsigned int nr_threads_synthesize);
|
2013-11-11 22:36:12 +08:00
|
|
|
static inline
|
2013-11-13 03:46:16 +08:00
|
|
|
int machine__synthesize_threads(struct machine *machine, struct target *target,
|
2015-06-17 21:51:11 +08:00
|
|
|
struct thread_map *threads, bool data_mmap,
|
perf top: Implement multithreading for perf_event__synthesize_threads
The proc files which is sorted with alphabetical order are evenly
assigned to several synthesize threads to be processed in parallel.
For 'perf top', the threads number hard code to online CPU number. The
following patch will introduce an option to set it.
For other perf tools, the thread number is 1. Because the process
function is not ready for multithreading, e.g.
process_synthesized_event.
This patch series only support event synthesize multithreading for 'perf
top'. For other tools, it can be done separately later.
With multithread applied, the total processing time can get up to 1.56x
speedup on Knights Mill for 'perf top'.
For specific single event processing, the processing time could increase
because of the lock contention. So proc_map_timeout may need to be
increased. Otherwise some proc maps will be truncated.
Based on my test, increasing the proc_map_timeout has small impact
on the total processing time. The total processing time still get 1.49x
speedup on Knights Mill after increasing the proc_map_timeout.
The patch itself doesn't increase the proc_map_timeout.
Doesn't need to implement multithreading for per task monitoring,
perf_event__synthesize_thread_map. It doesn't have performance issue.
Committer testing:
# getconf _NPROCESSORS_ONLN
4
# perf trace --no-inherit -e clone -o /tmp/output perf top
# tail -4 /tmp/bla
0.124 ( 0.041 ms): clone(flags: VM|FS|FILES|SIGHAND|THREAD|SYSVSEM|SETTLS|PARENT_SETTID|CHILD_CLEARTID, child_stack: 0x7fc3eb3a8f30, parent_tidptr: 0x7fc3eb3a99d0, child_tidptr: 0x7fc3eb3a99d0, tls: 0x7fc3eb3a9700) = 9548 (perf)
0.246 ( 0.023 ms): clone(flags: VM|FS|FILES|SIGHAND|THREAD|SYSVSEM|SETTLS|PARENT_SETTID|CHILD_CLEARTID, child_stack: 0x7fc3eaba7f30, parent_tidptr: 0x7fc3eaba89d0, child_tidptr: 0x7fc3eaba89d0, tls: 0x7fc3eaba8700) = 9549 (perf)
0.286 ( 0.019 ms): clone(flags: VM|FS|FILES|SIGHAND|THREAD|SYSVSEM|SETTLS|PARENT_SETTID|CHILD_CLEARTID, child_stack: 0x7fc3ea3a6f30, parent_tidptr: 0x7fc3ea3a79d0, child_tidptr: 0x7fc3ea3a79d0, tls: 0x7fc3ea3a7700) = 9550 (perf)
246.540 ( 0.047 ms): clone(flags: VM|FS|FILES|SIGHAND|THREAD|SYSVSEM|SETTLS|PARENT_SETTID|CHILD_CLEARTID, child_stack: 0x7fc3ea3a6f30, parent_tidptr: 0x7fc3ea3a79d0, child_tidptr: 0x7fc3ea3a79d0, tls: 0x7fc3ea3a7700) = 9551 (perf)
#
Signed-off-by: Kan Liang <kan.liang@intel.com>
Tested-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Acked-by: Jiri Olsa <jolsa@kernel.org>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Alexei Starovoitov <ast@kernel.org>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: He Kuang <hekuang@huawei.com>
Cc: Lukasz Odzioba <lukasz.odzioba@intel.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Wang Nan <wangnan0@huawei.com>
Link: http://lkml.kernel.org/r/1506696477-146932-4-git-send-email-kan.liang@intel.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2017-09-29 22:47:54 +08:00
|
|
|
unsigned int proc_map_timeout,
|
|
|
|
|
unsigned int nr_threads_synthesize)
|
2013-11-11 22:36:12 +08:00
|
|
|
{
|
|
|
|
|
return __machine__synthesize_threads(machine, NULL, target, threads,
|
2015-06-17 21:51:11 +08:00
|
|
|
perf_event__process, data_mmap,
|
perf top: Implement multithreading for perf_event__synthesize_threads
The proc files which is sorted with alphabetical order are evenly
assigned to several synthesize threads to be processed in parallel.
For 'perf top', the threads number hard code to online CPU number. The
following patch will introduce an option to set it.
For other perf tools, the thread number is 1. Because the process
function is not ready for multithreading, e.g.
process_synthesized_event.
This patch series only support event synthesize multithreading for 'perf
top'. For other tools, it can be done separately later.
With multithread applied, the total processing time can get up to 1.56x
speedup on Knights Mill for 'perf top'.
For specific single event processing, the processing time could increase
because of the lock contention. So proc_map_timeout may need to be
increased. Otherwise some proc maps will be truncated.
Based on my test, increasing the proc_map_timeout has small impact
on the total processing time. The total processing time still get 1.49x
speedup on Knights Mill after increasing the proc_map_timeout.
The patch itself doesn't increase the proc_map_timeout.
Doesn't need to implement multithreading for per task monitoring,
perf_event__synthesize_thread_map. It doesn't have performance issue.
Committer testing:
# getconf _NPROCESSORS_ONLN
4
# perf trace --no-inherit -e clone -o /tmp/output perf top
# tail -4 /tmp/bla
0.124 ( 0.041 ms): clone(flags: VM|FS|FILES|SIGHAND|THREAD|SYSVSEM|SETTLS|PARENT_SETTID|CHILD_CLEARTID, child_stack: 0x7fc3eb3a8f30, parent_tidptr: 0x7fc3eb3a99d0, child_tidptr: 0x7fc3eb3a99d0, tls: 0x7fc3eb3a9700) = 9548 (perf)
0.246 ( 0.023 ms): clone(flags: VM|FS|FILES|SIGHAND|THREAD|SYSVSEM|SETTLS|PARENT_SETTID|CHILD_CLEARTID, child_stack: 0x7fc3eaba7f30, parent_tidptr: 0x7fc3eaba89d0, child_tidptr: 0x7fc3eaba89d0, tls: 0x7fc3eaba8700) = 9549 (perf)
0.286 ( 0.019 ms): clone(flags: VM|FS|FILES|SIGHAND|THREAD|SYSVSEM|SETTLS|PARENT_SETTID|CHILD_CLEARTID, child_stack: 0x7fc3ea3a6f30, parent_tidptr: 0x7fc3ea3a79d0, child_tidptr: 0x7fc3ea3a79d0, tls: 0x7fc3ea3a7700) = 9550 (perf)
246.540 ( 0.047 ms): clone(flags: VM|FS|FILES|SIGHAND|THREAD|SYSVSEM|SETTLS|PARENT_SETTID|CHILD_CLEARTID, child_stack: 0x7fc3ea3a6f30, parent_tidptr: 0x7fc3ea3a79d0, child_tidptr: 0x7fc3ea3a79d0, tls: 0x7fc3ea3a7700) = 9551 (perf)
#
Signed-off-by: Kan Liang <kan.liang@intel.com>
Tested-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Acked-by: Jiri Olsa <jolsa@kernel.org>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Alexei Starovoitov <ast@kernel.org>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: He Kuang <hekuang@huawei.com>
Cc: Lukasz Odzioba <lukasz.odzioba@intel.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Wang Nan <wangnan0@huawei.com>
Link: http://lkml.kernel.org/r/1506696477-146932-4-git-send-email-kan.liang@intel.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2017-09-29 22:47:54 +08:00
|
|
|
proc_map_timeout,
|
|
|
|
|
nr_threads_synthesize);
|
2013-11-11 22:36:12 +08:00
|
|
|
}
|
|
|
|
|
|
2014-07-22 21:17:25 +08:00
|
|
|
pid_t machine__get_current_tid(struct machine *machine, int cpu);
|
|
|
|
|
int machine__set_current_tid(struct machine *machine, int cpu, pid_t pid,
|
|
|
|
|
pid_t tid);
|
2015-07-23 03:14:29 +08:00
|
|
|
/*
|
|
|
|
|
* For use with libtraceevent's pevent_set_function_resolver()
|
|
|
|
|
*/
|
|
|
|
|
char *machine__resolve_kernel_addr(void *vmachine, unsigned long long *addrp, char **modp);
|
2014-07-22 21:17:25 +08:00
|
|
|
|
2012-10-07 02:43:20 +08:00
|
|
|
#endif /* __PERF_MACHINE_H */
|