mirror of
https://github.com/torvalds/linux.git
synced 2026-03-08 01:04:41 +01:00
This adds a feature to allow restricting the range of converted samples
with a range string like perf-script and perf-report --time.
Committer testing:
Put a probe on the ICMP receive path handling broadcast packets:
# perf probe icmp_rcv:64
Added new event:
probe:icmp_rcv_L64 (on icmp_rcv:64)
You can now use it in all perf tools, such as:
perf record -e probe:icmp_rcv_L64 -aR sleep 1
# perf record -e probe:icmp_rcv_L64 ping -c 10 -b 127.255.255.255
WARNING: pinging broadcast address
PING 127.255.255.255 (127.255.255.255) 56(84) bytes of data.
^C
--- 127.255.255.255 ping statistics ---
10 packets transmitted, 0 received, 100% packet loss, time 9217ms
[ perf record: Woken up 1 times to write data ]
[ perf record: Captured and wrote 0.034 MB perf.data (10 samples) ]
# perf script
ping 52785 [009] 5847.300394: probe:icmp_rcv_L64: (ffffffffaadb337e)
ping 52785 [009] 5848.325018: probe:icmp_rcv_L64: (ffffffffaadb337e)
ping 52785 [009] 5849.349007: probe:icmp_rcv_L64: (ffffffffaadb337e)
ping 52785 [009] 5850.372979: probe:icmp_rcv_L64: (ffffffffaadb337e)
ping 52785 [009] 5851.396988: probe:icmp_rcv_L64: (ffffffffaadb337e)
ping 52785 [009] 5852.420954: probe:icmp_rcv_L64: (ffffffffaadb337e)
ping 52785 [009] 5853.444934: probe:icmp_rcv_L64: (ffffffffaadb337e)
ping 52785 [009] 5854.468926: probe:icmp_rcv_L64: (ffffffffaadb337e)
ping 52785 [009] 5855.492914: probe:icmp_rcv_L64: (ffffffffaadb337e)
ping 52785 [009] 5856.516883: probe:icmp_rcv_L64: (ffffffffaadb337e)
#
Now get some slices using perf script:
# perf script --time 40%
ping 52785 [009] 5847.300394: probe:icmp_rcv_L64: (ffffffffaadb337e)
ping 52785 [009] 5848.325018: probe:icmp_rcv_L64: (ffffffffaadb337e)
ping 52785 [009] 5849.349007: probe:icmp_rcv_L64: (ffffffffaadb337e)
ping 52785 [009] 5850.372979: probe:icmp_rcv_L64: (ffffffffaadb337e)
# perf script --time 40%-60%
ping 52785 [009] 5851.396988: probe:icmp_rcv_L64: (ffffffffaadb337e)
ping 52785 [009] 5852.420954: probe:icmp_rcv_L64: (ffffffffaadb337e)
#
And finally use this new feature:
# perf data convert --to-json out.json --time 0%-10%
[ perf data convert: Converted 'perf.data' into JSON data 'out.json' ]
[ perf data convert: Converted and wrote 0.001 MB (1 samples) ]
[ perf data convert: Skipped 9 samples ]
# cat out.json
{
"linux-perf-json-version": 1,
"headers": {
"header-version": 1,
"captured-on": "2026-01-06T22:26:40Z",
"data-offset": 520,
"data-size": 34648,
"feat-offset": 35168,
"hostname": "number",
"os-release": "6.17.12-300.fc43.x86_64",
"arch": "x86_64",
"cpu-desc": "AMD Ryzen 9 9950X3D 16-Core Processor",
"cpuid": "AuthenticAMD,26,68,0",
"nrcpus-online": 32,
"nrcpus-avail": 32,
"perf-version": "6.19.rc4.gf4c270685d3d",
"cmdline": [
"/home/acme/bin/perf"
]
},
"samples": [
{
"timestamp": 5847300394661,
"pid": 52785,
"tid": 52785,
"cpu": 9,
"comm": "ping",
"callchain": [
{
"ip": "0xffffffffaadb337f",
"symbol": "icmp_rcv",
"dso": "[kernel.kallsyms]"
}
],
"__probe_ip": "ffffffffaadb337e"
}
]
}
#
Signed-off-by: Derek Foreman <derek.foreman@collabora.com>
Tested-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Ian Rogers <irogers@google.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: James Clark <james.clark@linaro.org>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
128 lines
3.1 KiB
C
128 lines
3.1 KiB
C
// SPDX-License-Identifier: GPL-2.0
|
|
#include <linux/compiler.h>
|
|
#include <stdio.h>
|
|
#include <string.h>
|
|
#include "builtin.h"
|
|
#include "debug.h"
|
|
#include <subcmd/parse-options.h>
|
|
#include "data-convert.h"
|
|
#include "util/util.h"
|
|
|
|
typedef int (*data_cmd_fn_t)(int argc, const char **argv);
|
|
|
|
struct data_cmd {
|
|
const char *name;
|
|
const char *summary;
|
|
data_cmd_fn_t fn;
|
|
};
|
|
|
|
static struct data_cmd data_cmds[];
|
|
|
|
#define for_each_cmd(cmd) \
|
|
for (cmd = data_cmds; cmd && cmd->name; cmd++)
|
|
|
|
static const char * const data_subcommands[] = { "convert", NULL };
|
|
|
|
static const char *data_usage[] = {
|
|
"perf data convert [<options>]",
|
|
NULL
|
|
};
|
|
|
|
const char *to_json;
|
|
const char *to_ctf;
|
|
struct perf_data_convert_opts opts = {
|
|
.force = false,
|
|
.all = false,
|
|
.time_str = NULL,
|
|
};
|
|
|
|
const struct option data_options[] = {
|
|
OPT_INCR('v', "verbose", &verbose, "be more verbose"),
|
|
OPT_STRING('i', "input", &input_name, "file", "input file name"),
|
|
OPT_STRING(0, "to-json", &to_json, NULL, "Convert to JSON format"),
|
|
#ifdef HAVE_LIBBABELTRACE_SUPPORT
|
|
OPT_STRING(0, "to-ctf", &to_ctf, NULL, "Convert to CTF format"),
|
|
OPT_BOOLEAN(0, "tod", &opts.tod, "Convert time to wall clock time"),
|
|
#endif
|
|
OPT_BOOLEAN('f', "force", &opts.force, "don't complain, do it"),
|
|
OPT_BOOLEAN(0, "all", &opts.all, "Convert all events"),
|
|
OPT_STRING(0, "time", &opts.time_str, "str",
|
|
"Time span of interest (start,stop)"),
|
|
OPT_END()
|
|
};
|
|
|
|
static int cmd_data_convert(int argc, const char **argv)
|
|
{
|
|
|
|
argc = parse_options(argc, argv, data_options,
|
|
data_usage, 0);
|
|
if (argc) {
|
|
usage_with_options(data_usage, data_options);
|
|
return -1;
|
|
}
|
|
|
|
if (to_json && to_ctf) {
|
|
pr_err("You cannot specify both --to-ctf and --to-json.\n");
|
|
return -1;
|
|
}
|
|
#ifdef HAVE_LIBBABELTRACE_SUPPORT
|
|
if (!to_json && !to_ctf) {
|
|
pr_err("You must specify one of --to-ctf or --to-json.\n");
|
|
return -1;
|
|
}
|
|
#else
|
|
if (!to_json) {
|
|
pr_err("You must specify --to-json.\n");
|
|
return -1;
|
|
}
|
|
#endif
|
|
|
|
if (to_json)
|
|
return bt_convert__perf2json(input_name, to_json, &opts);
|
|
|
|
if (to_ctf) {
|
|
#if defined(HAVE_LIBBABELTRACE_SUPPORT) && defined(HAVE_LIBTRACEEVENT)
|
|
return bt_convert__perf2ctf(input_name, to_ctf, &opts);
|
|
#else
|
|
pr_err("The libbabeltrace support is not compiled in. perf should be "
|
|
"compiled with environment variables LIBBABELTRACE=1 and "
|
|
"LIBBABELTRACE_DIR=/path/to/libbabeltrace/.\n"
|
|
"Check also if libbtraceevent devel files are available.\n");
|
|
return -1;
|
|
#endif
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
static struct data_cmd data_cmds[] = {
|
|
{ "convert", "converts data file between formats", cmd_data_convert },
|
|
{ .name = NULL, },
|
|
};
|
|
|
|
int cmd_data(int argc, const char **argv)
|
|
{
|
|
struct data_cmd *cmd;
|
|
const char *cmdstr;
|
|
|
|
argc = parse_options_subcommand(argc, argv, data_options, data_subcommands, data_usage,
|
|
PARSE_OPT_STOP_AT_NON_OPTION);
|
|
|
|
if (!argc) {
|
|
usage_with_options(data_usage, data_options);
|
|
return -1;
|
|
}
|
|
|
|
cmdstr = argv[0];
|
|
|
|
for_each_cmd(cmd) {
|
|
if (strcmp(cmd->name, cmdstr))
|
|
continue;
|
|
|
|
return cmd->fn(argc, argv);
|
|
}
|
|
|
|
pr_err("Unknown command: %s\n", cmdstr);
|
|
usage_with_options(data_usage, data_options);
|
|
return -1;
|
|
}
|