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 14:07:57 +00:00
|
|
|
// SPDX-License-Identifier: GPL-2.0
|
2010-05-01 06:41:20 +00: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"
|
|
|
|
|
2012-08-07 12:56:04 +00:00
|
|
|
#include "util/color.h"
|
2019-08-30 14:11:01 +00:00
|
|
|
#include "util/dso.h"
|
2020-10-12 07:02:13 +00:00
|
|
|
#include "util/vdso.h"
|
2012-08-07 12:56:04 +00:00
|
|
|
#include "util/evlist.h"
|
|
|
|
#include "util/evsel.h"
|
2019-01-27 12:42:37 +00:00
|
|
|
#include "util/map.h"
|
2010-05-01 06:41:20 +00:00
|
|
|
#include "util/session.h"
|
2011-11-28 10:30:20 +00:00
|
|
|
#include "util/tool.h"
|
2010-05-01 06:41:20 +00:00
|
|
|
#include "util/debug.h"
|
2012-08-07 12:56:05 +00:00
|
|
|
#include "util/build-id.h"
|
2013-10-15 14:27:32 +00:00
|
|
|
#include "util/data.h"
|
2015-04-09 15:54:00 +00:00
|
|
|
#include "util/auxtrace.h"
|
2015-11-30 09:02:21 +00:00
|
|
|
#include "util/jit.h"
|
2019-01-27 23:03:34 +00:00
|
|
|
#include "util/symbol.h"
|
2019-09-18 14:36:13 +00:00
|
|
|
#include "util/synthetic-events.h"
|
2017-04-20 00:34:35 +00:00
|
|
|
#include "util/thread.h"
|
2020-10-12 07:02:11 +00:00
|
|
|
#include "util/namespaces.h"
|
2022-02-02 07:08:27 +00:00
|
|
|
#include "util/util.h"
|
2010-05-01 06:41:20 +00:00
|
|
|
|
2022-05-20 13:24:02 +00:00
|
|
|
#include <internal/lib.h>
|
|
|
|
|
perf inject: Do not load map/dso when injecting build-id
No need to load symbols in a DSO when injecting build-id. I guess the
reason was to check the DSO is a special file like anon files. Use some
helper functions in map.c to check them before reading build-id. Also
pass sample event's cpumode to a new build-id event.
It brought a speedup in the benchmark of 25 -> 21 msec on my laptop.
Also the memory usage (Max RSS) went down by ~200 KB.
# Running 'internals/inject-build-id' benchmark:
Average build-id injection took: 21.389 msec (+- 0.138 msec)
Average time per event: 2.097 usec (+- 0.014 usec)
Average memory usage: 8225 KB (+- 0 KB)
Committer notes:
Before:
$ perf stat -r5 perf bench internals inject-build-id > /dev/null
Performance counter stats for 'perf bench internals inject-build-id' (5 runs):
4,020.56 msec task-clock:u # 1.271 CPUs utilized ( +- 0.74% )
0 context-switches:u # 0.000 K/sec
0 cpu-migrations:u # 0.000 K/sec
123,354 page-faults:u # 0.031 M/sec ( +- 0.81% )
7,119,951,568 cycles:u # 1.771 GHz ( +- 1.74% ) (83.27%)
230,086,969 stalled-cycles-frontend:u # 3.23% frontend cycles idle ( +- 1.97% ) (83.41%)
1,168,298,765 stalled-cycles-backend:u # 16.41% backend cycles idle ( +- 1.13% ) (83.44%)
11,173,083,669 instructions:u # 1.57 insn per cycle
# 0.10 stalled cycles per insn ( +- 1.58% ) (83.31%)
2,413,908,936 branches:u # 600.392 M/sec ( +- 1.69% ) (83.26%)
46,576,289 branch-misses:u # 1.93% of all branches ( +- 2.20% ) (83.31%)
3.1638 +- 0.0309 seconds time elapsed ( +- 0.98% )
$
After:
$ perf stat -r5 perf bench internals inject-build-id > /dev/null
Performance counter stats for 'perf bench internals inject-build-id' (5 runs):
2,379.94 msec task-clock:u # 1.473 CPUs utilized ( +- 0.18% )
0 context-switches:u # 0.000 K/sec
0 cpu-migrations:u # 0.000 K/sec
62,584 page-faults:u # 0.026 M/sec ( +- 0.07% )
2,372,389,668 cycles:u # 0.997 GHz ( +- 0.29% ) (83.14%)
106,937,862 stalled-cycles-frontend:u # 4.51% frontend cycles idle ( +- 4.89% ) (83.20%)
581,697,915 stalled-cycles-backend:u # 24.52% backend cycles idle ( +- 0.71% ) (83.47%)
3,659,692,199 instructions:u # 1.54 insn per cycle
# 0.16 stalled cycles per insn ( +- 0.10% ) (83.63%)
791,372,961 branches:u # 332.518 M/sec ( +- 0.27% ) (83.39%)
10,648,083 branch-misses:u # 1.35% of all branches ( +- 0.22% ) (83.16%)
1.61570 +- 0.00172 seconds time elapsed ( +- 0.11% )
$
Signed-off-by: Namhyung Kim <namhyung@kernel.org>
Original-patch-by: Stephane Eranian <eranian@google.com>
Tested-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Acked-by: Jiri Olsa <jolsa@redhat.com>
Link: https://lore.kernel.org/r/20201012070214.2074921-5-namhyung@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2020-10-12 07:02:12 +00:00
|
|
|
#include <linux/err.h>
|
2015-12-15 15:39:39 +00:00
|
|
|
#include <subcmd/parse-options.h>
|
perf inject: Do not load map/dso when injecting build-id
No need to load symbols in a DSO when injecting build-id. I guess the
reason was to check the DSO is a special file like anon files. Use some
helper functions in map.c to check them before reading build-id. Also
pass sample event's cpumode to a new build-id event.
It brought a speedup in the benchmark of 25 -> 21 msec on my laptop.
Also the memory usage (Max RSS) went down by ~200 KB.
# Running 'internals/inject-build-id' benchmark:
Average build-id injection took: 21.389 msec (+- 0.138 msec)
Average time per event: 2.097 usec (+- 0.014 usec)
Average memory usage: 8225 KB (+- 0 KB)
Committer notes:
Before:
$ perf stat -r5 perf bench internals inject-build-id > /dev/null
Performance counter stats for 'perf bench internals inject-build-id' (5 runs):
4,020.56 msec task-clock:u # 1.271 CPUs utilized ( +- 0.74% )
0 context-switches:u # 0.000 K/sec
0 cpu-migrations:u # 0.000 K/sec
123,354 page-faults:u # 0.031 M/sec ( +- 0.81% )
7,119,951,568 cycles:u # 1.771 GHz ( +- 1.74% ) (83.27%)
230,086,969 stalled-cycles-frontend:u # 3.23% frontend cycles idle ( +- 1.97% ) (83.41%)
1,168,298,765 stalled-cycles-backend:u # 16.41% backend cycles idle ( +- 1.13% ) (83.44%)
11,173,083,669 instructions:u # 1.57 insn per cycle
# 0.10 stalled cycles per insn ( +- 1.58% ) (83.31%)
2,413,908,936 branches:u # 600.392 M/sec ( +- 1.69% ) (83.26%)
46,576,289 branch-misses:u # 1.93% of all branches ( +- 2.20% ) (83.31%)
3.1638 +- 0.0309 seconds time elapsed ( +- 0.98% )
$
After:
$ perf stat -r5 perf bench internals inject-build-id > /dev/null
Performance counter stats for 'perf bench internals inject-build-id' (5 runs):
2,379.94 msec task-clock:u # 1.473 CPUs utilized ( +- 0.18% )
0 context-switches:u # 0.000 K/sec
0 cpu-migrations:u # 0.000 K/sec
62,584 page-faults:u # 0.026 M/sec ( +- 0.07% )
2,372,389,668 cycles:u # 0.997 GHz ( +- 0.29% ) (83.14%)
106,937,862 stalled-cycles-frontend:u # 4.51% frontend cycles idle ( +- 4.89% ) (83.20%)
581,697,915 stalled-cycles-backend:u # 24.52% backend cycles idle ( +- 0.71% ) (83.47%)
3,659,692,199 instructions:u # 1.54 insn per cycle
# 0.16 stalled cycles per insn ( +- 0.10% ) (83.63%)
791,372,961 branches:u # 332.518 M/sec ( +- 0.27% ) (83.39%)
10,648,083 branch-misses:u # 1.35% of all branches ( +- 0.22% ) (83.16%)
1.61570 +- 0.00172 seconds time elapsed ( +- 0.11% )
$
Signed-off-by: Namhyung Kim <namhyung@kernel.org>
Original-patch-by: Stephane Eranian <eranian@google.com>
Tested-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Acked-by: Jiri Olsa <jolsa@redhat.com>
Link: https://lore.kernel.org/r/20201012070214.2074921-5-namhyung@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2020-10-12 07:02:12 +00:00
|
|
|
#include <uapi/linux/mman.h> /* To get things like MAP_HUGETLB even on older libc headers */
|
2010-05-01 06:41:20 +00:00
|
|
|
|
2012-08-07 12:56:04 +00:00
|
|
|
#include <linux/list.h>
|
2021-04-30 07:03:02 +00:00
|
|
|
#include <linux/string.h>
|
2017-04-18 13:46:11 +00:00
|
|
|
#include <errno.h>
|
2017-04-19 18:49:18 +00:00
|
|
|
#include <signal.h>
|
2012-08-07 12:56:04 +00:00
|
|
|
|
2012-09-30 22:54:10 +00:00
|
|
|
struct perf_inject {
|
2013-10-29 18:04:57 +00:00
|
|
|
struct perf_tool tool;
|
2014-08-12 06:40:37 +00:00
|
|
|
struct perf_session *session;
|
2013-10-29 18:04:57 +00:00
|
|
|
bool build_ids;
|
2020-10-12 07:02:13 +00:00
|
|
|
bool build_id_all;
|
2013-10-29 18:04:57 +00:00
|
|
|
bool sched_stat;
|
2015-04-30 14:37:26 +00:00
|
|
|
bool have_auxtrace;
|
2015-09-25 13:15:55 +00:00
|
|
|
bool strip;
|
2015-11-30 09:02:21 +00:00
|
|
|
bool jit_mode;
|
2021-04-30 07:03:01 +00:00
|
|
|
bool in_place_update;
|
|
|
|
bool in_place_update_dry_run;
|
2021-07-19 22:31:51 +00:00
|
|
|
bool is_pipe;
|
2022-05-20 13:24:04 +00:00
|
|
|
bool copy_kcore_dir;
|
2013-10-29 18:04:57 +00:00
|
|
|
const char *input_name;
|
2017-01-23 21:07:59 +00:00
|
|
|
struct perf_data output;
|
2013-10-29 18:04:57 +00:00
|
|
|
u64 bytes_written;
|
2015-09-25 13:15:54 +00:00
|
|
|
u64 aux_id;
|
2013-10-29 18:04:57 +00:00
|
|
|
struct list_head samples;
|
2015-04-09 15:54:00 +00:00
|
|
|
struct itrace_synth_opts itrace_synth_opts;
|
2019-11-15 12:42:18 +00:00
|
|
|
char event_copy[PERF_SAMPLE_MAX_SIZE];
|
2022-05-20 13:24:02 +00:00
|
|
|
struct perf_file_section secs[HEADER_FEAT_BITS];
|
2012-08-07 12:56:04 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
struct event_entry {
|
|
|
|
struct list_head node;
|
|
|
|
u32 tid;
|
2020-05-15 17:29:26 +00:00
|
|
|
union perf_event event[];
|
2012-09-30 22:54:10 +00:00
|
|
|
};
|
2010-05-01 06:41:20 +00:00
|
|
|
|
2020-10-12 07:02:13 +00:00
|
|
|
static int dso__inject_build_id(struct dso *dso, struct perf_tool *tool,
|
|
|
|
struct machine *machine, u8 cpumode, u32 flags);
|
|
|
|
|
2015-04-21 09:21:54 +00:00
|
|
|
static int output_bytes(struct perf_inject *inject, void *buf, size_t sz)
|
2010-05-01 06:41:20 +00:00
|
|
|
{
|
2013-10-29 18:04:57 +00:00
|
|
|
ssize_t size;
|
2010-05-01 06:41:20 +00:00
|
|
|
|
2017-01-23 21:07:59 +00:00
|
|
|
size = perf_data__write(&inject->output, buf, sz);
|
2013-10-29 18:04:57 +00:00
|
|
|
if (size < 0)
|
|
|
|
return -errno;
|
2010-05-01 06:41:20 +00:00
|
|
|
|
2013-10-29 18:04:57 +00:00
|
|
|
inject->bytes_written += size;
|
2010-05-01 06:41:20 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2015-04-21 09:21:54 +00: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 15:37:54 +00: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 16:41:13 +00:00
|
|
|
#ifdef HAVE_JITDUMP
|
2015-11-30 09:02:21 +00: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
|
|
|
|
|
2018-09-13 12:54:03 +00:00
|
|
|
static int perf_event__repipe_op2_synth(struct perf_session *session,
|
|
|
|
union perf_event *event)
|
2011-11-28 09:56:39 +00:00
|
|
|
{
|
2018-09-13 12:54:03 +00:00
|
|
|
return perf_event__repipe_synth(session->tool, event);
|
2011-11-28 09:56:39 +00:00
|
|
|
}
|
|
|
|
|
2020-10-12 07:02:10 +00:00
|
|
|
static int perf_event__repipe_op4_synth(struct perf_session *session,
|
|
|
|
union perf_event *event,
|
2022-01-17 18:34:36 +00:00
|
|
|
u64 data __maybe_unused,
|
|
|
|
const char *str __maybe_unused)
|
2020-10-12 07:02:10 +00:00
|
|
|
{
|
|
|
|
return perf_event__repipe_synth(session->tool, event);
|
|
|
|
}
|
|
|
|
|
2013-07-04 13:20:21 +00:00
|
|
|
static int perf_event__repipe_attr(struct perf_tool *tool,
|
|
|
|
union perf_event *event,
|
2019-07-21 11:23:52 +00:00
|
|
|
struct evlist **pevlist)
|
2011-11-12 00:45:41 +00:00
|
|
|
{
|
2013-10-22 07:34:09 +00:00
|
|
|
struct perf_inject *inject = container_of(tool, struct perf_inject,
|
|
|
|
tool);
|
2012-05-15 11:28:11 +00:00
|
|
|
int ret;
|
2013-07-04 13:20:21 +00:00
|
|
|
|
|
|
|
ret = perf_event__process_attr(tool, event, pevlist);
|
2012-05-15 11:28:11 +00:00
|
|
|
if (ret)
|
|
|
|
return ret;
|
|
|
|
|
2021-07-19 22:31:51 +00:00
|
|
|
if (!inject->is_pipe)
|
2013-10-22 07:34:09 +00:00
|
|
|
return 0;
|
|
|
|
|
2013-07-04 13:20:21 +00:00
|
|
|
return perf_event__repipe_synth(tool, event);
|
2011-11-12 00:45:41 +00:00
|
|
|
}
|
|
|
|
|
2020-10-12 07:02:10 +00:00
|
|
|
static int perf_event__repipe_event_update(struct perf_tool *tool,
|
|
|
|
union perf_event *event,
|
|
|
|
struct evlist **pevlist __maybe_unused)
|
|
|
|
{
|
|
|
|
return perf_event__repipe_synth(tool, event);
|
|
|
|
}
|
|
|
|
|
2015-04-30 14:37:27 +00: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;
|
|
|
|
}
|
|
|
|
|
2018-09-13 12:54:04 +00:00
|
|
|
static s64 perf_event__repipe_auxtrace(struct perf_session *session,
|
|
|
|
union perf_event *event)
|
2015-04-21 09:21:54 +00:00
|
|
|
{
|
2018-09-13 12:54:04 +00:00
|
|
|
struct perf_tool *tool = session->tool;
|
2015-04-21 09:21:54 +00:00
|
|
|
struct perf_inject *inject = container_of(tool, struct perf_inject,
|
|
|
|
tool);
|
|
|
|
int ret;
|
|
|
|
|
2015-04-30 14:37:26 +00:00
|
|
|
inject->have_auxtrace = true;
|
|
|
|
|
2015-04-30 14:37:25 +00:00
|
|
|
if (!inject->output.is_pipe) {
|
|
|
|
off_t offset;
|
|
|
|
|
2017-01-23 21:25:41 +00:00
|
|
|
offset = lseek(inject->output.file.fd, 0, SEEK_CUR);
|
2015-04-30 14:37:25 +00:00
|
|
|
if (offset == -1)
|
|
|
|
return -errno;
|
|
|
|
ret = auxtrace_index__auxtrace_event(&session->auxtrace_index,
|
|
|
|
event, offset);
|
|
|
|
if (ret < 0)
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2017-01-23 21:07:59 +00:00
|
|
|
if (perf_data__is_pipe(session->data) || !session->one_mmap) {
|
2015-04-21 09:21:54 +00:00
|
|
|
ret = output_bytes(inject, event, event->header.size);
|
|
|
|
if (ret < 0)
|
|
|
|
return ret;
|
2017-01-23 21:07:59 +00:00
|
|
|
ret = copy_bytes(inject, perf_data__fd(session->data),
|
2015-04-21 09:21:54 +00: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 14:37:27 +00:00
|
|
|
#else
|
|
|
|
|
|
|
|
static s64
|
2018-09-13 12:54:04 +00:00
|
|
|
perf_event__repipe_auxtrace(struct perf_session *session __maybe_unused,
|
|
|
|
union perf_event *event __maybe_unused)
|
2015-04-30 14:37:27 +00:00
|
|
|
{
|
|
|
|
pr_err("AUX area tracing not supported\n");
|
|
|
|
return -EINVAL;
|
|
|
|
}
|
|
|
|
|
|
|
|
#endif
|
|
|
|
|
2011-11-28 10:30:20 +00:00
|
|
|
static int perf_event__repipe(struct perf_tool *tool,
|
2011-11-25 10:19:45 +00:00
|
|
|
union perf_event *event,
|
2012-09-10 22:15:03 +00:00
|
|
|
struct perf_sample *sample __maybe_unused,
|
2013-07-04 13:20:20 +00: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 16:10:21 +00:00
|
|
|
{
|
2013-07-04 13:20:20 +00: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 16:10:21 +00:00
|
|
|
}
|
|
|
|
|
2015-09-25 13:15:55 +00: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 13:15:54 +00: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;
|
|
|
|
}
|
|
|
|
|
2019-11-15 12:42:18 +00:00
|
|
|
static union perf_event *
|
|
|
|
perf_inject__cut_auxtrace_sample(struct perf_inject *inject,
|
|
|
|
union perf_event *event,
|
|
|
|
struct perf_sample *sample)
|
|
|
|
{
|
|
|
|
size_t sz1 = sample->aux_sample.data - (void *)event;
|
|
|
|
size_t sz2 = event->header.size - sample->aux_sample.size - sz1;
|
|
|
|
union perf_event *ev = (union perf_event *)inject->event_copy;
|
|
|
|
|
|
|
|
if (sz1 > event->header.size || sz2 > event->header.size ||
|
|
|
|
sz1 + sz2 > event->header.size ||
|
|
|
|
sz1 < sizeof(struct perf_event_header) + sizeof(u64))
|
|
|
|
return event;
|
|
|
|
|
|
|
|
memcpy(ev, event, sz1);
|
|
|
|
memcpy((void *)ev + sz1, (void *)event + event->header.size - sz2, sz2);
|
|
|
|
ev->header.size = sz1 + sz2;
|
|
|
|
((u64 *)((void *)ev + sz1))[-1] = 0;
|
|
|
|
|
|
|
|
return ev;
|
|
|
|
}
|
|
|
|
|
2012-08-07 12:56:04 +00:00
|
|
|
typedef int (*inject_handler)(struct perf_tool *tool,
|
|
|
|
union perf_event *event,
|
|
|
|
struct perf_sample *sample,
|
2019-07-21 11:23:51 +00:00
|
|
|
struct evsel *evsel,
|
2012-08-07 12:56:04 +00:00
|
|
|
struct machine *machine);
|
|
|
|
|
2011-11-28 10:30:20 +00:00
|
|
|
static int perf_event__repipe_sample(struct perf_tool *tool,
|
2011-11-25 10:19:45 +00:00
|
|
|
union perf_event *event,
|
2012-08-07 12:56:04 +00:00
|
|
|
struct perf_sample *sample,
|
2019-07-21 11:23:51 +00:00
|
|
|
struct evsel *evsel,
|
2012-08-07 12:56:04 +00:00
|
|
|
struct machine *machine)
|
2011-03-15 18:44:01 +00:00
|
|
|
{
|
2019-11-15 12:42:18 +00:00
|
|
|
struct perf_inject *inject = container_of(tool, struct perf_inject,
|
|
|
|
tool);
|
|
|
|
|
2019-07-03 19:02:09 +00:00
|
|
|
if (evsel && evsel->handler) {
|
2013-11-06 13:17:38 +00:00
|
|
|
inject_handler f = evsel->handler;
|
2012-08-07 12:56:04 +00:00
|
|
|
return f(tool, event, sample, evsel, machine);
|
|
|
|
}
|
|
|
|
|
2012-08-07 12:56:05 +00:00
|
|
|
build_id__mark_dso_hit(tool, event, sample, evsel, machine);
|
|
|
|
|
2019-11-15 12:42:18 +00:00
|
|
|
if (inject->itrace_synth_opts.set && sample->aux_sample.size)
|
|
|
|
event = perf_inject__cut_auxtrace_sample(inject, event, sample);
|
|
|
|
|
2013-07-04 13:20:20 +00:00
|
|
|
return perf_event__repipe_synth(tool, event);
|
2011-03-15 18:44:01 +00:00
|
|
|
}
|
|
|
|
|
2011-11-28 10:30:20 +00:00
|
|
|
static int perf_event__repipe_mmap(struct perf_tool *tool,
|
2011-11-25 10:19:45 +00:00
|
|
|
union perf_event *event,
|
2011-01-29 16:01:45 +00:00
|
|
|
struct perf_sample *sample,
|
2011-11-28 09:56:39 +00:00
|
|
|
struct machine *machine)
|
2010-05-01 06:41:20 +00:00
|
|
|
{
|
|
|
|
int err;
|
|
|
|
|
2011-11-28 10:30:20 +00:00
|
|
|
err = perf_event__process_mmap(tool, event, sample, machine);
|
|
|
|
perf_event__repipe(tool, event, sample, machine);
|
2010-05-01 06:41:20 +00:00
|
|
|
|
|
|
|
return err;
|
|
|
|
}
|
|
|
|
|
2016-03-10 16:41:13 +00:00
|
|
|
#ifdef HAVE_JITDUMP
|
2015-11-30 09:02:21 +00: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 19:44:40 +00:00
|
|
|
int ret;
|
2015-11-30 09:02:21 +00:00
|
|
|
|
|
|
|
/*
|
|
|
|
* if jit marker, then inject jit mmaps and generate ELF images
|
|
|
|
*/
|
2016-03-07 19:44:40 +00:00
|
|
|
ret = jit_process(inject->session, &inject->output, machine,
|
2020-11-05 01:56:04 +00:00
|
|
|
event->mmap.filename, event->mmap.pid, event->mmap.tid, &n);
|
2016-03-07 19:44:40 +00:00
|
|
|
if (ret < 0)
|
|
|
|
return ret;
|
|
|
|
if (ret) {
|
2015-11-30 09:02:21 +00:00
|
|
|
inject->bytes_written += n;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
return perf_event__repipe_mmap(tool, event, sample, machine);
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2020-10-12 07:02:13 +00:00
|
|
|
static struct dso *findnew_dso(int pid, int tid, const char *filename,
|
|
|
|
struct dso_id *id, struct machine *machine)
|
|
|
|
{
|
|
|
|
struct thread *thread;
|
|
|
|
struct nsinfo *nsi = NULL;
|
|
|
|
struct nsinfo *nnsi;
|
|
|
|
struct dso *dso;
|
|
|
|
bool vdso;
|
|
|
|
|
|
|
|
thread = machine__findnew_thread(machine, pid, tid);
|
|
|
|
if (thread == NULL) {
|
|
|
|
pr_err("cannot find or create a task %d/%d.\n", tid, pid);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
vdso = is_vdso_map(filename);
|
|
|
|
nsi = nsinfo__get(thread->nsinfo);
|
|
|
|
|
|
|
|
if (vdso) {
|
|
|
|
/* The vdso maps are always on the host and not the
|
|
|
|
* container. Ensure that we don't use setns to look
|
|
|
|
* them up.
|
|
|
|
*/
|
|
|
|
nnsi = nsinfo__copy(nsi);
|
|
|
|
if (nnsi) {
|
|
|
|
nsinfo__put(nsi);
|
2022-02-11 10:34:06 +00:00
|
|
|
nsinfo__clear_need_setns(nnsi);
|
2020-10-12 07:02:13 +00:00
|
|
|
nsi = nnsi;
|
|
|
|
}
|
|
|
|
dso = machine__findnew_vdso(machine, thread);
|
|
|
|
} else {
|
|
|
|
dso = machine__findnew_dso_id(machine, filename, id);
|
|
|
|
}
|
|
|
|
|
2021-07-15 16:07:06 +00:00
|
|
|
if (dso) {
|
|
|
|
nsinfo__put(dso->nsinfo);
|
2020-10-12 07:02:13 +00:00
|
|
|
dso->nsinfo = nsi;
|
2021-07-15 16:07:06 +00:00
|
|
|
} else
|
2020-10-12 07:02:13 +00:00
|
|
|
nsinfo__put(nsi);
|
|
|
|
|
|
|
|
thread__put(thread);
|
|
|
|
return dso;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int perf_event__repipe_buildid_mmap(struct perf_tool *tool,
|
|
|
|
union perf_event *event,
|
|
|
|
struct perf_sample *sample,
|
|
|
|
struct machine *machine)
|
|
|
|
{
|
|
|
|
struct dso *dso;
|
|
|
|
|
|
|
|
dso = findnew_dso(event->mmap.pid, event->mmap.tid,
|
|
|
|
event->mmap.filename, NULL, machine);
|
|
|
|
|
|
|
|
if (dso && !dso->hit) {
|
|
|
|
dso->hit = 1;
|
|
|
|
dso__inject_build_id(dso, tool, machine, sample->cpumode, 0);
|
|
|
|
}
|
2021-05-24 22:50:50 +00:00
|
|
|
dso__put(dso);
|
2020-10-12 07:02:13 +00:00
|
|
|
|
|
|
|
return perf_event__repipe(tool, event, sample, machine);
|
|
|
|
}
|
|
|
|
|
2013-08-21 10:10:25 +00: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);
|
|
|
|
|
2021-05-24 22:50:51 +00:00
|
|
|
if (event->header.misc & PERF_RECORD_MISC_MMAP_BUILD_ID) {
|
|
|
|
struct dso *dso;
|
|
|
|
|
|
|
|
dso = findnew_dso(event->mmap2.pid, event->mmap2.tid,
|
|
|
|
event->mmap2.filename, NULL, machine);
|
|
|
|
if (dso) {
|
|
|
|
/* mark it not to inject build-id */
|
|
|
|
dso->hit = 1;
|
|
|
|
}
|
|
|
|
dso__put(dso);
|
|
|
|
}
|
|
|
|
|
2013-08-21 10:10:25 +00:00
|
|
|
return err;
|
|
|
|
}
|
|
|
|
|
2016-03-10 16:41:13 +00:00
|
|
|
#ifdef HAVE_JITDUMP
|
2015-11-30 09:02:21 +00: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 19:44:40 +00:00
|
|
|
int ret;
|
2015-11-30 09:02:21 +00:00
|
|
|
|
|
|
|
/*
|
|
|
|
* if jit marker, then inject jit mmaps and generate ELF images
|
|
|
|
*/
|
2016-03-07 19:44:40 +00:00
|
|
|
ret = jit_process(inject->session, &inject->output, machine,
|
2020-11-05 01:56:04 +00:00
|
|
|
event->mmap2.filename, event->mmap2.pid, event->mmap2.tid, &n);
|
2016-03-07 19:44:40 +00:00
|
|
|
if (ret < 0)
|
|
|
|
return ret;
|
|
|
|
if (ret) {
|
2015-11-30 09:02:21 +00:00
|
|
|
inject->bytes_written += n;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
return perf_event__repipe_mmap2(tool, event, sample, machine);
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2020-10-12 07:02:13 +00:00
|
|
|
static int perf_event__repipe_buildid_mmap2(struct perf_tool *tool,
|
|
|
|
union perf_event *event,
|
|
|
|
struct perf_sample *sample,
|
|
|
|
struct machine *machine)
|
|
|
|
{
|
|
|
|
struct dso_id dso_id = {
|
|
|
|
.maj = event->mmap2.maj,
|
|
|
|
.min = event->mmap2.min,
|
|
|
|
.ino = event->mmap2.ino,
|
|
|
|
.ino_generation = event->mmap2.ino_generation,
|
|
|
|
};
|
|
|
|
struct dso *dso;
|
|
|
|
|
2021-05-24 22:50:51 +00:00
|
|
|
if (event->header.misc & PERF_RECORD_MISC_MMAP_BUILD_ID) {
|
|
|
|
/* cannot use dso_id since it'd have invalid info */
|
|
|
|
dso = findnew_dso(event->mmap2.pid, event->mmap2.tid,
|
|
|
|
event->mmap2.filename, NULL, machine);
|
|
|
|
if (dso) {
|
|
|
|
/* mark it not to inject build-id */
|
|
|
|
dso->hit = 1;
|
|
|
|
}
|
|
|
|
dso__put(dso);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2020-10-12 07:02:13 +00:00
|
|
|
dso = findnew_dso(event->mmap2.pid, event->mmap2.tid,
|
|
|
|
event->mmap2.filename, &dso_id, machine);
|
|
|
|
|
|
|
|
if (dso && !dso->hit) {
|
|
|
|
dso->hit = 1;
|
|
|
|
dso__inject_build_id(dso, tool, machine, sample->cpumode,
|
|
|
|
event->mmap2.flags);
|
|
|
|
}
|
2021-05-24 22:50:50 +00:00
|
|
|
dso__put(dso);
|
2020-10-12 07:02:13 +00:00
|
|
|
|
|
|
|
perf_event__repipe(tool, event, sample, machine);
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2012-10-06 18:44:59 +00:00
|
|
|
static int perf_event__repipe_fork(struct perf_tool *tool,
|
2011-11-25 10:19:45 +00:00
|
|
|
union perf_event *event,
|
2011-01-29 16:01:45 +00:00
|
|
|
struct perf_sample *sample,
|
2011-11-28 09:56:39 +00:00
|
|
|
struct machine *machine)
|
2010-05-01 06:41:20 +00:00
|
|
|
{
|
|
|
|
int err;
|
|
|
|
|
2012-10-06 18:44:59 +00:00
|
|
|
err = perf_event__process_fork(tool, event, sample, machine);
|
2011-11-28 10:30:20 +00:00
|
|
|
perf_event__repipe(tool, event, sample, machine);
|
2010-05-01 06:41:20 +00:00
|
|
|
|
|
|
|
return err;
|
|
|
|
}
|
|
|
|
|
2015-04-09 15:54:00 +00: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 20:41:43 +00: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 15:54:00 +00: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;
|
|
|
|
}
|
|
|
|
|
2018-09-13 12:54:03 +00:00
|
|
|
static int perf_event__repipe_tracing_data(struct perf_session *session,
|
|
|
|
union perf_event *event)
|
2010-05-01 06:41:20 +00:00
|
|
|
{
|
2018-09-13 12:54:03 +00:00
|
|
|
perf_event__repipe_synth(session->tool, event);
|
2010-05-01 06:41:20 +00:00
|
|
|
|
2022-01-12 08:01:09 +00:00
|
|
|
return perf_event__process_tracing_data(session, event);
|
2010-05-01 06:41:20 +00:00
|
|
|
}
|
|
|
|
|
2013-10-22 22:01:31 +00:00
|
|
|
static int dso__read_build_id(struct dso *dso)
|
2010-05-01 06:41:20 +00:00
|
|
|
{
|
2020-10-12 07:02:11 +00:00
|
|
|
struct nscookie nsc;
|
|
|
|
|
2013-10-22 22:01:31 +00:00
|
|
|
if (dso->has_build_id)
|
2010-05-02 22:46:36 +00:00
|
|
|
return 0;
|
2010-05-01 06:41:20 +00:00
|
|
|
|
2020-10-12 07:02:11 +00:00
|
|
|
nsinfo__mountns_enter(dso->nsinfo, &nsc);
|
2020-10-13 19:24:34 +00:00
|
|
|
if (filename__read_build_id(dso->long_name, &dso->bid) > 0)
|
2013-10-22 22:01:31 +00:00
|
|
|
dso->has_build_id = true;
|
2022-02-02 07:08:27 +00:00
|
|
|
else if (dso->nsinfo) {
|
|
|
|
char *new_name;
|
|
|
|
|
|
|
|
new_name = filename_with_chroot(dso->nsinfo->pid,
|
|
|
|
dso->long_name);
|
|
|
|
if (new_name && filename__read_build_id(new_name, &dso->bid) > 0)
|
|
|
|
dso->has_build_id = true;
|
|
|
|
free(new_name);
|
|
|
|
}
|
2020-10-12 07:02:11 +00:00
|
|
|
nsinfo__mountns_exit(&nsc);
|
2010-05-01 06:41:20 +00:00
|
|
|
|
2020-10-12 07:02:11 +00:00
|
|
|
return dso->has_build_id ? 0 : -1;
|
2010-05-02 22:46:36 +00:00
|
|
|
}
|
2010-05-01 06:41:20 +00:00
|
|
|
|
2013-10-22 22:01:31 +00:00
|
|
|
static int dso__inject_build_id(struct dso *dso, struct perf_tool *tool,
|
perf inject: Do not load map/dso when injecting build-id
No need to load symbols in a DSO when injecting build-id. I guess the
reason was to check the DSO is a special file like anon files. Use some
helper functions in map.c to check them before reading build-id. Also
pass sample event's cpumode to a new build-id event.
It brought a speedup in the benchmark of 25 -> 21 msec on my laptop.
Also the memory usage (Max RSS) went down by ~200 KB.
# Running 'internals/inject-build-id' benchmark:
Average build-id injection took: 21.389 msec (+- 0.138 msec)
Average time per event: 2.097 usec (+- 0.014 usec)
Average memory usage: 8225 KB (+- 0 KB)
Committer notes:
Before:
$ perf stat -r5 perf bench internals inject-build-id > /dev/null
Performance counter stats for 'perf bench internals inject-build-id' (5 runs):
4,020.56 msec task-clock:u # 1.271 CPUs utilized ( +- 0.74% )
0 context-switches:u # 0.000 K/sec
0 cpu-migrations:u # 0.000 K/sec
123,354 page-faults:u # 0.031 M/sec ( +- 0.81% )
7,119,951,568 cycles:u # 1.771 GHz ( +- 1.74% ) (83.27%)
230,086,969 stalled-cycles-frontend:u # 3.23% frontend cycles idle ( +- 1.97% ) (83.41%)
1,168,298,765 stalled-cycles-backend:u # 16.41% backend cycles idle ( +- 1.13% ) (83.44%)
11,173,083,669 instructions:u # 1.57 insn per cycle
# 0.10 stalled cycles per insn ( +- 1.58% ) (83.31%)
2,413,908,936 branches:u # 600.392 M/sec ( +- 1.69% ) (83.26%)
46,576,289 branch-misses:u # 1.93% of all branches ( +- 2.20% ) (83.31%)
3.1638 +- 0.0309 seconds time elapsed ( +- 0.98% )
$
After:
$ perf stat -r5 perf bench internals inject-build-id > /dev/null
Performance counter stats for 'perf bench internals inject-build-id' (5 runs):
2,379.94 msec task-clock:u # 1.473 CPUs utilized ( +- 0.18% )
0 context-switches:u # 0.000 K/sec
0 cpu-migrations:u # 0.000 K/sec
62,584 page-faults:u # 0.026 M/sec ( +- 0.07% )
2,372,389,668 cycles:u # 0.997 GHz ( +- 0.29% ) (83.14%)
106,937,862 stalled-cycles-frontend:u # 4.51% frontend cycles idle ( +- 4.89% ) (83.20%)
581,697,915 stalled-cycles-backend:u # 24.52% backend cycles idle ( +- 0.71% ) (83.47%)
3,659,692,199 instructions:u # 1.54 insn per cycle
# 0.16 stalled cycles per insn ( +- 0.10% ) (83.63%)
791,372,961 branches:u # 332.518 M/sec ( +- 0.27% ) (83.39%)
10,648,083 branch-misses:u # 1.35% of all branches ( +- 0.22% ) (83.16%)
1.61570 +- 0.00172 seconds time elapsed ( +- 0.11% )
$
Signed-off-by: Namhyung Kim <namhyung@kernel.org>
Original-patch-by: Stephane Eranian <eranian@google.com>
Tested-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Acked-by: Jiri Olsa <jolsa@redhat.com>
Link: https://lore.kernel.org/r/20201012070214.2074921-5-namhyung@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2020-10-12 07:02:12 +00:00
|
|
|
struct machine *machine, u8 cpumode, u32 flags)
|
2010-05-02 22:46:36 +00:00
|
|
|
{
|
|
|
|
int err;
|
2010-05-01 06:41:20 +00:00
|
|
|
|
perf inject: Do not load map/dso when injecting build-id
No need to load symbols in a DSO when injecting build-id. I guess the
reason was to check the DSO is a special file like anon files. Use some
helper functions in map.c to check them before reading build-id. Also
pass sample event's cpumode to a new build-id event.
It brought a speedup in the benchmark of 25 -> 21 msec on my laptop.
Also the memory usage (Max RSS) went down by ~200 KB.
# Running 'internals/inject-build-id' benchmark:
Average build-id injection took: 21.389 msec (+- 0.138 msec)
Average time per event: 2.097 usec (+- 0.014 usec)
Average memory usage: 8225 KB (+- 0 KB)
Committer notes:
Before:
$ perf stat -r5 perf bench internals inject-build-id > /dev/null
Performance counter stats for 'perf bench internals inject-build-id' (5 runs):
4,020.56 msec task-clock:u # 1.271 CPUs utilized ( +- 0.74% )
0 context-switches:u # 0.000 K/sec
0 cpu-migrations:u # 0.000 K/sec
123,354 page-faults:u # 0.031 M/sec ( +- 0.81% )
7,119,951,568 cycles:u # 1.771 GHz ( +- 1.74% ) (83.27%)
230,086,969 stalled-cycles-frontend:u # 3.23% frontend cycles idle ( +- 1.97% ) (83.41%)
1,168,298,765 stalled-cycles-backend:u # 16.41% backend cycles idle ( +- 1.13% ) (83.44%)
11,173,083,669 instructions:u # 1.57 insn per cycle
# 0.10 stalled cycles per insn ( +- 1.58% ) (83.31%)
2,413,908,936 branches:u # 600.392 M/sec ( +- 1.69% ) (83.26%)
46,576,289 branch-misses:u # 1.93% of all branches ( +- 2.20% ) (83.31%)
3.1638 +- 0.0309 seconds time elapsed ( +- 0.98% )
$
After:
$ perf stat -r5 perf bench internals inject-build-id > /dev/null
Performance counter stats for 'perf bench internals inject-build-id' (5 runs):
2,379.94 msec task-clock:u # 1.473 CPUs utilized ( +- 0.18% )
0 context-switches:u # 0.000 K/sec
0 cpu-migrations:u # 0.000 K/sec
62,584 page-faults:u # 0.026 M/sec ( +- 0.07% )
2,372,389,668 cycles:u # 0.997 GHz ( +- 0.29% ) (83.14%)
106,937,862 stalled-cycles-frontend:u # 4.51% frontend cycles idle ( +- 4.89% ) (83.20%)
581,697,915 stalled-cycles-backend:u # 24.52% backend cycles idle ( +- 0.71% ) (83.47%)
3,659,692,199 instructions:u # 1.54 insn per cycle
# 0.16 stalled cycles per insn ( +- 0.10% ) (83.63%)
791,372,961 branches:u # 332.518 M/sec ( +- 0.27% ) (83.39%)
10,648,083 branch-misses:u # 1.35% of all branches ( +- 0.22% ) (83.16%)
1.61570 +- 0.00172 seconds time elapsed ( +- 0.11% )
$
Signed-off-by: Namhyung Kim <namhyung@kernel.org>
Original-patch-by: Stephane Eranian <eranian@google.com>
Tested-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Acked-by: Jiri Olsa <jolsa@redhat.com>
Link: https://lore.kernel.org/r/20201012070214.2074921-5-namhyung@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2020-10-12 07:02:12 +00:00
|
|
|
if (is_anon_memory(dso->long_name) || flags & MAP_HUGETLB)
|
|
|
|
return 0;
|
|
|
|
if (is_no_dso_memory(dso->long_name))
|
|
|
|
return 0;
|
|
|
|
|
2013-10-22 22:01:31 +00:00
|
|
|
if (dso__read_build_id(dso) < 0) {
|
|
|
|
pr_debug("no build_id found for %s\n", dso->long_name);
|
2010-05-02 22:46:36 +00:00
|
|
|
return -1;
|
|
|
|
}
|
2010-05-01 06:41:20 +00:00
|
|
|
|
perf inject: Do not load map/dso when injecting build-id
No need to load symbols in a DSO when injecting build-id. I guess the
reason was to check the DSO is a special file like anon files. Use some
helper functions in map.c to check them before reading build-id. Also
pass sample event's cpumode to a new build-id event.
It brought a speedup in the benchmark of 25 -> 21 msec on my laptop.
Also the memory usage (Max RSS) went down by ~200 KB.
# Running 'internals/inject-build-id' benchmark:
Average build-id injection took: 21.389 msec (+- 0.138 msec)
Average time per event: 2.097 usec (+- 0.014 usec)
Average memory usage: 8225 KB (+- 0 KB)
Committer notes:
Before:
$ perf stat -r5 perf bench internals inject-build-id > /dev/null
Performance counter stats for 'perf bench internals inject-build-id' (5 runs):
4,020.56 msec task-clock:u # 1.271 CPUs utilized ( +- 0.74% )
0 context-switches:u # 0.000 K/sec
0 cpu-migrations:u # 0.000 K/sec
123,354 page-faults:u # 0.031 M/sec ( +- 0.81% )
7,119,951,568 cycles:u # 1.771 GHz ( +- 1.74% ) (83.27%)
230,086,969 stalled-cycles-frontend:u # 3.23% frontend cycles idle ( +- 1.97% ) (83.41%)
1,168,298,765 stalled-cycles-backend:u # 16.41% backend cycles idle ( +- 1.13% ) (83.44%)
11,173,083,669 instructions:u # 1.57 insn per cycle
# 0.10 stalled cycles per insn ( +- 1.58% ) (83.31%)
2,413,908,936 branches:u # 600.392 M/sec ( +- 1.69% ) (83.26%)
46,576,289 branch-misses:u # 1.93% of all branches ( +- 2.20% ) (83.31%)
3.1638 +- 0.0309 seconds time elapsed ( +- 0.98% )
$
After:
$ perf stat -r5 perf bench internals inject-build-id > /dev/null
Performance counter stats for 'perf bench internals inject-build-id' (5 runs):
2,379.94 msec task-clock:u # 1.473 CPUs utilized ( +- 0.18% )
0 context-switches:u # 0.000 K/sec
0 cpu-migrations:u # 0.000 K/sec
62,584 page-faults:u # 0.026 M/sec ( +- 0.07% )
2,372,389,668 cycles:u # 0.997 GHz ( +- 0.29% ) (83.14%)
106,937,862 stalled-cycles-frontend:u # 4.51% frontend cycles idle ( +- 4.89% ) (83.20%)
581,697,915 stalled-cycles-backend:u # 24.52% backend cycles idle ( +- 0.71% ) (83.47%)
3,659,692,199 instructions:u # 1.54 insn per cycle
# 0.16 stalled cycles per insn ( +- 0.10% ) (83.63%)
791,372,961 branches:u # 332.518 M/sec ( +- 0.27% ) (83.39%)
10,648,083 branch-misses:u # 1.35% of all branches ( +- 0.22% ) (83.16%)
1.61570 +- 0.00172 seconds time elapsed ( +- 0.11% )
$
Signed-off-by: Namhyung Kim <namhyung@kernel.org>
Original-patch-by: Stephane Eranian <eranian@google.com>
Tested-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Acked-by: Jiri Olsa <jolsa@redhat.com>
Link: https://lore.kernel.org/r/20201012070214.2074921-5-namhyung@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2020-10-12 07:02:12 +00:00
|
|
|
err = perf_event__synthesize_build_id(tool, dso, cpumode,
|
|
|
|
perf_event__repipe, machine);
|
2010-05-02 22:46:36 +00:00
|
|
|
if (err) {
|
2013-10-22 22:01:31 +00:00
|
|
|
pr_err("Can't synthesize build_id event for %s\n", dso->long_name);
|
2010-05-01 06:41:20 +00:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
perf bench: Add build-id injection benchmark
Sometimes I can see that 'perf record' piped with 'perf inject' take a
long time processing build-ids.
So introduce a inject-build-id benchmark to the internals benchmark
suite to measure its overhead regularly.
It runs the 'perf inject' command internally and feeds the given number
of synthesized events (MMAP2 + SAMPLE basically).
Usage: perf bench internals inject-build-id <options>
-i, --iterations <n> Number of iterations used to compute average (default: 100)
-m, --nr-mmaps <n> Number of mmap events for each iteration (default: 100)
-n, --nr-samples <n> Number of sample events per mmap event (default: 100)
-v, --verbose be more verbose (show iteration count, DSO name, etc)
By default, it measures average processing time of 100 MMAP2 events
and 10000 SAMPLE events. Below is a result on my laptop.
$ perf bench internals inject-build-id
# Running 'internals/inject-build-id' benchmark:
Average build-id injection took: 25.789 msec (+- 0.202 msec)
Average time per event: 2.528 usec (+- 0.020 usec)
Average memory usage: 8411 KB (+- 7 KB)
Committer testing:
$ perf bench
Usage:
perf bench [<common options>] <collection> <benchmark> [<options>]
# List of all available benchmark collections:
sched: Scheduler and IPC benchmarks
syscall: System call benchmarks
mem: Memory access benchmarks
numa: NUMA scheduling and MM benchmarks
futex: Futex stressing benchmarks
epoll: Epoll stressing benchmarks
internals: Perf-internals benchmarks
all: All benchmarks
$ perf bench internals
# List of available benchmarks for collection 'internals':
synthesize: Benchmark perf event synthesis
kallsyms-parse: Benchmark kallsyms parsing
inject-build-id: Benchmark build-id injection
$ perf bench internals inject-build-id
# Running 'internals/inject-build-id' benchmark:
Average build-id injection took: 14.202 msec (+- 0.059 msec)
Average time per event: 1.392 usec (+- 0.006 usec)
Average memory usage: 12650 KB (+- 10 KB)
Average build-id-all injection took: 12.831 msec (+- 0.071 msec)
Average time per event: 1.258 usec (+- 0.007 usec)
Average memory usage: 11895 KB (+- 10 KB)
$
$ perf stat -r5 perf bench internals inject-build-id
# Running 'internals/inject-build-id' benchmark:
Average build-id injection took: 14.380 msec (+- 0.056 msec)
Average time per event: 1.410 usec (+- 0.006 usec)
Average memory usage: 12608 KB (+- 11 KB)
Average build-id-all injection took: 11.889 msec (+- 0.064 msec)
Average time per event: 1.166 usec (+- 0.006 usec)
Average memory usage: 11838 KB (+- 10 KB)
# Running 'internals/inject-build-id' benchmark:
Average build-id injection took: 14.246 msec (+- 0.065 msec)
Average time per event: 1.397 usec (+- 0.006 usec)
Average memory usage: 12744 KB (+- 10 KB)
Average build-id-all injection took: 12.019 msec (+- 0.066 msec)
Average time per event: 1.178 usec (+- 0.006 usec)
Average memory usage: 11963 KB (+- 10 KB)
# Running 'internals/inject-build-id' benchmark:
Average build-id injection took: 14.321 msec (+- 0.067 msec)
Average time per event: 1.404 usec (+- 0.007 usec)
Average memory usage: 12690 KB (+- 10 KB)
Average build-id-all injection took: 11.909 msec (+- 0.041 msec)
Average time per event: 1.168 usec (+- 0.004 usec)
Average memory usage: 11938 KB (+- 10 KB)
# Running 'internals/inject-build-id' benchmark:
Average build-id injection took: 14.287 msec (+- 0.059 msec)
Average time per event: 1.401 usec (+- 0.006 usec)
Average memory usage: 12864 KB (+- 10 KB)
Average build-id-all injection took: 11.862 msec (+- 0.058 msec)
Average time per event: 1.163 usec (+- 0.006 usec)
Average memory usage: 12103 KB (+- 10 KB)
# Running 'internals/inject-build-id' benchmark:
Average build-id injection took: 14.402 msec (+- 0.053 msec)
Average time per event: 1.412 usec (+- 0.005 usec)
Average memory usage: 12876 KB (+- 10 KB)
Average build-id-all injection took: 11.826 msec (+- 0.061 msec)
Average time per event: 1.159 usec (+- 0.006 usec)
Average memory usage: 12111 KB (+- 10 KB)
Performance counter stats for 'perf bench internals inject-build-id' (5 runs):
4,267.48 msec task-clock:u # 1.502 CPUs utilized ( +- 0.14% )
0 context-switches:u # 0.000 K/sec
0 cpu-migrations:u # 0.000 K/sec
102,092 page-faults:u # 0.024 M/sec ( +- 0.08% )
3,894,589,578 cycles:u # 0.913 GHz ( +- 0.19% ) (83.49%)
140,078,421 stalled-cycles-frontend:u # 3.60% frontend cycles idle ( +- 0.77% ) (83.34%)
948,581,189 stalled-cycles-backend:u # 24.36% backend cycles idle ( +- 0.46% ) (83.25%)
5,835,587,719 instructions:u # 1.50 insn per cycle
# 0.16 stalled cycles per insn ( +- 0.21% ) (83.24%)
1,267,423,636 branches:u # 296.996 M/sec ( +- 0.22% ) (83.12%)
17,484,290 branch-misses:u # 1.38% of all branches ( +- 0.12% ) (83.55%)
2.84176 +- 0.00222 seconds time elapsed ( +- 0.08% )
$
Acked-by: Jiri Olsa <jolsa@redhat.com>
Tested-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: Namhyung Kim <namhyung@kernel.org>
Link: https://lore.kernel.org/r/20201012070214.2074921-2-namhyung@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2020-10-12 07:02:09 +00:00
|
|
|
int perf_event__inject_buildid(struct perf_tool *tool, union perf_event *event,
|
|
|
|
struct perf_sample *sample,
|
|
|
|
struct evsel *evsel __maybe_unused,
|
|
|
|
struct machine *machine)
|
2010-05-01 06:41:20 +00:00
|
|
|
{
|
|
|
|
struct addr_location al;
|
|
|
|
struct thread *thread;
|
|
|
|
|
2014-05-12 00:56:42 +00:00
|
|
|
thread = machine__findnew_thread(machine, sample->pid, sample->tid);
|
2010-05-01 06:41:20 +00:00
|
|
|
if (thread == NULL) {
|
|
|
|
pr_err("problem processing %d event, skipping it.\n",
|
|
|
|
event->header.type);
|
|
|
|
goto repipe;
|
|
|
|
}
|
|
|
|
|
2018-04-24 14:58:56 +00:00
|
|
|
if (thread__find_map(thread, sample->cpumode, sample->ip, &al)) {
|
2010-05-01 06:41:20 +00:00
|
|
|
if (!al.map->dso->hit) {
|
|
|
|
al.map->dso->hit = 1;
|
perf inject: Do not load map/dso when injecting build-id
No need to load symbols in a DSO when injecting build-id. I guess the
reason was to check the DSO is a special file like anon files. Use some
helper functions in map.c to check them before reading build-id. Also
pass sample event's cpumode to a new build-id event.
It brought a speedup in the benchmark of 25 -> 21 msec on my laptop.
Also the memory usage (Max RSS) went down by ~200 KB.
# Running 'internals/inject-build-id' benchmark:
Average build-id injection took: 21.389 msec (+- 0.138 msec)
Average time per event: 2.097 usec (+- 0.014 usec)
Average memory usage: 8225 KB (+- 0 KB)
Committer notes:
Before:
$ perf stat -r5 perf bench internals inject-build-id > /dev/null
Performance counter stats for 'perf bench internals inject-build-id' (5 runs):
4,020.56 msec task-clock:u # 1.271 CPUs utilized ( +- 0.74% )
0 context-switches:u # 0.000 K/sec
0 cpu-migrations:u # 0.000 K/sec
123,354 page-faults:u # 0.031 M/sec ( +- 0.81% )
7,119,951,568 cycles:u # 1.771 GHz ( +- 1.74% ) (83.27%)
230,086,969 stalled-cycles-frontend:u # 3.23% frontend cycles idle ( +- 1.97% ) (83.41%)
1,168,298,765 stalled-cycles-backend:u # 16.41% backend cycles idle ( +- 1.13% ) (83.44%)
11,173,083,669 instructions:u # 1.57 insn per cycle
# 0.10 stalled cycles per insn ( +- 1.58% ) (83.31%)
2,413,908,936 branches:u # 600.392 M/sec ( +- 1.69% ) (83.26%)
46,576,289 branch-misses:u # 1.93% of all branches ( +- 2.20% ) (83.31%)
3.1638 +- 0.0309 seconds time elapsed ( +- 0.98% )
$
After:
$ perf stat -r5 perf bench internals inject-build-id > /dev/null
Performance counter stats for 'perf bench internals inject-build-id' (5 runs):
2,379.94 msec task-clock:u # 1.473 CPUs utilized ( +- 0.18% )
0 context-switches:u # 0.000 K/sec
0 cpu-migrations:u # 0.000 K/sec
62,584 page-faults:u # 0.026 M/sec ( +- 0.07% )
2,372,389,668 cycles:u # 0.997 GHz ( +- 0.29% ) (83.14%)
106,937,862 stalled-cycles-frontend:u # 4.51% frontend cycles idle ( +- 4.89% ) (83.20%)
581,697,915 stalled-cycles-backend:u # 24.52% backend cycles idle ( +- 0.71% ) (83.47%)
3,659,692,199 instructions:u # 1.54 insn per cycle
# 0.16 stalled cycles per insn ( +- 0.10% ) (83.63%)
791,372,961 branches:u # 332.518 M/sec ( +- 0.27% ) (83.39%)
10,648,083 branch-misses:u # 1.35% of all branches ( +- 0.22% ) (83.16%)
1.61570 +- 0.00172 seconds time elapsed ( +- 0.11% )
$
Signed-off-by: Namhyung Kim <namhyung@kernel.org>
Original-patch-by: Stephane Eranian <eranian@google.com>
Tested-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Acked-by: Jiri Olsa <jolsa@redhat.com>
Link: https://lore.kernel.org/r/20201012070214.2074921-5-namhyung@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2020-10-12 07:02:12 +00:00
|
|
|
dso__inject_build_id(al.map->dso, tool, machine,
|
|
|
|
sample->cpumode, al.map->flags);
|
2010-05-01 06:41:20 +00: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 23:43:22 +00:00
|
|
|
thread__put(thread);
|
2010-05-01 06:41:20 +00:00
|
|
|
repipe:
|
2011-11-28 10:30:20 +00:00
|
|
|
perf_event__repipe(tool, event, sample, machine);
|
2010-05-02 22:46:36 +00:00
|
|
|
return 0;
|
2010-05-01 06:41:20 +00:00
|
|
|
}
|
|
|
|
|
2012-08-07 12:56:04 +00:00
|
|
|
static int perf_inject__sched_process_exit(struct perf_tool *tool,
|
|
|
|
union perf_event *event __maybe_unused,
|
|
|
|
struct perf_sample *sample,
|
2019-07-21 11:23:51 +00:00
|
|
|
struct evsel *evsel __maybe_unused,
|
2012-08-07 12:56:04 +00:00
|
|
|
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,
|
2019-07-21 11:23:51 +00:00
|
|
|
struct evsel *evsel,
|
2012-08-07 12:56:04 +00:00
|
|
|
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,
|
2019-07-21 11:23:51 +00:00
|
|
|
struct evsel *evsel,
|
2012-08-07 12:56:04 +00:00
|
|
|
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);
|
2020-04-29 19:26:57 +00:00
|
|
|
u32 pid = evsel__intval(evsel, sample, "pid");
|
2012-08-07 12:56:04 +00:00
|
|
|
|
|
|
|
list_for_each_entry(ent, &inject->samples, node) {
|
|
|
|
if (pid == ent->tid)
|
|
|
|
goto found;
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
found:
|
|
|
|
event_sw = &ent->event[0];
|
2020-04-30 14:03:49 +00:00
|
|
|
evsel__parse_sample(evsel, event_sw, &sample_sw);
|
2012-08-07 12:56:04 +00:00
|
|
|
|
|
|
|
sample_sw.period = sample->period;
|
|
|
|
sample_sw.time = sample->time;
|
2019-07-21 11:24:29 +00:00
|
|
|
perf_event__synthesize_sample(event_sw, evsel->core.attr.sample_type,
|
|
|
|
evsel->core.attr.read_format, &sample_sw);
|
2012-08-07 12:56:05 +00:00
|
|
|
build_id__mark_dso_hit(tool, event_sw, &sample_sw, evsel, machine);
|
2012-08-07 12:56:04 +00:00
|
|
|
return perf_event__repipe(tool, event_sw, &sample_sw, machine);
|
|
|
|
}
|
|
|
|
|
2012-09-10 22:15:03 +00:00
|
|
|
static void sig_handler(int sig __maybe_unused)
|
2010-05-01 06:41:20 +00:00
|
|
|
{
|
|
|
|
session_done = 1;
|
|
|
|
}
|
|
|
|
|
2020-05-04 16:57:44 +00:00
|
|
|
static int evsel__check_stype(struct evsel *evsel, u64 sample_type, const char *sample_msg)
|
2012-08-07 12:56:04 +00:00
|
|
|
{
|
2019-07-21 11:24:29 +00:00
|
|
|
struct perf_event_attr *attr = &evsel->core.attr;
|
2020-04-29 19:07:09 +00:00
|
|
|
const char *name = evsel__name(evsel);
|
2012-08-07 12:56:04 +00:00
|
|
|
|
|
|
|
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 13:15:55 +00:00
|
|
|
static int drop_sample(struct perf_tool *tool __maybe_unused,
|
|
|
|
union perf_event *event __maybe_unused,
|
|
|
|
struct perf_sample *sample __maybe_unused,
|
2019-07-21 11:23:51 +00:00
|
|
|
struct evsel *evsel __maybe_unused,
|
2015-09-25 13:15:55 +00:00
|
|
|
struct machine *machine __maybe_unused)
|
|
|
|
{
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void strip_init(struct perf_inject *inject)
|
|
|
|
{
|
2019-07-21 11:23:52 +00:00
|
|
|
struct evlist *evlist = inject->session->evlist;
|
2019-07-21 11:23:51 +00:00
|
|
|
struct evsel *evsel;
|
2015-09-25 13:15:55 +00:00
|
|
|
|
|
|
|
inject->tool.context_switch = perf_event__drop;
|
|
|
|
|
2016-06-23 14:26:15 +00:00
|
|
|
evlist__for_each_entry(evlist, evsel)
|
2015-09-25 13:15:55 +00:00
|
|
|
evsel->handler = drop_sample;
|
|
|
|
}
|
|
|
|
|
2021-04-30 07:03:02 +00:00
|
|
|
static int parse_vm_time_correlation(const struct option *opt, const char *str, int unset)
|
|
|
|
{
|
|
|
|
struct perf_inject *inject = opt->value;
|
|
|
|
const char *args;
|
|
|
|
char *dry_run;
|
|
|
|
|
|
|
|
if (unset)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
inject->itrace_synth_opts.set = true;
|
|
|
|
inject->itrace_synth_opts.vm_time_correlation = true;
|
|
|
|
inject->in_place_update = true;
|
|
|
|
|
|
|
|
if (!str)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
dry_run = skip_spaces(str);
|
|
|
|
if (!strncmp(dry_run, "dry-run", strlen("dry-run"))) {
|
|
|
|
inject->itrace_synth_opts.vm_tm_corr_dry_run = true;
|
|
|
|
inject->in_place_update_dry_run = true;
|
|
|
|
args = dry_run + strlen("dry-run");
|
|
|
|
} else {
|
|
|
|
args = str;
|
|
|
|
}
|
|
|
|
|
|
|
|
inject->itrace_synth_opts.vm_tm_corr_args = strdup(args);
|
|
|
|
|
|
|
|
return inject->itrace_synth_opts.vm_tm_corr_args ? 0 : -ENOMEM;
|
|
|
|
}
|
|
|
|
|
2022-05-20 13:24:02 +00:00
|
|
|
static int save_section_info_cb(struct perf_file_section *section,
|
|
|
|
struct perf_header *ph __maybe_unused,
|
|
|
|
int feat, int fd __maybe_unused, void *data)
|
|
|
|
{
|
|
|
|
struct perf_inject *inject = data;
|
|
|
|
|
|
|
|
inject->secs[feat] = *section;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int save_section_info(struct perf_inject *inject)
|
|
|
|
{
|
|
|
|
struct perf_header *header = &inject->session->header;
|
|
|
|
int fd = perf_data__fd(inject->session->data);
|
|
|
|
|
|
|
|
return perf_header__process_sections(header, fd, inject, save_section_info_cb);
|
|
|
|
}
|
|
|
|
|
|
|
|
static bool keep_feat(int feat)
|
|
|
|
{
|
|
|
|
switch (feat) {
|
|
|
|
/* Keep original information that describes the machine or software */
|
|
|
|
case HEADER_TRACING_DATA:
|
|
|
|
case HEADER_HOSTNAME:
|
|
|
|
case HEADER_OSRELEASE:
|
|
|
|
case HEADER_VERSION:
|
|
|
|
case HEADER_ARCH:
|
|
|
|
case HEADER_NRCPUS:
|
|
|
|
case HEADER_CPUDESC:
|
|
|
|
case HEADER_CPUID:
|
|
|
|
case HEADER_TOTAL_MEM:
|
|
|
|
case HEADER_CPU_TOPOLOGY:
|
|
|
|
case HEADER_NUMA_TOPOLOGY:
|
|
|
|
case HEADER_PMU_MAPPINGS:
|
|
|
|
case HEADER_CACHE:
|
|
|
|
case HEADER_MEM_TOPOLOGY:
|
|
|
|
case HEADER_CLOCKID:
|
|
|
|
case HEADER_BPF_PROG_INFO:
|
|
|
|
case HEADER_BPF_BTF:
|
|
|
|
case HEADER_CPU_PMU_CAPS:
|
|
|
|
case HEADER_CLOCK_DATA:
|
|
|
|
case HEADER_HYBRID_TOPOLOGY:
|
|
|
|
case HEADER_HYBRID_CPU_PMU_CAPS:
|
|
|
|
return true;
|
|
|
|
/* Information that can be updated */
|
|
|
|
case HEADER_BUILD_ID:
|
|
|
|
case HEADER_CMDLINE:
|
|
|
|
case HEADER_EVENT_DESC:
|
|
|
|
case HEADER_BRANCH_STACK:
|
|
|
|
case HEADER_GROUP_DESC:
|
|
|
|
case HEADER_AUXTRACE:
|
|
|
|
case HEADER_STAT:
|
|
|
|
case HEADER_SAMPLE_TIME:
|
|
|
|
case HEADER_DIR_FORMAT:
|
|
|
|
case HEADER_COMPRESSED:
|
|
|
|
default:
|
|
|
|
return false;
|
|
|
|
};
|
|
|
|
}
|
|
|
|
|
|
|
|
static int read_file(int fd, u64 offs, void *buf, size_t sz)
|
|
|
|
{
|
|
|
|
ssize_t ret = preadn(fd, buf, sz, offs);
|
|
|
|
|
|
|
|
if (ret < 0)
|
|
|
|
return -errno;
|
|
|
|
if ((size_t)ret != sz)
|
|
|
|
return -EINVAL;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int feat_copy(struct perf_inject *inject, int feat, struct feat_writer *fw)
|
|
|
|
{
|
|
|
|
int fd = perf_data__fd(inject->session->data);
|
|
|
|
u64 offs = inject->secs[feat].offset;
|
|
|
|
size_t sz = inject->secs[feat].size;
|
|
|
|
void *buf = malloc(sz);
|
|
|
|
int ret;
|
|
|
|
|
|
|
|
if (!buf)
|
|
|
|
return -ENOMEM;
|
|
|
|
|
|
|
|
ret = read_file(fd, offs, buf, sz);
|
|
|
|
if (ret)
|
|
|
|
goto out_free;
|
|
|
|
|
|
|
|
ret = fw->write(fw, buf, sz);
|
|
|
|
out_free:
|
|
|
|
free(buf);
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
struct inject_fc {
|
|
|
|
struct feat_copier fc;
|
|
|
|
struct perf_inject *inject;
|
|
|
|
};
|
|
|
|
|
|
|
|
static int feat_copy_cb(struct feat_copier *fc, int feat, struct feat_writer *fw)
|
|
|
|
{
|
|
|
|
struct inject_fc *inj_fc = container_of(fc, struct inject_fc, fc);
|
|
|
|
struct perf_inject *inject = inj_fc->inject;
|
|
|
|
int ret;
|
|
|
|
|
|
|
|
if (!inject->secs[feat].offset ||
|
|
|
|
!keep_feat(feat))
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
ret = feat_copy(inject, feat, fw);
|
|
|
|
if (ret < 0)
|
|
|
|
return ret;
|
|
|
|
|
|
|
|
return 1; /* Feature section copied */
|
|
|
|
}
|
|
|
|
|
2022-05-20 13:24:04 +00:00
|
|
|
static int copy_kcore_dir(struct perf_inject *inject)
|
|
|
|
{
|
|
|
|
char *cmd;
|
|
|
|
int ret;
|
|
|
|
|
|
|
|
ret = asprintf(&cmd, "cp -r -n %s/kcore_dir* %s >/dev/null 2>&1",
|
|
|
|
inject->input_name, inject->output.path);
|
|
|
|
if (ret < 0)
|
|
|
|
return ret;
|
|
|
|
pr_debug("%s\n", cmd);
|
2022-06-20 10:39:04 +00:00
|
|
|
ret = system(cmd);
|
|
|
|
free(cmd);
|
|
|
|
return ret;
|
2022-05-20 13:24:04 +00:00
|
|
|
}
|
|
|
|
|
2021-12-13 08:48:29 +00:00
|
|
|
static int output_fd(struct perf_inject *inject)
|
|
|
|
{
|
|
|
|
return inject->in_place_update ? -1 : perf_data__fd(&inject->output);
|
|
|
|
}
|
|
|
|
|
2012-09-30 22:54:10 +00:00
|
|
|
static int __cmd_inject(struct perf_inject *inject)
|
2010-05-01 06:41:20 +00:00
|
|
|
{
|
|
|
|
int ret = -EINVAL;
|
2014-08-12 06:40:37 +00:00
|
|
|
struct perf_session *session = inject->session;
|
2021-12-13 08:48:29 +00:00
|
|
|
int fd = output_fd(inject);
|
2015-04-09 15:54:00 +00:00
|
|
|
u64 output_data_offset;
|
2010-05-01 06:41:20 +00:00
|
|
|
|
|
|
|
signal(SIGINT, sig_handler);
|
|
|
|
|
2015-04-09 15:54:00 +00:00
|
|
|
if (inject->build_ids || inject->sched_stat ||
|
2020-10-12 07:02:13 +00:00
|
|
|
inject->itrace_synth_opts.set || inject->build_id_all) {
|
2012-09-30 22:54:10 +00:00
|
|
|
inject->tool.mmap = perf_event__repipe_mmap;
|
2013-08-21 10:10:25 +00:00
|
|
|
inject->tool.mmap2 = perf_event__repipe_mmap2;
|
2012-10-06 18:44:59 +00:00
|
|
|
inject->tool.fork = perf_event__repipe_fork;
|
2012-09-30 22:54:10 +00:00
|
|
|
inject->tool.tracing_data = perf_event__repipe_tracing_data;
|
2010-05-01 06:41:20 +00:00
|
|
|
}
|
|
|
|
|
2022-06-21 15:27:25 +00:00
|
|
|
output_data_offset = perf_session__data_offset(session->evlist);
|
2015-04-09 15:54:00 +00:00
|
|
|
|
2020-10-12 07:02:13 +00:00
|
|
|
if (inject->build_id_all) {
|
|
|
|
inject->tool.mmap = perf_event__repipe_buildid_mmap;
|
|
|
|
inject->tool.mmap2 = perf_event__repipe_buildid_mmap2;
|
|
|
|
} else if (inject->build_ids) {
|
2012-08-07 12:56:05 +00:00
|
|
|
inject->tool.sample = perf_event__inject_buildid;
|
|
|
|
} else if (inject->sched_stat) {
|
2019-07-21 11:23:51 +00:00
|
|
|
struct evsel *evsel;
|
2012-08-07 12:56:04 +00:00
|
|
|
|
2016-06-23 14:26:15 +00:00
|
|
|
evlist__for_each_entry(session->evlist, evsel) {
|
2020-04-29 19:07:09 +00:00
|
|
|
const char *name = evsel__name(evsel);
|
2012-08-07 12:56:04 +00:00
|
|
|
|
|
|
|
if (!strcmp(name, "sched:sched_switch")) {
|
2020-05-04 16:57:44 +00:00
|
|
|
if (evsel__check_stype(evsel, PERF_SAMPLE_TID, "TID"))
|
2012-08-07 12:56:04 +00:00
|
|
|
return -EINVAL;
|
|
|
|
|
2013-11-06 13:17:38 +00:00
|
|
|
evsel->handler = perf_inject__sched_switch;
|
2012-08-07 12:56:04 +00:00
|
|
|
} else if (!strcmp(name, "sched:sched_process_exit"))
|
2013-11-06 13:17:38 +00:00
|
|
|
evsel->handler = perf_inject__sched_process_exit;
|
2012-08-07 12:56:04 +00:00
|
|
|
else if (!strncmp(name, "sched:sched_stat_", 17))
|
2013-11-06 13:17:38 +00:00
|
|
|
evsel->handler = perf_inject__sched_stat;
|
2012-08-07 12:56:04 +00:00
|
|
|
}
|
2021-04-30 07:03:02 +00:00
|
|
|
} else if (inject->itrace_synth_opts.vm_time_correlation) {
|
|
|
|
session->itrace_synth_opts = &inject->itrace_synth_opts;
|
|
|
|
memset(&inject->tool, 0, sizeof(inject->tool));
|
|
|
|
inject->tool.id_index = perf_event__process_id_index;
|
|
|
|
inject->tool.auxtrace_info = perf_event__process_auxtrace_info;
|
|
|
|
inject->tool.auxtrace = perf_event__process_auxtrace;
|
|
|
|
inject->tool.auxtrace_error = perf_event__process_auxtrace_error;
|
|
|
|
inject->tool.ordered_events = true;
|
|
|
|
inject->tool.ordering_requires_timestamps = true;
|
2015-04-09 15:54:00 +00: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 20:41:43 +00:00
|
|
|
inject->tool.namespaces = perf_event__repipe_namespaces;
|
2015-04-09 15:54:00 +00:00
|
|
|
inject->tool.exit = perf_event__repipe_exit;
|
2019-12-04 12:08:00 +00:00
|
|
|
inject->tool.id_index = perf_event__process_id_index;
|
2015-04-09 15:54:00 +00:00
|
|
|
inject->tool.auxtrace_info = perf_event__process_auxtrace_info;
|
|
|
|
inject->tool.auxtrace = perf_event__process_auxtrace;
|
2015-09-25 13:15:54 +00:00
|
|
|
inject->tool.aux = perf_event__drop_aux;
|
2021-09-07 16:39:02 +00:00
|
|
|
inject->tool.itrace_start = perf_event__drop_aux;
|
|
|
|
inject->tool.aux_output_hw_id = perf_event__drop_aux;
|
2015-04-09 15:54:00 +00:00
|
|
|
inject->tool.ordered_events = true;
|
|
|
|
inject->tool.ordering_requires_timestamps = true;
|
|
|
|
/* Allow space in the header for new attributes */
|
2021-11-25 07:14:57 +00:00
|
|
|
output_data_offset = roundup(8192 + session->header.data_offset, 4096);
|
2015-09-25 13:15:55 +00:00
|
|
|
if (inject->strip)
|
|
|
|
strip_init(inject);
|
2012-08-07 12:56:04 +00:00
|
|
|
}
|
|
|
|
|
2015-04-30 14:37:25 +00:00
|
|
|
if (!inject->itrace_synth_opts.set)
|
|
|
|
auxtrace_index__free(&session->auxtrace_index);
|
|
|
|
|
2021-07-19 22:31:51 +00:00
|
|
|
if (!inject->is_pipe && !inject->in_place_update)
|
2015-04-09 15:54:00 +00:00
|
|
|
lseek(fd, output_data_offset, SEEK_SET);
|
2012-08-07 12:56:02 +00:00
|
|
|
|
2015-03-03 14:58:45 +00:00
|
|
|
ret = perf_session__process_events(session);
|
2017-04-10 20:14:26 +00:00
|
|
|
if (ret)
|
|
|
|
return ret;
|
2010-05-01 06:41:20 +00:00
|
|
|
|
2021-07-19 22:31:51 +00:00
|
|
|
if (!inject->is_pipe && !inject->in_place_update) {
|
2022-05-20 13:24:02 +00:00
|
|
|
struct inject_fc inj_fc = {
|
|
|
|
.fc.copy = feat_copy_cb,
|
|
|
|
.inject = inject,
|
|
|
|
};
|
|
|
|
|
2016-03-07 19:44:38 +00:00
|
|
|
if (inject->build_ids)
|
2014-07-14 10:02:34 +00:00
|
|
|
perf_header__set_feat(&session->header,
|
|
|
|
HEADER_BUILD_ID);
|
2016-03-07 19:44:38 +00: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 15:54:00 +00:00
|
|
|
/*
|
|
|
|
* The AUX areas have been removed and replaced with
|
perf inject: Fix file corruption due to event deletion
"perf inject" can create corrupt files when synthesizing sample events from AUX
data. This happens when in the input file, the first event (for the AUX data)
has a different sample_type from the second event (generally dummy).
Specifically, they differ in the bits that indicate the standard fields
appended to perf records in the mmap buffer. "perf inject" deletes the first
event and moves up the second event to first position.
The problem is with the synthetic PERF_RECORD_MMAP (etc.) events created
by "perf record".
Since these are synthetic versions of events which are normally produced
by the kernel, they have to have the standard fields appended as
described by sample_type.
"perf record" fills these in with zeroes, including the IDENTIFIER
field; perf readers interpret records with zero IDENTIFIER using the
descriptor for the first event in the file.
Since "perf inject" changes the first event, these synthetic records are
then processed with the wrong value of sample_type, and the perf reader
reads bad data, reports on incorrect length records etc.
Mismatching sample_types are seen with "perf record -e cs_etm//", where the AUX
event has TID|TIME|CPU|IDENTIFIER and the dummy event has TID|TIME|IDENTIFIER.
Perhaps they could be the same, but it isn't normally a problem if they aren't
- perf has no problems reading the file.
The sample_types have to agree on the position of IDENTIFIER, because
that's how perf finds the right event descriptor in the first place, but
they don't normally have to agree on other fields, and perf doesn't
check that they do.
The problem is specific to the way "perf inject" reorganizes the events
and the way synthetic MMAP events are recorded with a zero identifier. A
simple solution is to stop "perf inject" deleting the tracing event.
Committer testing
Removed the now unused 'evsel' variable, update the comment about the
evsel removal not being performed anymore, and apply the patch manually
as it failed with this warning:
warning: Patch sent with format=flowed; space at the end of lines might be lost.
Testing it with:
$ perf bench internals inject-build-id
# Running 'internals/inject-build-id' benchmark:
Average build-id injection took: 8.543 msec (+- 0.130 msec)
Average time per event: 0.838 usec (+- 0.013 usec)
Average memory usage: 12717 KB (+- 9 KB)
Average build-id-all injection took: 5.710 msec (+- 0.058 msec)
Average time per event: 0.560 usec (+- 0.006 usec)
Average memory usage: 12079 KB (+- 7 KB)
$
Signed-off-by: Al Grant <al.grant@arm.com>
Acked-by: Adrian Hunter <adrian.hunter@intel.com>
Acked-by: Namhyung Kim <namhyung@kernel.org>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Peter Zijlstra <peterz@infradead.org>
LPU-Reference: b9cf5611-daae-2390-3439-6617f8f0a34b@foss.arm.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2020-11-13 20:38:26 +00:00
|
|
|
* synthesized hardware events, so clear the feature flag.
|
2015-04-09 15:54:00 +00:00
|
|
|
*/
|
2015-09-25 13:15:43 +00:00
|
|
|
if (inject->itrace_synth_opts.set) {
|
2015-04-09 15:54:00 +00:00
|
|
|
perf_header__clear_feat(&session->header,
|
|
|
|
HEADER_AUXTRACE);
|
2020-04-29 15:07:46 +00:00
|
|
|
if (inject->itrace_synth_opts.last_branch ||
|
|
|
|
inject->itrace_synth_opts.add_last_branch)
|
2015-09-25 13:15:43 +00:00
|
|
|
perf_header__set_feat(&session->header,
|
|
|
|
HEADER_BRANCH_STACK);
|
|
|
|
}
|
2015-04-09 15:54:00 +00:00
|
|
|
session->header.data_offset = output_data_offset;
|
2012-08-07 12:56:02 +00:00
|
|
|
session->header.data_size = inject->bytes_written;
|
2022-05-20 13:24:02 +00:00
|
|
|
perf_session__inject_header(session, session->evlist, fd, &inj_fc.fc);
|
2022-05-20 13:24:04 +00:00
|
|
|
|
|
|
|
if (inject->copy_kcore_dir) {
|
|
|
|
ret = copy_kcore_dir(inject);
|
|
|
|
if (ret)
|
|
|
|
return ret;
|
|
|
|
}
|
2012-08-07 12:56:02 +00:00
|
|
|
}
|
|
|
|
|
2010-05-01 06:41:20 +00:00
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2017-03-27 14:47:20 +00:00
|
|
|
int cmd_inject(int argc, const char **argv)
|
2010-05-01 06:41:20 +00:00
|
|
|
{
|
2012-09-30 22:54:10 +00:00
|
|
|
struct perf_inject inject = {
|
|
|
|
.tool = {
|
|
|
|
.sample = perf_event__repipe_sample,
|
2020-10-12 07:02:10 +00:00
|
|
|
.read = perf_event__repipe_sample,
|
2012-09-30 22:54:10 +00:00
|
|
|
.mmap = perf_event__repipe,
|
2013-08-21 10:10:25 +00:00
|
|
|
.mmap2 = perf_event__repipe,
|
2012-09-30 22:54:10 +00:00
|
|
|
.comm = perf_event__repipe,
|
2020-10-12 07:02:10 +00:00
|
|
|
.namespaces = perf_event__repipe,
|
|
|
|
.cgroup = perf_event__repipe,
|
2012-09-30 22:54:10 +00:00
|
|
|
.fork = perf_event__repipe,
|
|
|
|
.exit = perf_event__repipe,
|
|
|
|
.lost = perf_event__repipe,
|
2015-11-13 09:48:32 +00:00
|
|
|
.lost_samples = perf_event__repipe,
|
2015-04-30 14:37:29 +00:00
|
|
|
.aux = perf_event__repipe,
|
2015-04-30 14:37:30 +00:00
|
|
|
.itrace_start = perf_event__repipe,
|
2021-09-07 16:39:02 +00:00
|
|
|
.aux_output_hw_id = perf_event__repipe,
|
2015-07-21 09:44:03 +00:00
|
|
|
.context_switch = perf_event__repipe,
|
2012-09-30 22:54:10 +00:00
|
|
|
.throttle = perf_event__repipe,
|
|
|
|
.unthrottle = perf_event__repipe,
|
2020-10-12 07:02:10 +00:00
|
|
|
.ksymbol = perf_event__repipe,
|
|
|
|
.bpf = perf_event__repipe,
|
|
|
|
.text_poke = perf_event__repipe,
|
2012-09-30 22:54:10 +00:00
|
|
|
.attr = perf_event__repipe_attr,
|
2020-10-12 07:02:10 +00:00
|
|
|
.event_update = perf_event__repipe_event_update,
|
2013-07-04 13:20:21 +00:00
|
|
|
.tracing_data = perf_event__repipe_op2_synth,
|
2015-03-03 15:37:54 +00:00
|
|
|
.finished_round = perf_event__repipe_oe_synth,
|
2012-09-30 22:54:10 +00:00
|
|
|
.build_id = perf_event__repipe_op2_synth,
|
2014-10-27 13:49:22 +00:00
|
|
|
.id_index = perf_event__repipe_op2_synth,
|
2020-10-12 07:02:10 +00:00
|
|
|
.auxtrace_info = perf_event__repipe_op2_synth,
|
|
|
|
.auxtrace_error = perf_event__repipe_op2_synth,
|
|
|
|
.time_conv = perf_event__repipe_op2_synth,
|
|
|
|
.thread_map = perf_event__repipe_op2_synth,
|
|
|
|
.cpu_map = perf_event__repipe_op2_synth,
|
|
|
|
.stat_config = perf_event__repipe_op2_synth,
|
|
|
|
.stat = perf_event__repipe_op2_synth,
|
|
|
|
.stat_round = 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-18 04:25:48 +00:00
|
|
|
.feature = perf_event__repipe_op2_synth,
|
2020-10-12 07:02:10 +00:00
|
|
|
.compressed = perf_event__repipe_op4_synth,
|
|
|
|
.auxtrace = perf_event__repipe_auxtrace,
|
2012-09-30 22:54:10 +00:00
|
|
|
},
|
2012-08-07 12:56:02 +00:00
|
|
|
.input_name = "-",
|
2012-08-07 12:56:04 +00:00
|
|
|
.samples = LIST_HEAD_INIT(inject.samples),
|
2013-10-29 18:04:57 +00:00
|
|
|
.output = {
|
2019-02-21 09:41:30 +00:00
|
|
|
.path = "-",
|
|
|
|
.mode = PERF_DATA_MODE_WRITE,
|
perf data: Allow to use stdio functions for pipe mode
When perf data is in a pipe, it reads each event separately using
read(2) syscall. This is a huge performance bottleneck when
processing large data like in perf inject. Also perf inject needs to
use write(2) syscall for the output.
So convert it to use buffer I/O functions in stdio library for pipe
data. This makes inject-build-id bench time drops from 20ms to 8ms.
$ perf bench internals inject-build-id
# Running 'internals/inject-build-id' benchmark:
Average build-id injection took: 8.074 msec (+- 0.013 msec)
Average time per event: 0.792 usec (+- 0.001 usec)
Average memory usage: 8328 KB (+- 0 KB)
Average build-id-all injection took: 5.490 msec (+- 0.008 msec)
Average time per event: 0.538 usec (+- 0.001 usec)
Average memory usage: 7563 KB (+- 0 KB)
This patch enables it just for perf inject when used with pipe (it's a
default behavior). Maybe we could do it for perf record and/or report
later..
Committer testing:
Before:
$ perf stat -r 5 perf bench internals inject-build-id
# Running 'internals/inject-build-id' benchmark:
Average build-id injection took: 13.605 msec (+- 0.064 msec)
Average time per event: 1.334 usec (+- 0.006 usec)
Average memory usage: 12220 KB (+- 7 KB)
Average build-id-all injection took: 11.458 msec (+- 0.058 msec)
Average time per event: 1.123 usec (+- 0.006 usec)
Average memory usage: 11546 KB (+- 8 KB)
# Running 'internals/inject-build-id' benchmark:
Average build-id injection took: 13.673 msec (+- 0.057 msec)
Average time per event: 1.341 usec (+- 0.006 usec)
Average memory usage: 12508 KB (+- 8 KB)
Average build-id-all injection took: 11.437 msec (+- 0.046 msec)
Average time per event: 1.121 usec (+- 0.004 usec)
Average memory usage: 11812 KB (+- 7 KB)
# Running 'internals/inject-build-id' benchmark:
Average build-id injection took: 13.641 msec (+- 0.069 msec)
Average time per event: 1.337 usec (+- 0.007 usec)
Average memory usage: 12302 KB (+- 8 KB)
Average build-id-all injection took: 10.820 msec (+- 0.106 msec)
Average time per event: 1.061 usec (+- 0.010 usec)
Average memory usage: 11616 KB (+- 7 KB)
# Running 'internals/inject-build-id' benchmark:
Average build-id injection took: 13.379 msec (+- 0.074 msec)
Average time per event: 1.312 usec (+- 0.007 usec)
Average memory usage: 12334 KB (+- 8 KB)
Average build-id-all injection took: 11.288 msec (+- 0.071 msec)
Average time per event: 1.107 usec (+- 0.007 usec)
Average memory usage: 11657 KB (+- 8 KB)
# Running 'internals/inject-build-id' benchmark:
Average build-id injection took: 13.534 msec (+- 0.058 msec)
Average time per event: 1.327 usec (+- 0.006 usec)
Average memory usage: 12264 KB (+- 8 KB)
Average build-id-all injection took: 11.557 msec (+- 0.076 msec)
Average time per event: 1.133 usec (+- 0.007 usec)
Average memory usage: 11593 KB (+- 8 KB)
Performance counter stats for 'perf bench internals inject-build-id' (5 runs):
4,060.05 msec task-clock:u # 1.566 CPUs utilized ( +- 0.65% )
0 context-switches:u # 0.000 K/sec
0 cpu-migrations:u # 0.000 K/sec
101,888 page-faults:u # 0.025 M/sec ( +- 0.12% )
3,745,833,163 cycles:u # 0.923 GHz ( +- 0.10% ) (83.22%)
194,346,613 stalled-cycles-frontend:u # 5.19% frontend cycles idle ( +- 0.57% ) (83.30%)
708,495,034 stalled-cycles-backend:u # 18.91% backend cycles idle ( +- 0.48% ) (83.48%)
5,629,328,628 instructions:u # 1.50 insn per cycle
# 0.13 stalled cycles per insn ( +- 0.21% ) (83.57%)
1,236,697,927 branches:u # 304.602 M/sec ( +- 0.16% ) (83.44%)
17,564,877 branch-misses:u # 1.42% of all branches ( +- 0.23% ) (82.99%)
2.5934 +- 0.0128 seconds time elapsed ( +- 0.49% )
$
After:
$ perf stat -r 5 perf bench internals inject-build-id
# Running 'internals/inject-build-id' benchmark:
Average build-id injection took: 8.560 msec (+- 0.125 msec)
Average time per event: 0.839 usec (+- 0.012 usec)
Average memory usage: 12520 KB (+- 8 KB)
Average build-id-all injection took: 5.789 msec (+- 0.054 msec)
Average time per event: 0.568 usec (+- 0.005 usec)
Average memory usage: 11919 KB (+- 9 KB)
# Running 'internals/inject-build-id' benchmark:
Average build-id injection took: 8.639 msec (+- 0.111 msec)
Average time per event: 0.847 usec (+- 0.011 usec)
Average memory usage: 12732 KB (+- 8 KB)
Average build-id-all injection took: 5.647 msec (+- 0.069 msec)
Average time per event: 0.554 usec (+- 0.007 usec)
Average memory usage: 12093 KB (+- 7 KB)
# Running 'internals/inject-build-id' benchmark:
Average build-id injection took: 8.551 msec (+- 0.096 msec)
Average time per event: 0.838 usec (+- 0.009 usec)
Average memory usage: 12739 KB (+- 8 KB)
Average build-id-all injection took: 5.617 msec (+- 0.061 msec)
Average time per event: 0.551 usec (+- 0.006 usec)
Average memory usage: 12105 KB (+- 7 KB)
# Running 'internals/inject-build-id' benchmark:
Average build-id injection took: 8.403 msec (+- 0.097 msec)
Average time per event: 0.824 usec (+- 0.010 usec)
Average memory usage: 12770 KB (+- 8 KB)
Average build-id-all injection took: 5.611 msec (+- 0.085 msec)
Average time per event: 0.550 usec (+- 0.008 usec)
Average memory usage: 12134 KB (+- 8 KB)
# Running 'internals/inject-build-id' benchmark:
Average build-id injection took: 8.518 msec (+- 0.102 msec)
Average time per event: 0.835 usec (+- 0.010 usec)
Average memory usage: 12518 KB (+- 10 KB)
Average build-id-all injection took: 5.503 msec (+- 0.073 msec)
Average time per event: 0.540 usec (+- 0.007 usec)
Average memory usage: 11882 KB (+- 8 KB)
Performance counter stats for 'perf bench internals inject-build-id' (5 runs):
2,394.88 msec task-clock:u # 1.577 CPUs utilized ( +- 0.83% )
0 context-switches:u # 0.000 K/sec
0 cpu-migrations:u # 0.000 K/sec
103,181 page-faults:u # 0.043 M/sec ( +- 0.11% )
3,548,172,030 cycles:u # 1.482 GHz ( +- 0.30% ) (83.26%)
81,537,700 stalled-cycles-frontend:u # 2.30% frontend cycles idle ( +- 1.54% ) (83.24%)
876,631,544 stalled-cycles-backend:u # 24.71% backend cycles idle ( +- 1.14% ) (83.45%)
5,960,361,707 instructions:u # 1.68 insn per cycle
# 0.15 stalled cycles per insn ( +- 0.27% ) (83.26%)
1,269,413,491 branches:u # 530.054 M/sec ( +- 0.10% ) (83.48%)
11,372,453 branch-misses:u # 0.90% of all branches ( +- 0.52% ) (83.31%)
1.51874 +- 0.00642 seconds time elapsed ( +- 0.42% )
$
Signed-off-by: Namhyung Kim <namhyung@kernel.org>
Acked-by: Jiri Olsa <jolsa@redhat.com>
Tested-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Ian Rogers <irogers@google.com>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lore.kernel.org/lkml/20201030054742.87740-1-namhyung@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2020-10-30 05:47:42 +00:00
|
|
|
.use_stdio = true,
|
2013-10-29 18:04:57 +00:00
|
|
|
},
|
2012-09-30 22:54:10 +00:00
|
|
|
};
|
2017-01-23 21:07:59 +00:00
|
|
|
struct perf_data data = {
|
2014-08-12 06:40:37 +00:00
|
|
|
.mode = PERF_DATA_MODE_READ,
|
perf data: Allow to use stdio functions for pipe mode
When perf data is in a pipe, it reads each event separately using
read(2) syscall. This is a huge performance bottleneck when
processing large data like in perf inject. Also perf inject needs to
use write(2) syscall for the output.
So convert it to use buffer I/O functions in stdio library for pipe
data. This makes inject-build-id bench time drops from 20ms to 8ms.
$ perf bench internals inject-build-id
# Running 'internals/inject-build-id' benchmark:
Average build-id injection took: 8.074 msec (+- 0.013 msec)
Average time per event: 0.792 usec (+- 0.001 usec)
Average memory usage: 8328 KB (+- 0 KB)
Average build-id-all injection took: 5.490 msec (+- 0.008 msec)
Average time per event: 0.538 usec (+- 0.001 usec)
Average memory usage: 7563 KB (+- 0 KB)
This patch enables it just for perf inject when used with pipe (it's a
default behavior). Maybe we could do it for perf record and/or report
later..
Committer testing:
Before:
$ perf stat -r 5 perf bench internals inject-build-id
# Running 'internals/inject-build-id' benchmark:
Average build-id injection took: 13.605 msec (+- 0.064 msec)
Average time per event: 1.334 usec (+- 0.006 usec)
Average memory usage: 12220 KB (+- 7 KB)
Average build-id-all injection took: 11.458 msec (+- 0.058 msec)
Average time per event: 1.123 usec (+- 0.006 usec)
Average memory usage: 11546 KB (+- 8 KB)
# Running 'internals/inject-build-id' benchmark:
Average build-id injection took: 13.673 msec (+- 0.057 msec)
Average time per event: 1.341 usec (+- 0.006 usec)
Average memory usage: 12508 KB (+- 8 KB)
Average build-id-all injection took: 11.437 msec (+- 0.046 msec)
Average time per event: 1.121 usec (+- 0.004 usec)
Average memory usage: 11812 KB (+- 7 KB)
# Running 'internals/inject-build-id' benchmark:
Average build-id injection took: 13.641 msec (+- 0.069 msec)
Average time per event: 1.337 usec (+- 0.007 usec)
Average memory usage: 12302 KB (+- 8 KB)
Average build-id-all injection took: 10.820 msec (+- 0.106 msec)
Average time per event: 1.061 usec (+- 0.010 usec)
Average memory usage: 11616 KB (+- 7 KB)
# Running 'internals/inject-build-id' benchmark:
Average build-id injection took: 13.379 msec (+- 0.074 msec)
Average time per event: 1.312 usec (+- 0.007 usec)
Average memory usage: 12334 KB (+- 8 KB)
Average build-id-all injection took: 11.288 msec (+- 0.071 msec)
Average time per event: 1.107 usec (+- 0.007 usec)
Average memory usage: 11657 KB (+- 8 KB)
# Running 'internals/inject-build-id' benchmark:
Average build-id injection took: 13.534 msec (+- 0.058 msec)
Average time per event: 1.327 usec (+- 0.006 usec)
Average memory usage: 12264 KB (+- 8 KB)
Average build-id-all injection took: 11.557 msec (+- 0.076 msec)
Average time per event: 1.133 usec (+- 0.007 usec)
Average memory usage: 11593 KB (+- 8 KB)
Performance counter stats for 'perf bench internals inject-build-id' (5 runs):
4,060.05 msec task-clock:u # 1.566 CPUs utilized ( +- 0.65% )
0 context-switches:u # 0.000 K/sec
0 cpu-migrations:u # 0.000 K/sec
101,888 page-faults:u # 0.025 M/sec ( +- 0.12% )
3,745,833,163 cycles:u # 0.923 GHz ( +- 0.10% ) (83.22%)
194,346,613 stalled-cycles-frontend:u # 5.19% frontend cycles idle ( +- 0.57% ) (83.30%)
708,495,034 stalled-cycles-backend:u # 18.91% backend cycles idle ( +- 0.48% ) (83.48%)
5,629,328,628 instructions:u # 1.50 insn per cycle
# 0.13 stalled cycles per insn ( +- 0.21% ) (83.57%)
1,236,697,927 branches:u # 304.602 M/sec ( +- 0.16% ) (83.44%)
17,564,877 branch-misses:u # 1.42% of all branches ( +- 0.23% ) (82.99%)
2.5934 +- 0.0128 seconds time elapsed ( +- 0.49% )
$
After:
$ perf stat -r 5 perf bench internals inject-build-id
# Running 'internals/inject-build-id' benchmark:
Average build-id injection took: 8.560 msec (+- 0.125 msec)
Average time per event: 0.839 usec (+- 0.012 usec)
Average memory usage: 12520 KB (+- 8 KB)
Average build-id-all injection took: 5.789 msec (+- 0.054 msec)
Average time per event: 0.568 usec (+- 0.005 usec)
Average memory usage: 11919 KB (+- 9 KB)
# Running 'internals/inject-build-id' benchmark:
Average build-id injection took: 8.639 msec (+- 0.111 msec)
Average time per event: 0.847 usec (+- 0.011 usec)
Average memory usage: 12732 KB (+- 8 KB)
Average build-id-all injection took: 5.647 msec (+- 0.069 msec)
Average time per event: 0.554 usec (+- 0.007 usec)
Average memory usage: 12093 KB (+- 7 KB)
# Running 'internals/inject-build-id' benchmark:
Average build-id injection took: 8.551 msec (+- 0.096 msec)
Average time per event: 0.838 usec (+- 0.009 usec)
Average memory usage: 12739 KB (+- 8 KB)
Average build-id-all injection took: 5.617 msec (+- 0.061 msec)
Average time per event: 0.551 usec (+- 0.006 usec)
Average memory usage: 12105 KB (+- 7 KB)
# Running 'internals/inject-build-id' benchmark:
Average build-id injection took: 8.403 msec (+- 0.097 msec)
Average time per event: 0.824 usec (+- 0.010 usec)
Average memory usage: 12770 KB (+- 8 KB)
Average build-id-all injection took: 5.611 msec (+- 0.085 msec)
Average time per event: 0.550 usec (+- 0.008 usec)
Average memory usage: 12134 KB (+- 8 KB)
# Running 'internals/inject-build-id' benchmark:
Average build-id injection took: 8.518 msec (+- 0.102 msec)
Average time per event: 0.835 usec (+- 0.010 usec)
Average memory usage: 12518 KB (+- 10 KB)
Average build-id-all injection took: 5.503 msec (+- 0.073 msec)
Average time per event: 0.540 usec (+- 0.007 usec)
Average memory usage: 11882 KB (+- 8 KB)
Performance counter stats for 'perf bench internals inject-build-id' (5 runs):
2,394.88 msec task-clock:u # 1.577 CPUs utilized ( +- 0.83% )
0 context-switches:u # 0.000 K/sec
0 cpu-migrations:u # 0.000 K/sec
103,181 page-faults:u # 0.043 M/sec ( +- 0.11% )
3,548,172,030 cycles:u # 1.482 GHz ( +- 0.30% ) (83.26%)
81,537,700 stalled-cycles-frontend:u # 2.30% frontend cycles idle ( +- 1.54% ) (83.24%)
876,631,544 stalled-cycles-backend:u # 24.71% backend cycles idle ( +- 1.14% ) (83.45%)
5,960,361,707 instructions:u # 1.68 insn per cycle
# 0.15 stalled cycles per insn ( +- 0.27% ) (83.26%)
1,269,413,491 branches:u # 530.054 M/sec ( +- 0.10% ) (83.48%)
11,372,453 branch-misses:u # 0.90% of all branches ( +- 0.52% ) (83.31%)
1.51874 +- 0.00642 seconds time elapsed ( +- 0.42% )
$
Signed-off-by: Namhyung Kim <namhyung@kernel.org>
Acked-by: Jiri Olsa <jolsa@redhat.com>
Tested-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Ian Rogers <irogers@google.com>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lore.kernel.org/lkml/20201030054742.87740-1-namhyung@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2020-10-30 05:47:42 +00:00
|
|
|
.use_stdio = true,
|
2014-08-12 06:40:37 +00:00
|
|
|
};
|
|
|
|
int ret;
|
2021-07-19 22:31:52 +00:00
|
|
|
bool repipe = true;
|
2014-08-12 06:40:37 +00:00
|
|
|
|
2015-11-30 09:02:21 +00:00
|
|
|
struct option options[] = {
|
2012-09-30 22:54:10 +00:00
|
|
|
OPT_BOOLEAN('b', "build-ids", &inject.build_ids,
|
|
|
|
"Inject build-ids into the output stream"),
|
2020-10-12 07:02:13 +00:00
|
|
|
OPT_BOOLEAN(0, "buildid-all", &inject.build_id_all,
|
|
|
|
"Inject build-ids of all DSOs into the output stream"),
|
2012-08-07 12:56:02 +00:00
|
|
|
OPT_STRING('i', "input", &inject.input_name, "file",
|
|
|
|
"input file name"),
|
2019-02-21 09:41:30 +00:00
|
|
|
OPT_STRING('o', "output", &inject.output.path, "file",
|
2012-08-07 12:56:02 +00:00
|
|
|
"output file name"),
|
2012-08-07 12:56:04 +00: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 16:41:13 +00:00
|
|
|
#ifdef HAVE_JITDUMP
|
2015-11-30 09:02:21 +00:00
|
|
|
OPT_BOOLEAN('j', "jit", &inject.jit_mode, "merge jitdump files into perf.data file"),
|
2016-03-10 16:41:13 +00:00
|
|
|
#endif
|
2012-09-30 22:54:10 +00:00
|
|
|
OPT_INCR('v', "verbose", &verbose,
|
|
|
|
"be more verbose (show build ids, etc)"),
|
2021-10-18 13:48:43 +00:00
|
|
|
OPT_STRING('k', "vmlinux", &symbol_conf.vmlinux_name,
|
|
|
|
"file", "vmlinux pathname"),
|
|
|
|
OPT_BOOLEAN(0, "ignore-vmlinux", &symbol_conf.ignore_vmlinux,
|
|
|
|
"don't load vmlinux even if found"),
|
2014-07-22 13:17:38 +00:00
|
|
|
OPT_STRING(0, "kallsyms", &symbol_conf.kallsyms_name, "file",
|
|
|
|
"kallsyms pathname"),
|
2017-01-23 21:07:59 +00:00
|
|
|
OPT_BOOLEAN('f', "force", &data.force, "don't complain, do it"),
|
2015-04-09 15:54:00 +00:00
|
|
|
OPT_CALLBACK_OPTARG(0, "itrace", &inject.itrace_synth_opts,
|
2018-09-14 03:10:31 +00:00
|
|
|
NULL, "opts", "Instruction Tracing options\n"
|
|
|
|
ITRACE_HELP,
|
2015-04-09 15:54:00 +00:00
|
|
|
itrace_parse_synth_opts),
|
2015-09-25 13:15:55 +00:00
|
|
|
OPT_BOOLEAN(0, "strip", &inject.strip,
|
|
|
|
"strip non-synthesized events (use with --itrace)"),
|
2021-04-30 07:03:02 +00:00
|
|
|
OPT_CALLBACK_OPTARG(0, "vm-time-correlation", &inject, NULL, "opts",
|
|
|
|
"correlate time between VM guests and the host",
|
|
|
|
parse_vm_time_correlation),
|
2012-09-30 22:54:10 +00:00
|
|
|
OPT_END()
|
|
|
|
};
|
2012-10-01 18:20:58 +00:00
|
|
|
const char * const inject_usage[] = {
|
|
|
|
"perf inject [<options>]",
|
|
|
|
NULL
|
|
|
|
};
|
2016-03-10 16:41:13 +00:00
|
|
|
#ifndef HAVE_JITDUMP
|
2015-11-30 09:02:21 +00:00
|
|
|
set_option_nobuild(options, 'j', "jit", "NO_LIBELF=1", true);
|
|
|
|
#endif
|
2012-10-01 18:20:58 +00:00
|
|
|
argc = parse_options(argc, argv, options, inject_usage, 0);
|
2010-05-01 06:41:20 +00:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Any (unrecognized) arguments left?
|
|
|
|
*/
|
|
|
|
if (argc)
|
2012-10-01 18:20:58 +00:00
|
|
|
usage_with_options(inject_usage, options);
|
2010-05-01 06:41:20 +00:00
|
|
|
|
2015-09-25 13:15:55 +00:00
|
|
|
if (inject.strip && !inject.itrace_synth_opts.set) {
|
|
|
|
pr_err("--strip option requires --itrace option\n");
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
2021-10-18 13:48:43 +00:00
|
|
|
if (symbol__validate_sym_arguments())
|
|
|
|
return -1;
|
|
|
|
|
2021-04-30 07:03:01 +00:00
|
|
|
if (inject.in_place_update) {
|
|
|
|
if (!strcmp(inject.input_name, "-")) {
|
|
|
|
pr_err("Input file name required for in-place updating\n");
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
if (strcmp(inject.output.path, "-")) {
|
|
|
|
pr_err("Output file name must not be specified for in-place updating\n");
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
if (!data.force && !inject.in_place_update_dry_run) {
|
|
|
|
pr_err("The input file would be updated in place, "
|
|
|
|
"the --force option is required.\n");
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
if (!inject.in_place_update_dry_run)
|
|
|
|
data.in_place_update = true;
|
2022-05-20 13:24:04 +00:00
|
|
|
} else {
|
|
|
|
if (strcmp(inject.output.path, "-") && !inject.strip &&
|
|
|
|
has_kcore_dir(inject.input_name)) {
|
|
|
|
inject.output.is_dir = true;
|
|
|
|
inject.copy_kcore_dir = true;
|
|
|
|
}
|
|
|
|
if (perf_data__open(&inject.output)) {
|
|
|
|
perror("failed to create output file");
|
|
|
|
return -1;
|
|
|
|
}
|
2012-08-07 12:56:02 +00:00
|
|
|
}
|
|
|
|
|
2019-02-21 09:41:30 +00:00
|
|
|
data.path = inject.input_name;
|
2021-07-19 22:31:52 +00:00
|
|
|
if (!strcmp(inject.input_name, "-") || inject.output.is_pipe) {
|
2021-07-19 22:31:51 +00:00
|
|
|
inject.is_pipe = true;
|
2021-07-19 22:31:52 +00:00
|
|
|
/*
|
|
|
|
* Do not repipe header when input is a regular file
|
|
|
|
* since either it can rewrite the header at the end
|
|
|
|
* or write a new pipe header.
|
|
|
|
*/
|
|
|
|
if (strcmp(inject.input_name, "-"))
|
|
|
|
repipe = false;
|
|
|
|
}
|
2021-07-19 22:31:51 +00:00
|
|
|
|
2021-07-19 22:31:52 +00:00
|
|
|
inject.session = __perf_session__new(&data, repipe,
|
2021-12-13 08:48:29 +00:00
|
|
|
output_fd(&inject),
|
2021-07-19 22:31:51 +00:00
|
|
|
&inject.tool);
|
2021-07-15 16:07:15 +00:00
|
|
|
if (IS_ERR(inject.session)) {
|
|
|
|
ret = PTR_ERR(inject.session);
|
|
|
|
goto out_close_output;
|
|
|
|
}
|
2014-08-12 06:40:37 +00:00
|
|
|
|
2019-03-18 17:45:44 +00:00
|
|
|
if (zstd_init(&(inject.session->zstd_data), 0) < 0)
|
|
|
|
pr_warning("Decompression initialization failed.\n");
|
|
|
|
|
2022-05-20 13:24:02 +00:00
|
|
|
/* Save original section info before feature bits change */
|
|
|
|
ret = save_section_info(&inject);
|
|
|
|
if (ret)
|
|
|
|
goto out_delete;
|
|
|
|
|
2021-07-19 22:31:52 +00:00
|
|
|
if (!data.is_pipe && inject.output.is_pipe) {
|
|
|
|
ret = perf_header__write_pipe(perf_data__fd(&inject.output));
|
|
|
|
if (ret < 0) {
|
|
|
|
pr_err("Couldn't write a new pipe header.\n");
|
|
|
|
goto out_delete;
|
|
|
|
}
|
|
|
|
|
|
|
|
ret = perf_event__synthesize_for_pipe(&inject.tool,
|
|
|
|
inject.session,
|
|
|
|
&inject.output,
|
|
|
|
perf_event__repipe);
|
|
|
|
if (ret < 0)
|
|
|
|
goto out_delete;
|
|
|
|
}
|
|
|
|
|
2020-10-12 07:02:13 +00:00
|
|
|
if (inject.build_ids && !inject.build_id_all) {
|
2016-01-22 21:41:00 +00:00
|
|
|
/*
|
|
|
|
* 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;
|
|
|
|
}
|
2020-10-12 07:02:13 +00:00
|
|
|
|
|
|
|
if (inject.sched_stat) {
|
|
|
|
inject.tool.ordered_events = true;
|
|
|
|
}
|
|
|
|
|
2016-03-10 16:41:13 +00:00
|
|
|
#ifdef HAVE_JITDUMP
|
2015-11-30 09:02:21 +00: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 08:15:20 +00:00
|
|
|
ret = symbol__init(&inject.session->header.env);
|
|
|
|
if (ret < 0)
|
|
|
|
goto out_delete;
|
2010-05-01 06:41:20 +00:00
|
|
|
|
2014-08-12 06:40:37 +00:00
|
|
|
ret = __cmd_inject(&inject);
|
|
|
|
|
2015-06-30 08:15:20 +00:00
|
|
|
out_delete:
|
2019-03-18 17:45:44 +00:00
|
|
|
zstd_fini(&(inject.session->zstd_data));
|
2014-08-12 06:40:37 +00:00
|
|
|
perf_session__delete(inject.session);
|
2021-07-15 16:07:15 +00:00
|
|
|
out_close_output:
|
2021-12-13 08:48:28 +00:00
|
|
|
if (!inject.in_place_update)
|
|
|
|
perf_data__close(&inject.output);
|
2021-04-30 07:03:02 +00:00
|
|
|
free(inject.itrace_synth_opts.vm_tm_corr_args);
|
2014-08-12 06:40:37 +00:00
|
|
|
return ret;
|
2010-05-01 06:41:20 +00:00
|
|
|
}
|