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 08:07:57 -06:00
|
|
|
// SPDX-License-Identifier: GPL-2.0
|
2010-05-01 00:41:20 -06:00
|
|
|
/*
|
|
|
|
* builtin-inject.c
|
|
|
|
*
|
|
|
|
* Builtin inject command: Examine the live mode (stdin) event stream
|
|
|
|
* and repipe it to stdout while optionally injecting additional
|
|
|
|
* events into it.
|
|
|
|
*/
|
|
|
|
#include "builtin.h"
|
|
|
|
|
|
|
|
#include "perf.h"
|
2012-08-07 06:56:04 -06:00
|
|
|
#include "util/color.h"
|
|
|
|
#include "util/evlist.h"
|
|
|
|
#include "util/evsel.h"
|
2010-05-01 00:41:20 -06:00
|
|
|
#include "util/session.h"
|
2011-11-28 03:30:20 -07:00
|
|
|
#include "util/tool.h"
|
2010-05-01 00:41:20 -06:00
|
|
|
#include "util/debug.h"
|
2012-08-07 06:56:05 -06:00
|
|
|
#include "util/build-id.h"
|
2013-10-15 08:27:32 -06:00
|
|
|
#include "util/data.h"
|
2015-04-09 09:54:00 -06:00
|
|
|
#include "util/auxtrace.h"
|
2015-11-30 02:02:21 -07:00
|
|
|
#include "util/jit.h"
|
2017-04-19 18:34:35 -06:00
|
|
|
#include "util/thread.h"
|
2010-05-01 00:41:20 -06:00
|
|
|
|
2015-12-15 08:39:39 -07:00
|
|
|
#include <subcmd/parse-options.h>
|
2010-05-01 00:41:20 -06:00
|
|
|
|
2012-08-07 06:56:04 -06:00
|
|
|
#include <linux/list.h>
|
2017-04-18 07:46:11 -06:00
|
|
|
#include <errno.h>
|
2017-04-19 12:49:18 -06:00
|
|
|
#include <signal.h>
|
2012-08-07 06:56:04 -06:00
|
|
|
|
2012-09-30 16:54:10 -06:00
|
|
|
struct perf_inject {
|
2013-10-29 12:04:57 -06:00
|
|
|
struct perf_tool tool;
|
2014-08-12 00:40:37 -06:00
|
|
|
struct perf_session *session;
|
2013-10-29 12:04:57 -06:00
|
|
|
bool build_ids;
|
|
|
|
bool sched_stat;
|
2015-04-30 08:37:26 -06:00
|
|
|
bool have_auxtrace;
|
2015-09-25 07:15:55 -06:00
|
|
|
bool strip;
|
2015-11-30 02:02:21 -07:00
|
|
|
bool jit_mode;
|
2013-10-29 12:04:57 -06:00
|
|
|
const char *input_name;
|
2017-01-23 14:07:59 -07:00
|
|
|
struct perf_data output;
|
2013-10-29 12:04:57 -06:00
|
|
|
u64 bytes_written;
|
2015-09-25 07:15:54 -06:00
|
|
|
u64 aux_id;
|
2013-10-29 12:04:57 -06:00
|
|
|
struct list_head samples;
|
2015-04-09 09:54:00 -06:00
|
|
|
struct itrace_synth_opts itrace_synth_opts;
|
2012-08-07 06:56:04 -06:00
|
|
|
};
|
|
|
|
|
|
|
|
struct event_entry {
|
|
|
|
struct list_head node;
|
|
|
|
u32 tid;
|
|
|
|
union perf_event event[0];
|
2012-09-30 16:54:10 -06:00
|
|
|
};
|
2010-05-01 00:41:20 -06:00
|
|
|
|
2015-04-21 03:21:54 -06:00
|
|
|
static int output_bytes(struct perf_inject *inject, void *buf, size_t sz)
|
2010-05-01 00:41:20 -06:00
|
|
|
{
|
2013-10-29 12:04:57 -06:00
|
|
|
ssize_t size;
|
2010-05-01 00:41:20 -06:00
|
|
|
|
2017-01-23 14:07:59 -07:00
|
|
|
size = perf_data__write(&inject->output, buf, sz);
|
2013-10-29 12:04:57 -06:00
|
|
|
if (size < 0)
|
|
|
|
return -errno;
|
2010-05-01 00:41:20 -06:00
|
|
|
|
2013-10-29 12:04:57 -06:00
|
|
|
inject->bytes_written += size;
|
2010-05-01 00:41:20 -06:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2015-04-21 03:21:54 -06:00
|
|
|
static int perf_event__repipe_synth(struct perf_tool *tool,
|
|
|
|
union perf_event *event)
|
|
|
|
{
|
|
|
|
struct perf_inject *inject = container_of(tool, struct perf_inject,
|
|
|
|
tool);
|
|
|
|
|
|
|
|
return output_bytes(inject, event, event->header.size);
|
|
|
|
}
|
|
|
|
|
2015-03-03 08:37:54 -07:00
|
|
|
static int perf_event__repipe_oe_synth(struct perf_tool *tool,
|
|
|
|
union perf_event *event,
|
|
|
|
struct ordered_events *oe __maybe_unused)
|
|
|
|
{
|
|
|
|
return perf_event__repipe_synth(tool, event);
|
|
|
|
}
|
|
|
|
|
2016-03-10 09:41:13 -07:00
|
|
|
#ifdef HAVE_JITDUMP
|
2015-11-30 02:02:21 -07:00
|
|
|
static int perf_event__drop_oe(struct perf_tool *tool __maybe_unused,
|
|
|
|
union perf_event *event __maybe_unused,
|
|
|
|
struct ordered_events *oe __maybe_unused)
|
|
|
|
{
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2011-11-28 03:30:20 -07:00
|
|
|
static int perf_event__repipe_op2_synth(struct perf_tool *tool,
|
2011-11-28 02:56:39 -07:00
|
|
|
union perf_event *event,
|
2012-09-10 16:15:03 -06:00
|
|
|
struct perf_session *session
|
|
|
|
__maybe_unused)
|
2011-11-28 02:56:39 -07:00
|
|
|
{
|
2013-07-04 07:20:20 -06:00
|
|
|
return perf_event__repipe_synth(tool, event);
|
2011-11-28 02:56:39 -07:00
|
|
|
}
|
|
|
|
|
2013-07-04 07:20:21 -06:00
|
|
|
static int perf_event__repipe_attr(struct perf_tool *tool,
|
|
|
|
union perf_event *event,
|
|
|
|
struct perf_evlist **pevlist)
|
2011-11-11 17:45:41 -07:00
|
|
|
{
|
2013-10-22 01:34:09 -06:00
|
|
|
struct perf_inject *inject = container_of(tool, struct perf_inject,
|
|
|
|
tool);
|
2012-05-15 05:28:11 -06:00
|
|
|
int ret;
|
2013-07-04 07:20:21 -06:00
|
|
|
|
|
|
|
ret = perf_event__process_attr(tool, event, pevlist);
|
2012-05-15 05:28:11 -06:00
|
|
|
if (ret)
|
|
|
|
return ret;
|
|
|
|
|
2014-06-05 10:51:44 -06:00
|
|
|
if (!inject->output.is_pipe)
|
2013-10-22 01:34:09 -06:00
|
|
|
return 0;
|
|
|
|
|
2013-07-04 07:20:21 -06:00
|
|
|
return perf_event__repipe_synth(tool, event);
|
2011-11-11 17:45:41 -07:00
|
|
|
}
|
|
|
|
|
2015-04-30 08:37:27 -06:00
|
|
|
#ifdef HAVE_AUXTRACE_SUPPORT
|
|
|
|
|
|
|
|
static int copy_bytes(struct perf_inject *inject, int fd, off_t size)
|
|
|
|
{
|
|
|
|
char buf[4096];
|
|
|
|
ssize_t ssz;
|
|
|
|
int ret;
|
|
|
|
|
|
|
|
while (size > 0) {
|
|
|
|
ssz = read(fd, buf, min(size, (off_t)sizeof(buf)));
|
|
|
|
if (ssz < 0)
|
|
|
|
return -errno;
|
|
|
|
ret = output_bytes(inject, buf, ssz);
|
|
|
|
if (ret)
|
|
|
|
return ret;
|
|
|
|
size -= ssz;
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2015-04-21 03:21:54 -06:00
|
|
|
static s64 perf_event__repipe_auxtrace(struct perf_tool *tool,
|
|
|
|
union perf_event *event,
|
2016-03-22 10:09:37 -06:00
|
|
|
struct perf_session *session)
|
2015-04-21 03:21:54 -06:00
|
|
|
{
|
|
|
|
struct perf_inject *inject = container_of(tool, struct perf_inject,
|
|
|
|
tool);
|
|
|
|
int ret;
|
|
|
|
|
2015-04-30 08:37:26 -06:00
|
|
|
inject->have_auxtrace = true;
|
|
|
|
|
2015-04-30 08:37:25 -06:00
|
|
|
if (!inject->output.is_pipe) {
|
|
|
|
off_t offset;
|
|
|
|
|
2017-01-23 14:25:41 -07:00
|
|
|
offset = lseek(inject->output.file.fd, 0, SEEK_CUR);
|
2015-04-30 08:37:25 -06:00
|
|
|
if (offset == -1)
|
|
|
|
return -errno;
|
|
|
|
ret = auxtrace_index__auxtrace_event(&session->auxtrace_index,
|
|
|
|
event, offset);
|
|
|
|
if (ret < 0)
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2017-01-23 14:07:59 -07:00
|
|
|
if (perf_data__is_pipe(session->data) || !session->one_mmap) {
|
2015-04-21 03:21:54 -06:00
|
|
|
ret = output_bytes(inject, event, event->header.size);
|
|
|
|
if (ret < 0)
|
|
|
|
return ret;
|
2017-01-23 14:07:59 -07:00
|
|
|
ret = copy_bytes(inject, perf_data__fd(session->data),
|
2015-04-21 03:21:54 -06:00
|
|
|
event->auxtrace.size);
|
|
|
|
} else {
|
|
|
|
ret = output_bytes(inject, event,
|
|
|
|
event->header.size + event->auxtrace.size);
|
|
|
|
}
|
|
|
|
if (ret < 0)
|
|
|
|
return ret;
|
|
|
|
|
|
|
|
return event->auxtrace.size;
|
|
|
|
}
|
|
|
|
|
2015-04-30 08:37:27 -06:00
|
|
|
#else
|
|
|
|
|
|
|
|
static s64
|
|
|
|
perf_event__repipe_auxtrace(struct perf_tool *tool __maybe_unused,
|
|
|
|
union perf_event *event __maybe_unused,
|
|
|
|
struct perf_session *session __maybe_unused)
|
|
|
|
{
|
|
|
|
pr_err("AUX area tracing not supported\n");
|
|
|
|
return -EINVAL;
|
|
|
|
}
|
|
|
|
|
|
|
|
#endif
|
|
|
|
|
2011-11-28 03:30:20 -07:00
|
|
|
static int perf_event__repipe(struct perf_tool *tool,
|
2011-11-25 03:19:45 -07:00
|
|
|
union perf_event *event,
|
2012-09-10 16:15:03 -06:00
|
|
|
struct perf_sample *sample __maybe_unused,
|
2013-07-04 07:20:20 -06:00
|
|
|
struct machine *machine __maybe_unused)
|
perf session: Parse sample earlier
At perf_session__process_event, so that we reduce the number of lines in eache
tool sample processing routine that now receives a sample_data pointer already
parsed.
This will also be useful in the next patch, where we'll allow sample the
identity fields in MMAP, FORK, EXIT, etc, when it will be possible to see (cpu,
timestamp) just after before every event.
Also validate callchains in perf_session__process_event, i.e. as early as
possible, and keep a counter of the number of events discarded due to invalid
callchains, warning the user about it if it happens.
There is an assumption that was kept that all events have the same sample_type,
that will be dealt with in the future, when this preexisting limitation will be
removed.
Tested-by: Thomas Gleixner <tglx@linutronix.de>
Reviewed-by: Thomas Gleixner <tglx@linutronix.de>
Acked-by: Ian Munsie <imunsie@au1.ibm.com>
Acked-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Frédéric Weisbecker <fweisbec@gmail.com>
Cc: Ian Munsie <imunsie@au1.ibm.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Stephane Eranian <eranian@google.com>
LKML-Reference: <1291318772-30880-4-git-send-email-acme@infradead.org>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2010-12-02 09:10:21 -07:00
|
|
|
{
|
2013-07-04 07:20:20 -06:00
|
|
|
return perf_event__repipe_synth(tool, event);
|
perf session: Parse sample earlier
At perf_session__process_event, so that we reduce the number of lines in eache
tool sample processing routine that now receives a sample_data pointer already
parsed.
This will also be useful in the next patch, where we'll allow sample the
identity fields in MMAP, FORK, EXIT, etc, when it will be possible to see (cpu,
timestamp) just after before every event.
Also validate callchains in perf_session__process_event, i.e. as early as
possible, and keep a counter of the number of events discarded due to invalid
callchains, warning the user about it if it happens.
There is an assumption that was kept that all events have the same sample_type,
that will be dealt with in the future, when this preexisting limitation will be
removed.
Tested-by: Thomas Gleixner <tglx@linutronix.de>
Reviewed-by: Thomas Gleixner <tglx@linutronix.de>
Acked-by: Ian Munsie <imunsie@au1.ibm.com>
Acked-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Frédéric Weisbecker <fweisbec@gmail.com>
Cc: Ian Munsie <imunsie@au1.ibm.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Stephane Eranian <eranian@google.com>
LKML-Reference: <1291318772-30880-4-git-send-email-acme@infradead.org>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2010-12-02 09:10:21 -07:00
|
|
|
}
|
|
|
|
|
2015-09-25 07:15:55 -06:00
|
|
|
static int perf_event__drop(struct perf_tool *tool __maybe_unused,
|
|
|
|
union perf_event *event __maybe_unused,
|
|
|
|
struct perf_sample *sample __maybe_unused,
|
|
|
|
struct machine *machine __maybe_unused)
|
|
|
|
{
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2015-09-25 07:15:54 -06:00
|
|
|
static int perf_event__drop_aux(struct perf_tool *tool,
|
|
|
|
union perf_event *event __maybe_unused,
|
|
|
|
struct perf_sample *sample,
|
|
|
|
struct machine *machine __maybe_unused)
|
|
|
|
{
|
|
|
|
struct perf_inject *inject = container_of(tool, struct perf_inject, tool);
|
|
|
|
|
|
|
|
if (!inject->aux_id)
|
|
|
|
inject->aux_id = sample->id;
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2012-08-07 06:56:04 -06:00
|
|
|
typedef int (*inject_handler)(struct perf_tool *tool,
|
|
|
|
union perf_event *event,
|
|
|
|
struct perf_sample *sample,
|
|
|
|
struct perf_evsel *evsel,
|
|
|
|
struct machine *machine);
|
|
|
|
|
2011-11-28 03:30:20 -07:00
|
|
|
static int perf_event__repipe_sample(struct perf_tool *tool,
|
2011-11-25 03:19:45 -07:00
|
|
|
union perf_event *event,
|
2012-08-07 06:56:04 -06:00
|
|
|
struct perf_sample *sample,
|
|
|
|
struct perf_evsel *evsel,
|
|
|
|
struct machine *machine)
|
2011-03-15 12:44:01 -06:00
|
|
|
{
|
2013-11-06 06:17:38 -07:00
|
|
|
if (evsel->handler) {
|
|
|
|
inject_handler f = evsel->handler;
|
2012-08-07 06:56:04 -06:00
|
|
|
return f(tool, event, sample, evsel, machine);
|
|
|
|
}
|
|
|
|
|
2012-08-07 06:56:05 -06:00
|
|
|
build_id__mark_dso_hit(tool, event, sample, evsel, machine);
|
|
|
|
|
2013-07-04 07:20:20 -06:00
|
|
|
return perf_event__repipe_synth(tool, event);
|
2011-03-15 12:44:01 -06:00
|
|
|
}
|
|
|
|
|
2011-11-28 03:30:20 -07:00
|
|
|
static int perf_event__repipe_mmap(struct perf_tool *tool,
|
2011-11-25 03:19:45 -07:00
|
|
|
union perf_event *event,
|
2011-01-29 09:01:45 -07:00
|
|
|
struct perf_sample *sample,
|
2011-11-28 02:56:39 -07:00
|
|
|
struct machine *machine)
|
2010-05-01 00:41:20 -06:00
|
|
|
{
|
|
|
|
int err;
|
|
|
|
|
2011-11-28 03:30:20 -07:00
|
|
|
err = perf_event__process_mmap(tool, event, sample, machine);
|
|
|
|
perf_event__repipe(tool, event, sample, machine);
|
2010-05-01 00:41:20 -06:00
|
|
|
|
|
|
|
return err;
|
|
|
|
}
|
|
|
|
|
2016-03-10 09:41:13 -07:00
|
|
|
#ifdef HAVE_JITDUMP
|
2015-11-30 02:02:21 -07:00
|
|
|
static int perf_event__jit_repipe_mmap(struct perf_tool *tool,
|
|
|
|
union perf_event *event,
|
|
|
|
struct perf_sample *sample,
|
|
|
|
struct machine *machine)
|
|
|
|
{
|
|
|
|
struct perf_inject *inject = container_of(tool, struct perf_inject, tool);
|
|
|
|
u64 n = 0;
|
2016-03-07 12:44:40 -07:00
|
|
|
int ret;
|
2015-11-30 02:02:21 -07:00
|
|
|
|
|
|
|
/*
|
|
|
|
* if jit marker, then inject jit mmaps and generate ELF images
|
|
|
|
*/
|
2016-03-07 12:44:40 -07:00
|
|
|
ret = jit_process(inject->session, &inject->output, machine,
|
|
|
|
event->mmap.filename, sample->pid, &n);
|
|
|
|
if (ret < 0)
|
|
|
|
return ret;
|
|
|
|
if (ret) {
|
2015-11-30 02:02:21 -07:00
|
|
|
inject->bytes_written += n;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
return perf_event__repipe_mmap(tool, event, sample, machine);
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2013-08-21 04:10:25 -06:00
|
|
|
static int perf_event__repipe_mmap2(struct perf_tool *tool,
|
|
|
|
union perf_event *event,
|
|
|
|
struct perf_sample *sample,
|
|
|
|
struct machine *machine)
|
|
|
|
{
|
|
|
|
int err;
|
|
|
|
|
|
|
|
err = perf_event__process_mmap2(tool, event, sample, machine);
|
|
|
|
perf_event__repipe(tool, event, sample, machine);
|
|
|
|
|
|
|
|
return err;
|
|
|
|
}
|
|
|
|
|
2016-03-10 09:41:13 -07:00
|
|
|
#ifdef HAVE_JITDUMP
|
2015-11-30 02:02:21 -07:00
|
|
|
static int perf_event__jit_repipe_mmap2(struct perf_tool *tool,
|
|
|
|
union perf_event *event,
|
|
|
|
struct perf_sample *sample,
|
|
|
|
struct machine *machine)
|
|
|
|
{
|
|
|
|
struct perf_inject *inject = container_of(tool, struct perf_inject, tool);
|
|
|
|
u64 n = 0;
|
2016-03-07 12:44:40 -07:00
|
|
|
int ret;
|
2015-11-30 02:02:21 -07:00
|
|
|
|
|
|
|
/*
|
|
|
|
* if jit marker, then inject jit mmaps and generate ELF images
|
|
|
|
*/
|
2016-03-07 12:44:40 -07:00
|
|
|
ret = jit_process(inject->session, &inject->output, machine,
|
|
|
|
event->mmap2.filename, sample->pid, &n);
|
|
|
|
if (ret < 0)
|
|
|
|
return ret;
|
|
|
|
if (ret) {
|
2015-11-30 02:02:21 -07:00
|
|
|
inject->bytes_written += n;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
return perf_event__repipe_mmap2(tool, event, sample, machine);
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2012-10-06 12:44:59 -06:00
|
|
|
static int perf_event__repipe_fork(struct perf_tool *tool,
|
2011-11-25 03:19:45 -07:00
|
|
|
union perf_event *event,
|
2011-01-29 09:01:45 -07:00
|
|
|
struct perf_sample *sample,
|
2011-11-28 02:56:39 -07:00
|
|
|
struct machine *machine)
|
2010-05-01 00:41:20 -06:00
|
|
|
{
|
|
|
|
int err;
|
|
|
|
|
2012-10-06 12:44:59 -06:00
|
|
|
err = perf_event__process_fork(tool, event, sample, machine);
|
2011-11-28 03:30:20 -07:00
|
|
|
perf_event__repipe(tool, event, sample, machine);
|
2010-05-01 00:41:20 -06:00
|
|
|
|
|
|
|
return err;
|
|
|
|
}
|
|
|
|
|
2015-04-09 09:54:00 -06:00
|
|
|
static int perf_event__repipe_comm(struct perf_tool *tool,
|
|
|
|
union perf_event *event,
|
|
|
|
struct perf_sample *sample,
|
|
|
|
struct machine *machine)
|
|
|
|
{
|
|
|
|
int err;
|
|
|
|
|
|
|
|
err = perf_event__process_comm(tool, event, sample, machine);
|
|
|
|
perf_event__repipe(tool, event, sample, machine);
|
|
|
|
|
|
|
|
return err;
|
|
|
|
}
|
|
|
|
|
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-07 13:41:43 -07:00
|
|
|
static int perf_event__repipe_namespaces(struct perf_tool *tool,
|
|
|
|
union perf_event *event,
|
|
|
|
struct perf_sample *sample,
|
|
|
|
struct machine *machine)
|
|
|
|
{
|
|
|
|
int err = perf_event__process_namespaces(tool, event, sample, machine);
|
|
|
|
|
|
|
|
perf_event__repipe(tool, event, sample, machine);
|
|
|
|
|
|
|
|
return err;
|
|
|
|
}
|
|
|
|
|
2015-04-09 09:54:00 -06:00
|
|
|
static int perf_event__repipe_exit(struct perf_tool *tool,
|
|
|
|
union perf_event *event,
|
|
|
|
struct perf_sample *sample,
|
|
|
|
struct machine *machine)
|
|
|
|
{
|
|
|
|
int err;
|
|
|
|
|
|
|
|
err = perf_event__process_exit(tool, event, sample, machine);
|
|
|
|
perf_event__repipe(tool, event, sample, machine);
|
|
|
|
|
|
|
|
return err;
|
|
|
|
}
|
|
|
|
|
2013-07-04 07:20:21 -06:00
|
|
|
static int perf_event__repipe_tracing_data(struct perf_tool *tool,
|
|
|
|
union perf_event *event,
|
2011-01-29 09:01:45 -07:00
|
|
|
struct perf_session *session)
|
2010-05-01 00:41:20 -06:00
|
|
|
{
|
|
|
|
int err;
|
|
|
|
|
2013-07-04 07:20:21 -06:00
|
|
|
perf_event__repipe_synth(tool, event);
|
|
|
|
err = perf_event__process_tracing_data(tool, event, session);
|
2010-05-01 00:41:20 -06:00
|
|
|
|
|
|
|
return err;
|
|
|
|
}
|
|
|
|
|
2015-04-09 09:54:00 -06:00
|
|
|
static int perf_event__repipe_id_index(struct perf_tool *tool,
|
|
|
|
union perf_event *event,
|
|
|
|
struct perf_session *session)
|
|
|
|
{
|
|
|
|
int err;
|
|
|
|
|
|
|
|
perf_event__repipe_synth(tool, event);
|
|
|
|
err = perf_event__process_id_index(tool, event, session);
|
|
|
|
|
|
|
|
return err;
|
|
|
|
}
|
|
|
|
|
2013-10-22 16:01:31 -06:00
|
|
|
static int dso__read_build_id(struct dso *dso)
|
2010-05-01 00:41:20 -06:00
|
|
|
{
|
2013-10-22 16:01:31 -06:00
|
|
|
if (dso->has_build_id)
|
2010-05-02 16:46:36 -06:00
|
|
|
return 0;
|
2010-05-01 00:41:20 -06:00
|
|
|
|
2013-10-22 16:01:31 -06:00
|
|
|
if (filename__read_build_id(dso->long_name, dso->build_id,
|
|
|
|
sizeof(dso->build_id)) > 0) {
|
|
|
|
dso->has_build_id = true;
|
2010-05-02 16:46:36 -06:00
|
|
|
return 0;
|
|
|
|
}
|
2010-05-01 00:41:20 -06:00
|
|
|
|
2010-05-02 16:46:36 -06:00
|
|
|
return -1;
|
|
|
|
}
|
2010-05-01 00:41:20 -06:00
|
|
|
|
2013-10-22 16:01:31 -06:00
|
|
|
static int dso__inject_build_id(struct dso *dso, struct perf_tool *tool,
|
2011-11-28 02:56:39 -07:00
|
|
|
struct machine *machine)
|
2010-05-02 16:46:36 -06:00
|
|
|
{
|
|
|
|
u16 misc = PERF_RECORD_MISC_USER;
|
|
|
|
int err;
|
2010-05-01 00:41:20 -06:00
|
|
|
|
2013-10-22 16:01:31 -06:00
|
|
|
if (dso__read_build_id(dso) < 0) {
|
|
|
|
pr_debug("no build_id found for %s\n", dso->long_name);
|
2010-05-02 16:46:36 -06:00
|
|
|
return -1;
|
|
|
|
}
|
2010-05-01 00:41:20 -06:00
|
|
|
|
2013-10-22 16:01:31 -06:00
|
|
|
if (dso->kernel)
|
2010-05-02 16:46:36 -06:00
|
|
|
misc = PERF_RECORD_MISC_KERNEL;
|
2010-05-01 00:41:20 -06:00
|
|
|
|
2013-10-22 16:01:31 -06:00
|
|
|
err = perf_event__synthesize_build_id(tool, dso, misc, perf_event__repipe,
|
2011-11-28 02:56:39 -07:00
|
|
|
machine);
|
2010-05-02 16:46:36 -06:00
|
|
|
if (err) {
|
2013-10-22 16:01:31 -06:00
|
|
|
pr_err("Can't synthesize build_id event for %s\n", dso->long_name);
|
2010-05-01 00:41:20 -06:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2011-11-28 03:30:20 -07:00
|
|
|
static int perf_event__inject_buildid(struct perf_tool *tool,
|
2011-11-25 03:19:45 -07:00
|
|
|
union perf_event *event,
|
2011-01-29 09:01:45 -07:00
|
|
|
struct perf_sample *sample,
|
2012-09-10 16:15:03 -06:00
|
|
|
struct perf_evsel *evsel __maybe_unused,
|
2011-11-28 02:56:39 -07:00
|
|
|
struct machine *machine)
|
2010-05-01 00:41:20 -06:00
|
|
|
{
|
|
|
|
struct addr_location al;
|
|
|
|
struct thread *thread;
|
|
|
|
|
2014-05-11 18:56:42 -06:00
|
|
|
thread = machine__findnew_thread(machine, sample->pid, sample->tid);
|
2010-05-01 00:41:20 -06:00
|
|
|
if (thread == NULL) {
|
|
|
|
pr_err("problem processing %d event, skipping it.\n",
|
|
|
|
event->header.type);
|
|
|
|
goto repipe;
|
|
|
|
}
|
|
|
|
|
2016-03-22 15:23:43 -06:00
|
|
|
thread__find_addr_map(thread, sample->cpumode, MAP__FUNCTION, sample->ip, &al);
|
2010-05-01 00:41:20 -06:00
|
|
|
|
|
|
|
if (al.map != NULL) {
|
|
|
|
if (!al.map->dso->hit) {
|
|
|
|
al.map->dso->hit = 1;
|
2016-09-01 16:25:52 -06:00
|
|
|
if (map__load(al.map) >= 0) {
|
2011-11-28 03:30:20 -07:00
|
|
|
dso__inject_build_id(al.map->dso, tool, machine);
|
2010-05-02 16:46:36 -06:00
|
|
|
/*
|
|
|
|
* If this fails, too bad, let the other side
|
|
|
|
* account this as unresolved.
|
|
|
|
*/
|
2012-08-05 22:41:21 -06:00
|
|
|
} else {
|
2013-09-30 04:07:11 -06:00
|
|
|
#ifdef HAVE_LIBELF_SUPPORT
|
2010-05-01 00:41:20 -06:00
|
|
|
pr_warning("no symbols found in %s, maybe "
|
|
|
|
"install a debug package?\n",
|
|
|
|
al.map->dso->long_name);
|
2012-08-05 22:41:21 -06:00
|
|
|
#endif
|
|
|
|
}
|
2010-05-01 00:41:20 -06:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
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-06 17:43:22 -06:00
|
|
|
thread__put(thread);
|
2010-05-01 00:41:20 -06:00
|
|
|
repipe:
|
2011-11-28 03:30:20 -07:00
|
|
|
perf_event__repipe(tool, event, sample, machine);
|
2010-05-02 16:46:36 -06:00
|
|
|
return 0;
|
2010-05-01 00:41:20 -06:00
|
|
|
}
|
|
|
|
|
2012-08-07 06:56:04 -06:00
|
|
|
static int perf_inject__sched_process_exit(struct perf_tool *tool,
|
|
|
|
union perf_event *event __maybe_unused,
|
|
|
|
struct perf_sample *sample,
|
|
|
|
struct perf_evsel *evsel __maybe_unused,
|
|
|
|
struct machine *machine __maybe_unused)
|
|
|
|
{
|
|
|
|
struct perf_inject *inject = container_of(tool, struct perf_inject, tool);
|
|
|
|
struct event_entry *ent;
|
|
|
|
|
|
|
|
list_for_each_entry(ent, &inject->samples, node) {
|
|
|
|
if (sample->tid == ent->tid) {
|
|
|
|
list_del_init(&ent->node);
|
|
|
|
free(ent);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int perf_inject__sched_switch(struct perf_tool *tool,
|
|
|
|
union perf_event *event,
|
|
|
|
struct perf_sample *sample,
|
|
|
|
struct perf_evsel *evsel,
|
|
|
|
struct machine *machine)
|
|
|
|
{
|
|
|
|
struct perf_inject *inject = container_of(tool, struct perf_inject, tool);
|
|
|
|
struct event_entry *ent;
|
|
|
|
|
|
|
|
perf_inject__sched_process_exit(tool, event, sample, evsel, machine);
|
|
|
|
|
|
|
|
ent = malloc(event->header.size + sizeof(struct event_entry));
|
|
|
|
if (ent == NULL) {
|
|
|
|
color_fprintf(stderr, PERF_COLOR_RED,
|
|
|
|
"Not enough memory to process sched switch event!");
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
ent->tid = sample->tid;
|
|
|
|
memcpy(&ent->event, event, event->header.size);
|
|
|
|
list_add(&ent->node, &inject->samples);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int perf_inject__sched_stat(struct perf_tool *tool,
|
|
|
|
union perf_event *event __maybe_unused,
|
|
|
|
struct perf_sample *sample,
|
|
|
|
struct perf_evsel *evsel,
|
|
|
|
struct machine *machine)
|
|
|
|
{
|
|
|
|
struct event_entry *ent;
|
|
|
|
union perf_event *event_sw;
|
|
|
|
struct perf_sample sample_sw;
|
|
|
|
struct perf_inject *inject = container_of(tool, struct perf_inject, tool);
|
|
|
|
u32 pid = perf_evsel__intval(evsel, sample, "pid");
|
|
|
|
|
|
|
|
list_for_each_entry(ent, &inject->samples, node) {
|
|
|
|
if (pid == ent->tid)
|
|
|
|
goto found;
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
found:
|
|
|
|
event_sw = &ent->event[0];
|
|
|
|
perf_evsel__parse_sample(evsel, event_sw, &sample_sw);
|
|
|
|
|
|
|
|
sample_sw.period = sample->period;
|
|
|
|
sample_sw.time = sample->time;
|
|
|
|
perf_event__synthesize_sample(event_sw, evsel->attr.sample_type,
|
2018-01-16 06:14:52 -07:00
|
|
|
evsel->attr.read_format, &sample_sw);
|
2012-08-07 06:56:05 -06:00
|
|
|
build_id__mark_dso_hit(tool, event_sw, &sample_sw, evsel, machine);
|
2012-08-07 06:56:04 -06:00
|
|
|
return perf_event__repipe(tool, event_sw, &sample_sw, machine);
|
|
|
|
}
|
|
|
|
|
2012-09-10 16:15:03 -06:00
|
|
|
static void sig_handler(int sig __maybe_unused)
|
2010-05-01 00:41:20 -06:00
|
|
|
{
|
|
|
|
session_done = 1;
|
|
|
|
}
|
|
|
|
|
2012-08-07 06:56:04 -06:00
|
|
|
static int perf_evsel__check_stype(struct perf_evsel *evsel,
|
|
|
|
u64 sample_type, const char *sample_msg)
|
|
|
|
{
|
|
|
|
struct perf_event_attr *attr = &evsel->attr;
|
|
|
|
const char *name = perf_evsel__name(evsel);
|
|
|
|
|
|
|
|
if (!(attr->sample_type & sample_type)) {
|
|
|
|
pr_err("Samples for %s event do not have %s attribute set.",
|
|
|
|
name, sample_msg);
|
|
|
|
return -EINVAL;
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2015-09-25 07:15:55 -06:00
|
|
|
static int drop_sample(struct perf_tool *tool __maybe_unused,
|
|
|
|
union perf_event *event __maybe_unused,
|
|
|
|
struct perf_sample *sample __maybe_unused,
|
|
|
|
struct perf_evsel *evsel __maybe_unused,
|
|
|
|
struct machine *machine __maybe_unused)
|
|
|
|
{
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void strip_init(struct perf_inject *inject)
|
|
|
|
{
|
|
|
|
struct perf_evlist *evlist = inject->session->evlist;
|
|
|
|
struct perf_evsel *evsel;
|
|
|
|
|
|
|
|
inject->tool.context_switch = perf_event__drop;
|
|
|
|
|
2016-06-23 08:26:15 -06:00
|
|
|
evlist__for_each_entry(evlist, evsel)
|
2015-09-25 07:15:55 -06:00
|
|
|
evsel->handler = drop_sample;
|
|
|
|
}
|
|
|
|
|
|
|
|
static bool has_tracking(struct perf_evsel *evsel)
|
|
|
|
{
|
|
|
|
return evsel->attr.mmap || evsel->attr.mmap2 || evsel->attr.comm ||
|
|
|
|
evsel->attr.task;
|
|
|
|
}
|
|
|
|
|
|
|
|
#define COMPAT_MASK (PERF_SAMPLE_ID | PERF_SAMPLE_TID | PERF_SAMPLE_TIME | \
|
|
|
|
PERF_SAMPLE_ID | PERF_SAMPLE_CPU | PERF_SAMPLE_IDENTIFIER)
|
|
|
|
|
|
|
|
/*
|
|
|
|
* In order that the perf.data file is parsable, tracking events like MMAP need
|
|
|
|
* their selected event to exist, except if there is only 1 selected event left
|
|
|
|
* and it has a compatible sample type.
|
|
|
|
*/
|
|
|
|
static bool ok_to_remove(struct perf_evlist *evlist,
|
|
|
|
struct perf_evsel *evsel_to_remove)
|
|
|
|
{
|
|
|
|
struct perf_evsel *evsel;
|
|
|
|
int cnt = 0;
|
|
|
|
bool ok = false;
|
|
|
|
|
|
|
|
if (!has_tracking(evsel_to_remove))
|
|
|
|
return true;
|
|
|
|
|
2016-06-23 08:26:15 -06:00
|
|
|
evlist__for_each_entry(evlist, evsel) {
|
2015-09-25 07:15:55 -06:00
|
|
|
if (evsel->handler != drop_sample) {
|
|
|
|
cnt += 1;
|
|
|
|
if ((evsel->attr.sample_type & COMPAT_MASK) ==
|
|
|
|
(evsel_to_remove->attr.sample_type & COMPAT_MASK))
|
|
|
|
ok = true;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return ok && cnt == 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void strip_fini(struct perf_inject *inject)
|
|
|
|
{
|
|
|
|
struct perf_evlist *evlist = inject->session->evlist;
|
|
|
|
struct perf_evsel *evsel, *tmp;
|
|
|
|
|
|
|
|
/* Remove non-synthesized evsels if possible */
|
2016-06-23 08:26:15 -06:00
|
|
|
evlist__for_each_entry_safe(evlist, tmp, evsel) {
|
2015-09-25 07:15:55 -06:00
|
|
|
if (evsel->handler == drop_sample &&
|
|
|
|
ok_to_remove(evlist, evsel)) {
|
|
|
|
pr_debug("Deleting %s\n", perf_evsel__name(evsel));
|
|
|
|
perf_evlist__remove(evlist, evsel);
|
|
|
|
perf_evsel__delete(evsel);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2012-09-30 16:54:10 -06:00
|
|
|
static int __cmd_inject(struct perf_inject *inject)
|
2010-05-01 00:41:20 -06:00
|
|
|
{
|
|
|
|
int ret = -EINVAL;
|
2014-08-12 00:40:37 -06:00
|
|
|
struct perf_session *session = inject->session;
|
2017-01-23 14:07:59 -07:00
|
|
|
struct perf_data *data_out = &inject->output;
|
|
|
|
int fd = perf_data__fd(data_out);
|
2015-04-09 09:54:00 -06:00
|
|
|
u64 output_data_offset;
|
2010-05-01 00:41:20 -06:00
|
|
|
|
|
|
|
signal(SIGINT, sig_handler);
|
|
|
|
|
2015-04-09 09:54:00 -06:00
|
|
|
if (inject->build_ids || inject->sched_stat ||
|
|
|
|
inject->itrace_synth_opts.set) {
|
2012-09-30 16:54:10 -06:00
|
|
|
inject->tool.mmap = perf_event__repipe_mmap;
|
2013-08-21 04:10:25 -06:00
|
|
|
inject->tool.mmap2 = perf_event__repipe_mmap2;
|
2012-10-06 12:44:59 -06:00
|
|
|
inject->tool.fork = perf_event__repipe_fork;
|
2012-09-30 16:54:10 -06:00
|
|
|
inject->tool.tracing_data = perf_event__repipe_tracing_data;
|
2010-05-01 00:41:20 -06:00
|
|
|
}
|
|
|
|
|
2015-04-09 09:54:00 -06:00
|
|
|
output_data_offset = session->header.data_offset;
|
|
|
|
|
2012-08-07 06:56:05 -06:00
|
|
|
if (inject->build_ids) {
|
|
|
|
inject->tool.sample = perf_event__inject_buildid;
|
|
|
|
} else if (inject->sched_stat) {
|
2012-08-07 06:56:04 -06:00
|
|
|
struct perf_evsel *evsel;
|
|
|
|
|
2016-06-23 08:26:15 -06:00
|
|
|
evlist__for_each_entry(session->evlist, evsel) {
|
2012-08-07 06:56:04 -06:00
|
|
|
const char *name = perf_evsel__name(evsel);
|
|
|
|
|
|
|
|
if (!strcmp(name, "sched:sched_switch")) {
|
|
|
|
if (perf_evsel__check_stype(evsel, PERF_SAMPLE_TID, "TID"))
|
|
|
|
return -EINVAL;
|
|
|
|
|
2013-11-06 06:17:38 -07:00
|
|
|
evsel->handler = perf_inject__sched_switch;
|
2012-08-07 06:56:04 -06:00
|
|
|
} else if (!strcmp(name, "sched:sched_process_exit"))
|
2013-11-06 06:17:38 -07:00
|
|
|
evsel->handler = perf_inject__sched_process_exit;
|
2012-08-07 06:56:04 -06:00
|
|
|
else if (!strncmp(name, "sched:sched_stat_", 17))
|
2013-11-06 06:17:38 -07:00
|
|
|
evsel->handler = perf_inject__sched_stat;
|
2012-08-07 06:56:04 -06:00
|
|
|
}
|
2015-04-09 09:54:00 -06:00
|
|
|
} else if (inject->itrace_synth_opts.set) {
|
|
|
|
session->itrace_synth_opts = &inject->itrace_synth_opts;
|
|
|
|
inject->itrace_synth_opts.inject = true;
|
|
|
|
inject->tool.comm = perf_event__repipe_comm;
|
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-07 13:41:43 -07:00
|
|
|
inject->tool.namespaces = perf_event__repipe_namespaces;
|
2015-04-09 09:54:00 -06:00
|
|
|
inject->tool.exit = perf_event__repipe_exit;
|
|
|
|
inject->tool.id_index = perf_event__repipe_id_index;
|
|
|
|
inject->tool.auxtrace_info = perf_event__process_auxtrace_info;
|
|
|
|
inject->tool.auxtrace = perf_event__process_auxtrace;
|
2015-09-25 07:15:54 -06:00
|
|
|
inject->tool.aux = perf_event__drop_aux;
|
|
|
|
inject->tool.itrace_start = perf_event__drop_aux,
|
2015-04-09 09:54:00 -06:00
|
|
|
inject->tool.ordered_events = true;
|
|
|
|
inject->tool.ordering_requires_timestamps = true;
|
|
|
|
/* Allow space in the header for new attributes */
|
|
|
|
output_data_offset = 4096;
|
2015-09-25 07:15:55 -06:00
|
|
|
if (inject->strip)
|
|
|
|
strip_init(inject);
|
2012-08-07 06:56:04 -06:00
|
|
|
}
|
|
|
|
|
2015-04-30 08:37:25 -06:00
|
|
|
if (!inject->itrace_synth_opts.set)
|
|
|
|
auxtrace_index__free(&session->auxtrace_index);
|
|
|
|
|
2017-01-23 14:07:59 -07:00
|
|
|
if (!data_out->is_pipe)
|
2015-04-09 09:54:00 -06:00
|
|
|
lseek(fd, output_data_offset, SEEK_SET);
|
2012-08-07 06:56:02 -06:00
|
|
|
|
2015-03-03 07:58:45 -07:00
|
|
|
ret = perf_session__process_events(session);
|
2017-04-10 14:14:26 -06:00
|
|
|
if (ret)
|
|
|
|
return ret;
|
2010-05-01 00:41:20 -06:00
|
|
|
|
2017-01-23 14:07:59 -07:00
|
|
|
if (!data_out->is_pipe) {
|
2016-03-07 12:44:38 -07:00
|
|
|
if (inject->build_ids)
|
2014-07-14 04:02:34 -06:00
|
|
|
perf_header__set_feat(&session->header,
|
|
|
|
HEADER_BUILD_ID);
|
2016-03-07 12:44:38 -07:00
|
|
|
/*
|
|
|
|
* Keep all buildids when there is unprocessed AUX data because
|
|
|
|
* it is not known which ones the AUX trace hits.
|
|
|
|
*/
|
|
|
|
if (perf_header__has_feat(&session->header, HEADER_BUILD_ID) &&
|
|
|
|
inject->have_auxtrace && !inject->itrace_synth_opts.set)
|
|
|
|
dsos__hit_all(session);
|
2015-04-09 09:54:00 -06:00
|
|
|
/*
|
|
|
|
* The AUX areas have been removed and replaced with
|
2015-09-25 07:15:54 -06:00
|
|
|
* synthesized hardware events, so clear the feature flag and
|
|
|
|
* remove the evsel.
|
2015-04-09 09:54:00 -06:00
|
|
|
*/
|
2015-09-25 07:15:43 -06:00
|
|
|
if (inject->itrace_synth_opts.set) {
|
2015-09-25 07:15:54 -06:00
|
|
|
struct perf_evsel *evsel;
|
|
|
|
|
2015-04-09 09:54:00 -06:00
|
|
|
perf_header__clear_feat(&session->header,
|
|
|
|
HEADER_AUXTRACE);
|
2015-09-25 07:15:43 -06:00
|
|
|
if (inject->itrace_synth_opts.last_branch)
|
|
|
|
perf_header__set_feat(&session->header,
|
|
|
|
HEADER_BRANCH_STACK);
|
2015-09-25 07:15:54 -06:00
|
|
|
evsel = perf_evlist__id2evsel_strict(session->evlist,
|
|
|
|
inject->aux_id);
|
|
|
|
if (evsel) {
|
|
|
|
pr_debug("Deleting %s\n",
|
|
|
|
perf_evsel__name(evsel));
|
|
|
|
perf_evlist__remove(session->evlist, evsel);
|
|
|
|
perf_evsel__delete(evsel);
|
|
|
|
}
|
2015-09-25 07:15:55 -06:00
|
|
|
if (inject->strip)
|
|
|
|
strip_fini(inject);
|
2015-09-25 07:15:43 -06:00
|
|
|
}
|
2015-04-09 09:54:00 -06:00
|
|
|
session->header.data_offset = output_data_offset;
|
2012-08-07 06:56:02 -06:00
|
|
|
session->header.data_size = inject->bytes_written;
|
2015-01-29 01:06:48 -07:00
|
|
|
perf_session__write_header(session, session->evlist, fd, true);
|
2012-08-07 06:56:02 -06:00
|
|
|
}
|
|
|
|
|
2010-05-01 00:41:20 -06:00
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2017-03-27 08:47:20 -06:00
|
|
|
int cmd_inject(int argc, const char **argv)
|
2010-05-01 00:41:20 -06:00
|
|
|
{
|
2012-09-30 16:54:10 -06:00
|
|
|
struct perf_inject inject = {
|
|
|
|
.tool = {
|
|
|
|
.sample = perf_event__repipe_sample,
|
|
|
|
.mmap = perf_event__repipe,
|
2013-08-21 04:10:25 -06:00
|
|
|
.mmap2 = perf_event__repipe,
|
2012-09-30 16:54:10 -06:00
|
|
|
.comm = perf_event__repipe,
|
|
|
|
.fork = perf_event__repipe,
|
|
|
|
.exit = perf_event__repipe,
|
|
|
|
.lost = perf_event__repipe,
|
2015-11-13 02:48:32 -07:00
|
|
|
.lost_samples = perf_event__repipe,
|
2015-04-30 08:37:29 -06:00
|
|
|
.aux = perf_event__repipe,
|
2015-04-30 08:37:30 -06:00
|
|
|
.itrace_start = perf_event__repipe,
|
2015-07-21 03:44:03 -06:00
|
|
|
.context_switch = perf_event__repipe,
|
2012-09-30 16:54:10 -06:00
|
|
|
.read = perf_event__repipe_sample,
|
|
|
|
.throttle = perf_event__repipe,
|
|
|
|
.unthrottle = perf_event__repipe,
|
|
|
|
.attr = perf_event__repipe_attr,
|
2013-07-04 07:20:21 -06:00
|
|
|
.tracing_data = perf_event__repipe_op2_synth,
|
2015-04-21 03:21:54 -06:00
|
|
|
.auxtrace_info = perf_event__repipe_op2_synth,
|
|
|
|
.auxtrace = perf_event__repipe_auxtrace,
|
|
|
|
.auxtrace_error = perf_event__repipe_op2_synth,
|
2016-03-08 01:38:44 -07:00
|
|
|
.time_conv = perf_event__repipe_op2_synth,
|
2015-03-03 08:37:54 -07:00
|
|
|
.finished_round = perf_event__repipe_oe_synth,
|
2012-09-30 16:54:10 -06:00
|
|
|
.build_id = perf_event__repipe_op2_synth,
|
2014-10-27 07:49:22 -06:00
|
|
|
.id_index = perf_event__repipe_op2_synth,
|
perf tools: Add feature header record to pipe-mode
Add header record types to pipe-mode, reusing the functions
used in file-mode and leveraging the new struct feat_fd.
For alignment, check that synthesized events don't exceed
pagesize.
Add the perf_event__synthesize_feature event call back to
process the new header records.
Before this patch:
$ perf record -o - -e cycles sleep 1 | perf report --stdio --header
[ perf record: Woken up 1 times to write data ]
[ perf record: Captured and wrote 0.000 MB - ]
...
After this patch:
$ perf record -o - -e cycles sleep 1 | perf report --stdio --header
# ========
# captured on: Mon May 22 16:33:43 2017
# ========
#
# hostname : my_hostname
# os release : 4.11.0-dbx-up_perf
# perf version : 4.11.rc6.g6277c80
# arch : x86_64
# nrcpus online : 72
# nrcpus avail : 72
# cpudesc : Intel(R) Xeon(R) CPU E5-2696 v3 @ 2.30GHz
# cpuid : GenuineIntel,6,63,2
# total memory : 263457192 kB
# cmdline : /root/perf record -o - -e cycles -c 100000 sleep 1
# HEADER_CPU_TOPOLOGY info available, use -I to display
# HEADER_NUMA_TOPOLOGY info available, use -I to display
# pmu mappings: intel_bts = 6, uncore_imc_4 = 22, uncore_sbox_1 = 47, uncore_cbox_5 = 33, uncore_ha_0 = 16, uncore_cbox
[ perf record: Woken up 1 times to write data ]
[ perf record: Captured and wrote 0.000 MB - ]
...
Support added for the subcommands: report, inject, annotate and script.
Signed-off-by: David Carrillo-Cisneros <davidcc@google.com>
Acked-by: David Ahern <dsahern@gmail.com>
Acked-by: Jiri Olsa <jolsa@kernel.org>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: He Kuang <hekuang@huawei.com>
Cc: Masami Hiramatsu <mhiramat@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Paul Turner <pjt@google.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Simon Que <sque@chromium.org>
Cc: Stephane Eranian <eranian@google.com>
Cc: Wang Nan <wangnan0@huawei.com>
Link: http://lkml.kernel.org/r/20170718042549.145161-16-davidcc@google.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2017-07-17 22:25:48 -06:00
|
|
|
.feature = perf_event__repipe_op2_synth,
|
2012-09-30 16:54:10 -06:00
|
|
|
},
|
2012-08-07 06:56:02 -06:00
|
|
|
.input_name = "-",
|
2012-08-07 06:56:04 -06:00
|
|
|
.samples = LIST_HEAD_INIT(inject.samples),
|
2013-10-29 12:04:57 -06:00
|
|
|
.output = {
|
2017-01-23 14:25:41 -07:00
|
|
|
.file = {
|
|
|
|
.path = "-",
|
|
|
|
},
|
|
|
|
.mode = PERF_DATA_MODE_WRITE,
|
2013-10-29 12:04:57 -06:00
|
|
|
},
|
2012-09-30 16:54:10 -06:00
|
|
|
};
|
2017-01-23 14:07:59 -07:00
|
|
|
struct perf_data data = {
|
2014-08-12 00:40:37 -06:00
|
|
|
.mode = PERF_DATA_MODE_READ,
|
|
|
|
};
|
|
|
|
int ret;
|
|
|
|
|
2015-11-30 02:02:21 -07:00
|
|
|
struct option options[] = {
|
2012-09-30 16:54:10 -06:00
|
|
|
OPT_BOOLEAN('b', "build-ids", &inject.build_ids,
|
|
|
|
"Inject build-ids into the output stream"),
|
2012-08-07 06:56:02 -06:00
|
|
|
OPT_STRING('i', "input", &inject.input_name, "file",
|
|
|
|
"input file name"),
|
2017-01-23 14:25:41 -07:00
|
|
|
OPT_STRING('o', "output", &inject.output.file.path, "file",
|
2012-08-07 06:56:02 -06:00
|
|
|
"output file name"),
|
2012-08-07 06:56:04 -06:00
|
|
|
OPT_BOOLEAN('s', "sched-stat", &inject.sched_stat,
|
|
|
|
"Merge sched-stat and sched-switch for getting events "
|
|
|
|
"where and how long tasks slept"),
|
2016-03-10 09:41:13 -07:00
|
|
|
#ifdef HAVE_JITDUMP
|
2015-11-30 02:02:21 -07:00
|
|
|
OPT_BOOLEAN('j', "jit", &inject.jit_mode, "merge jitdump files into perf.data file"),
|
2016-03-10 09:41:13 -07:00
|
|
|
#endif
|
2012-09-30 16:54:10 -06:00
|
|
|
OPT_INCR('v', "verbose", &verbose,
|
|
|
|
"be more verbose (show build ids, etc)"),
|
2014-07-22 07:17:38 -06:00
|
|
|
OPT_STRING(0, "kallsyms", &symbol_conf.kallsyms_name, "file",
|
|
|
|
"kallsyms pathname"),
|
2017-01-23 14:07:59 -07:00
|
|
|
OPT_BOOLEAN('f', "force", &data.force, "don't complain, do it"),
|
2015-04-09 09:54:00 -06:00
|
|
|
OPT_CALLBACK_OPTARG(0, "itrace", &inject.itrace_synth_opts,
|
|
|
|
NULL, "opts", "Instruction Tracing options",
|
|
|
|
itrace_parse_synth_opts),
|
2015-09-25 07:15:55 -06:00
|
|
|
OPT_BOOLEAN(0, "strip", &inject.strip,
|
|
|
|
"strip non-synthesized events (use with --itrace)"),
|
2012-09-30 16:54:10 -06:00
|
|
|
OPT_END()
|
|
|
|
};
|
2012-10-01 12:20:58 -06:00
|
|
|
const char * const inject_usage[] = {
|
|
|
|
"perf inject [<options>]",
|
|
|
|
NULL
|
|
|
|
};
|
2016-03-10 09:41:13 -07:00
|
|
|
#ifndef HAVE_JITDUMP
|
2015-11-30 02:02:21 -07:00
|
|
|
set_option_nobuild(options, 'j', "jit", "NO_LIBELF=1", true);
|
|
|
|
#endif
|
2012-10-01 12:20:58 -06:00
|
|
|
argc = parse_options(argc, argv, options, inject_usage, 0);
|
2010-05-01 00:41:20 -06:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Any (unrecognized) arguments left?
|
|
|
|
*/
|
|
|
|
if (argc)
|
2012-10-01 12:20:58 -06:00
|
|
|
usage_with_options(inject_usage, options);
|
2010-05-01 00:41:20 -06:00
|
|
|
|
2015-09-25 07:15:55 -06:00
|
|
|
if (inject.strip && !inject.itrace_synth_opts.set) {
|
|
|
|
pr_err("--strip option requires --itrace option\n");
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
2017-01-23 14:07:59 -07:00
|
|
|
if (perf_data__open(&inject.output)) {
|
2013-10-29 12:04:57 -06:00
|
|
|
perror("failed to create output file");
|
|
|
|
return -1;
|
2012-08-07 06:56:02 -06:00
|
|
|
}
|
|
|
|
|
2015-03-03 07:58:45 -07:00
|
|
|
inject.tool.ordered_events = inject.sched_stat;
|
|
|
|
|
2017-01-23 14:25:41 -07:00
|
|
|
data.file.path = inject.input_name;
|
2017-01-23 14:07:59 -07:00
|
|
|
inject.session = perf_session__new(&data, true, &inject.tool);
|
2014-08-12 00:40:37 -06:00
|
|
|
if (inject.session == NULL)
|
2014-09-23 19:33:37 -06:00
|
|
|
return -1;
|
2014-08-12 00:40:37 -06:00
|
|
|
|
2016-01-22 14:41:00 -07:00
|
|
|
if (inject.build_ids) {
|
|
|
|
/*
|
|
|
|
* to make sure the mmap records are ordered correctly
|
|
|
|
* and so that the correct especially due to jitted code
|
|
|
|
* mmaps. We cannot generate the buildid hit list and
|
|
|
|
* inject the jit mmaps at the same time for now.
|
|
|
|
*/
|
|
|
|
inject.tool.ordered_events = true;
|
|
|
|
inject.tool.ordering_requires_timestamps = true;
|
|
|
|
}
|
2016-03-10 09:41:13 -07:00
|
|
|
#ifdef HAVE_JITDUMP
|
2015-11-30 02:02:21 -07:00
|
|
|
if (inject.jit_mode) {
|
|
|
|
inject.tool.mmap2 = perf_event__jit_repipe_mmap2;
|
|
|
|
inject.tool.mmap = perf_event__jit_repipe_mmap;
|
|
|
|
inject.tool.ordered_events = true;
|
|
|
|
inject.tool.ordering_requires_timestamps = true;
|
|
|
|
/*
|
|
|
|
* JIT MMAP injection injects all MMAP events in one go, so it
|
|
|
|
* does not obey finished_round semantics.
|
|
|
|
*/
|
|
|
|
inject.tool.finished_round = perf_event__drop_oe;
|
|
|
|
}
|
|
|
|
#endif
|
2015-06-30 02:15:20 -06:00
|
|
|
ret = symbol__init(&inject.session->header.env);
|
|
|
|
if (ret < 0)
|
|
|
|
goto out_delete;
|
2010-05-01 00:41:20 -06:00
|
|
|
|
2014-08-12 00:40:37 -06:00
|
|
|
ret = __cmd_inject(&inject);
|
|
|
|
|
2015-06-30 02:15:20 -06:00
|
|
|
out_delete:
|
2014-08-12 00:40:37 -06:00
|
|
|
perf_session__delete(inject.session);
|
|
|
|
return ret;
|
2010-05-01 00:41:20 -06:00
|
|
|
}
|