perf/core improvements:
New features: - Add support for interacting with Coresight PMU ETMs/PTMs, that are IP blocks to perform hardware assisted tracing on a ARM CPU core (Mathieu Poirier) Infrastructure: - Histogram prep work for the upcoming c2c tool (Jiri Olsa) Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com> -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAABCAAGBQJX5Ef6AAoJENZQFvNTUqpAKh0QAJVQzQHymIre8QT5rP0+9cOF 4ct3nLSRoc+LxIgcgeeoxYbqh2JBWN3773ezYk4hDcop3KE9riE1oE9VVG2Os/HP vbQvudykktJz+P+zdp6nmMppmipLs6+kpIgBNwl9rwWE0rLre/tCujHtK4/cpgFa g1tJkKD7EeQ12Q/OnWsnWpDrxmx6tL0qNxt/ayraT86Bx+A/GnuTWrAcGrQ5LK0e 3opphj1XSUD+OOKXmZZDSNlTgweBEuF3QA+SYwLmjFYIeYg6uXtHN4Z1rr3CgwWr DnXlMv/p3OuPLzsJRiBdcOxS1coYtHVAfjJa2NDSG9iEFO7mWNas69IqfeiwQVSp oFIHo5inD4dY7sdeytGnLGuTbhtMiftWSe6LwL6aTOUZZlo5l8E55PuXgW3zt+GY 0PjoT0a5bBdXY9wIKupIjWUxyS8Z549ySYNhgXgZv1u6ckeOeKPW8XtiJMckXsxG Ssfw+7xQtJ3VNoOZBofijRKN9JYtYOqqX+wVHOhPvlrbFh1uLlLoFuRoZ1AmJPok rQkPjzcItIMe1opvXxJYTjbyptd9OXeKQGynNm7R2Gbhm27Rt9hdQSz+xZIoN0dJ ntt/Qiu9LeG3jr8eIwB97TW0rFtaxt6b6LecxCg1H9i4f6kUlpCnPHp+IBFwrG/j 71ZsHII88tndNYZCwX4s =l8wx -----END PGP SIGNATURE----- Merge tag 'perf-core-for-mingo-20160922' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/core Pull perf/core improvements from Arnaldo Carvalho de Melo: New features: - Add support for interacting with Coresight PMU ETMs/PTMs, that are IP blocks to perform hardware assisted tracing on a ARM CPU core (Mathieu Poirier) Infrastructure changes: - Histogram prep work for the upcoming c2c tool (Jiri Olsa) Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com> Signed-off-by: Ingo Molnar <mingo@kernel.org>
This commit is contained in:
Ingo Molnar
Коммит
6b652de2b2
|
|
@ -1123,6 +1123,11 @@ F: drivers/hwtracing/coresight/*
|
|||
F: Documentation/trace/coresight.txt
|
||||
F: Documentation/devicetree/bindings/arm/coresight.txt
|
||||
F: Documentation/ABI/testing/sysfs-bus-coresight-devices-*
|
||||
F: tools/perf/arch/arm/util/pmu.c
|
||||
F: tools/perf/arch/arm/util/auxtrace.c
|
||||
F: tools/perf/arch/arm/util/cs-etm.c
|
||||
F: tools/perf/arch/arm/util/cs-etm.h
|
||||
F: tools/perf/util/cs-etm.h
|
||||
|
||||
ARM/CORGI MACHINE SUPPORT
|
||||
M: Richard Purdie <rpurdie@rpsys.net>
|
||||
|
|
|
|||
|
|
@ -746,10 +746,13 @@ ifdef LIBBABELTRACE
|
|||
endif
|
||||
|
||||
ifndef NO_AUXTRACE
|
||||
ifeq ($(feature-get_cpuid), 0)
|
||||
msg := $(warning Your gcc lacks the __get_cpuid() builtin, disables support for auxtrace/Intel PT, please install a newer gcc);
|
||||
NO_AUXTRACE := 1
|
||||
else
|
||||
ifeq ($(ARCH),x86)
|
||||
ifeq ($(feature-get_cpuid), 0)
|
||||
msg := $(warning Your gcc lacks the __get_cpuid() builtin, disables support for auxtrace/Intel PT, please install a newer gcc);
|
||||
NO_AUXTRACE := 1
|
||||
endif
|
||||
endif
|
||||
ifndef NO_AUXTRACE
|
||||
$(call detected,CONFIG_AUXTRACE)
|
||||
CFLAGS += -DHAVE_AUXTRACE_SUPPORT
|
||||
endif
|
||||
|
|
|
|||
|
|
@ -2,3 +2,5 @@ libperf-$(CONFIG_DWARF) += dwarf-regs.o
|
|||
|
||||
libperf-$(CONFIG_LOCAL_LIBUNWIND) += unwind-libunwind.o
|
||||
libperf-$(CONFIG_LIBDW_DWARF_UNWIND) += unwind-libdw.o
|
||||
|
||||
libperf-$(CONFIG_AUXTRACE) += pmu.o auxtrace.o cs-etm.o
|
||||
|
|
|
|||
|
|
@ -0,0 +1,54 @@
|
|||
/*
|
||||
* Copyright(C) 2015 Linaro Limited. All rights reserved.
|
||||
* Author: Mathieu Poirier <mathieu.poirier@linaro.org>
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify it
|
||||
* under the terms of the GNU General Public License version 2 as published by
|
||||
* the Free Software Foundation.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful, but WITHOUT
|
||||
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
|
||||
* more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License along with
|
||||
* this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#include <stdbool.h>
|
||||
#include <linux/coresight-pmu.h>
|
||||
|
||||
#include "../../util/auxtrace.h"
|
||||
#include "../../util/evlist.h"
|
||||
#include "../../util/pmu.h"
|
||||
#include "cs-etm.h"
|
||||
|
||||
struct auxtrace_record
|
||||
*auxtrace_record__init(struct perf_evlist *evlist, int *err)
|
||||
{
|
||||
struct perf_pmu *cs_etm_pmu;
|
||||
struct perf_evsel *evsel;
|
||||
bool found_etm = false;
|
||||
|
||||
cs_etm_pmu = perf_pmu__find(CORESIGHT_ETM_PMU_NAME);
|
||||
|
||||
if (evlist) {
|
||||
evlist__for_each_entry(evlist, evsel) {
|
||||
if (cs_etm_pmu &&
|
||||
evsel->attr.type == cs_etm_pmu->type)
|
||||
found_etm = true;
|
||||
}
|
||||
}
|
||||
|
||||
if (found_etm)
|
||||
return cs_etm_record_init(err);
|
||||
|
||||
/*
|
||||
* Clear 'err' even if we haven't found a cs_etm event - that way perf
|
||||
* record can still be used even if tracers aren't present. The NULL
|
||||
* return value will take care of telling the infrastructure HW tracing
|
||||
* isn't available.
|
||||
*/
|
||||
*err = 0;
|
||||
return NULL;
|
||||
}
|
||||
|
|
@ -0,0 +1,617 @@
|
|||
/*
|
||||
* Copyright(C) 2015 Linaro Limited. All rights reserved.
|
||||
* Author: Mathieu Poirier <mathieu.poirier@linaro.org>
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify it
|
||||
* under the terms of the GNU General Public License version 2 as published by
|
||||
* the Free Software Foundation.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful, but WITHOUT
|
||||
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
|
||||
* more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License along with
|
||||
* this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#include <api/fs/fs.h>
|
||||
#include <linux/bitops.h>
|
||||
#include <linux/coresight-pmu.h>
|
||||
#include <linux/kernel.h>
|
||||
#include <linux/log2.h>
|
||||
#include <linux/types.h>
|
||||
|
||||
#include "cs-etm.h"
|
||||
#include "../../perf.h"
|
||||
#include "../../util/auxtrace.h"
|
||||
#include "../../util/cpumap.h"
|
||||
#include "../../util/evlist.h"
|
||||
#include "../../util/evsel.h"
|
||||
#include "../../util/pmu.h"
|
||||
#include "../../util/thread_map.h"
|
||||
#include "../../util/cs-etm.h"
|
||||
|
||||
#include <stdlib.h>
|
||||
|
||||
#define ENABLE_SINK_MAX 128
|
||||
#define CS_BUS_DEVICE_PATH "/bus/coresight/devices/"
|
||||
|
||||
struct cs_etm_recording {
|
||||
struct auxtrace_record itr;
|
||||
struct perf_pmu *cs_etm_pmu;
|
||||
struct perf_evlist *evlist;
|
||||
bool snapshot_mode;
|
||||
size_t snapshot_size;
|
||||
};
|
||||
|
||||
static bool cs_etm_is_etmv4(struct auxtrace_record *itr, int cpu);
|
||||
|
||||
static int cs_etm_parse_snapshot_options(struct auxtrace_record *itr,
|
||||
struct record_opts *opts,
|
||||
const char *str)
|
||||
{
|
||||
struct cs_etm_recording *ptr =
|
||||
container_of(itr, struct cs_etm_recording, itr);
|
||||
unsigned long long snapshot_size = 0;
|
||||
char *endptr;
|
||||
|
||||
if (str) {
|
||||
snapshot_size = strtoull(str, &endptr, 0);
|
||||
if (*endptr || snapshot_size > SIZE_MAX)
|
||||
return -1;
|
||||
}
|
||||
|
||||
opts->auxtrace_snapshot_mode = true;
|
||||
opts->auxtrace_snapshot_size = snapshot_size;
|
||||
ptr->snapshot_size = snapshot_size;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int cs_etm_recording_options(struct auxtrace_record *itr,
|
||||
struct perf_evlist *evlist,
|
||||
struct record_opts *opts)
|
||||
{
|
||||
struct cs_etm_recording *ptr =
|
||||
container_of(itr, struct cs_etm_recording, itr);
|
||||
struct perf_pmu *cs_etm_pmu = ptr->cs_etm_pmu;
|
||||
struct perf_evsel *evsel, *cs_etm_evsel = NULL;
|
||||
const struct cpu_map *cpus = evlist->cpus;
|
||||
bool privileged = (geteuid() == 0 || perf_event_paranoid() < 0);
|
||||
|
||||
ptr->evlist = evlist;
|
||||
ptr->snapshot_mode = opts->auxtrace_snapshot_mode;
|
||||
|
||||
evlist__for_each_entry(evlist, evsel) {
|
||||
if (evsel->attr.type == cs_etm_pmu->type) {
|
||||
if (cs_etm_evsel) {
|
||||
pr_err("There may be only one %s event\n",
|
||||
CORESIGHT_ETM_PMU_NAME);
|
||||
return -EINVAL;
|
||||
}
|
||||
evsel->attr.freq = 0;
|
||||
evsel->attr.sample_period = 1;
|
||||
cs_etm_evsel = evsel;
|
||||
opts->full_auxtrace = true;
|
||||
}
|
||||
}
|
||||
|
||||
/* no need to continue if at least one event of interest was found */
|
||||
if (!cs_etm_evsel)
|
||||
return 0;
|
||||
|
||||
if (opts->use_clockid) {
|
||||
pr_err("Cannot use clockid (-k option) with %s\n",
|
||||
CORESIGHT_ETM_PMU_NAME);
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
/* we are in snapshot mode */
|
||||
if (opts->auxtrace_snapshot_mode) {
|
||||
/*
|
||||
* No size were given to '-S' or '-m,', so go with
|
||||
* the default
|
||||
*/
|
||||
if (!opts->auxtrace_snapshot_size &&
|
||||
!opts->auxtrace_mmap_pages) {
|
||||
if (privileged) {
|
||||
opts->auxtrace_mmap_pages = MiB(4) / page_size;
|
||||
} else {
|
||||
opts->auxtrace_mmap_pages =
|
||||
KiB(128) / page_size;
|
||||
if (opts->mmap_pages == UINT_MAX)
|
||||
opts->mmap_pages = KiB(256) / page_size;
|
||||
}
|
||||
} else if (!opts->auxtrace_mmap_pages && !privileged &&
|
||||
opts->mmap_pages == UINT_MAX) {
|
||||
opts->mmap_pages = KiB(256) / page_size;
|
||||
}
|
||||
|
||||
/*
|
||||
* '-m,xyz' was specified but no snapshot size, so make the
|
||||
* snapshot size as big as the auxtrace mmap area.
|
||||
*/
|
||||
if (!opts->auxtrace_snapshot_size) {
|
||||
opts->auxtrace_snapshot_size =
|
||||
opts->auxtrace_mmap_pages * (size_t)page_size;
|
||||
}
|
||||
|
||||
/*
|
||||
* -Sxyz was specified but no auxtrace mmap area, so make the
|
||||
* auxtrace mmap area big enough to fit the requested snapshot
|
||||
* size.
|
||||
*/
|
||||
if (!opts->auxtrace_mmap_pages) {
|
||||
size_t sz = opts->auxtrace_snapshot_size;
|
||||
|
||||
sz = round_up(sz, page_size) / page_size;
|
||||
opts->auxtrace_mmap_pages = roundup_pow_of_two(sz);
|
||||
}
|
||||
|
||||
/* Snapshost size can't be bigger than the auxtrace area */
|
||||
if (opts->auxtrace_snapshot_size >
|
||||
opts->auxtrace_mmap_pages * (size_t)page_size) {
|
||||
pr_err("Snapshot size %zu must not be greater than AUX area tracing mmap size %zu\n",
|
||||
opts->auxtrace_snapshot_size,
|
||||
opts->auxtrace_mmap_pages * (size_t)page_size);
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
/* Something went wrong somewhere - this shouldn't happen */
|
||||
if (!opts->auxtrace_snapshot_size ||
|
||||
!opts->auxtrace_mmap_pages) {
|
||||
pr_err("Failed to calculate default snapshot size and/or AUX area tracing mmap pages\n");
|
||||
return -EINVAL;
|
||||
}
|
||||
}
|
||||
|
||||
/* We are in full trace mode but '-m,xyz' wasn't specified */
|
||||
if (opts->full_auxtrace && !opts->auxtrace_mmap_pages) {
|
||||
if (privileged) {
|
||||
opts->auxtrace_mmap_pages = MiB(4) / page_size;
|
||||
} else {
|
||||
opts->auxtrace_mmap_pages = KiB(128) / page_size;
|
||||
if (opts->mmap_pages == UINT_MAX)
|
||||
opts->mmap_pages = KiB(256) / page_size;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
/* Validate auxtrace_mmap_pages provided by user */
|
||||
if (opts->auxtrace_mmap_pages) {
|
||||
unsigned int max_page = (KiB(128) / page_size);
|
||||
size_t sz = opts->auxtrace_mmap_pages * (size_t)page_size;
|
||||
|
||||
if (!privileged &&
|
||||
opts->auxtrace_mmap_pages > max_page) {
|
||||
opts->auxtrace_mmap_pages = max_page;
|
||||
pr_err("auxtrace too big, truncating to %d\n",
|
||||
max_page);
|
||||
}
|
||||
|
||||
if (!is_power_of_2(sz)) {
|
||||
pr_err("Invalid mmap size for %s: must be a power of 2\n",
|
||||
CORESIGHT_ETM_PMU_NAME);
|
||||
return -EINVAL;
|
||||
}
|
||||
}
|
||||
|
||||
if (opts->auxtrace_snapshot_mode)
|
||||
pr_debug2("%s snapshot size: %zu\n", CORESIGHT_ETM_PMU_NAME,
|
||||
opts->auxtrace_snapshot_size);
|
||||
|
||||
if (cs_etm_evsel) {
|
||||
/*
|
||||
* To obtain the auxtrace buffer file descriptor, the auxtrace
|
||||
* event must come first.
|
||||
*/
|
||||
perf_evlist__to_front(evlist, cs_etm_evsel);
|
||||
/*
|
||||
* In the case of per-cpu mmaps, we need the CPU on the
|
||||
* AUX event.
|
||||
*/
|
||||
if (!cpu_map__empty(cpus))
|
||||
perf_evsel__set_sample_bit(cs_etm_evsel, CPU);
|
||||
}
|
||||
|
||||
/* Add dummy event to keep tracking */
|
||||
if (opts->full_auxtrace) {
|
||||
struct perf_evsel *tracking_evsel;
|
||||
int err;
|
||||
|
||||
err = parse_events(evlist, "dummy:u", NULL);
|
||||
if (err)
|
||||
return err;
|
||||
|
||||
tracking_evsel = perf_evlist__last(evlist);
|
||||
perf_evlist__set_tracking_event(evlist, tracking_evsel);
|
||||
|
||||
tracking_evsel->attr.freq = 0;
|
||||
tracking_evsel->attr.sample_period = 1;
|
||||
|
||||
/* In per-cpu case, always need the time of mmap events etc */
|
||||
if (!cpu_map__empty(cpus))
|
||||
perf_evsel__set_sample_bit(tracking_evsel, TIME);
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static u64 cs_etm_get_config(struct auxtrace_record *itr)
|
||||
{
|
||||
u64 config = 0;
|
||||
struct cs_etm_recording *ptr =
|
||||
container_of(itr, struct cs_etm_recording, itr);
|
||||
struct perf_pmu *cs_etm_pmu = ptr->cs_etm_pmu;
|
||||
struct perf_evlist *evlist = ptr->evlist;
|
||||
struct perf_evsel *evsel;
|
||||
|
||||
evlist__for_each_entry(evlist, evsel) {
|
||||
if (evsel->attr.type == cs_etm_pmu->type) {
|
||||
/*
|
||||
* Variable perf_event_attr::config is assigned to
|
||||
* ETMv3/PTM. The bit fields have been made to match
|
||||
* the ETMv3.5 ETRMCR register specification. See the
|
||||
* PMU_FORMAT_ATTR() declarations in
|
||||
* drivers/hwtracing/coresight/coresight-perf.c for
|
||||
* details.
|
||||
*/
|
||||
config = evsel->attr.config;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
return config;
|
||||
}
|
||||
|
||||
static size_t
|
||||
cs_etm_info_priv_size(struct auxtrace_record *itr __maybe_unused,
|
||||
struct perf_evlist *evlist __maybe_unused)
|
||||
{
|
||||
int i;
|
||||
int etmv3 = 0, etmv4 = 0;
|
||||
const struct cpu_map *cpus = evlist->cpus;
|
||||
|
||||
/* cpu map is not empty, we have specific CPUs to work with */
|
||||
if (!cpu_map__empty(cpus)) {
|
||||
for (i = 0; i < cpu_map__nr(cpus); i++) {
|
||||
if (cs_etm_is_etmv4(itr, cpus->map[i]))
|
||||
etmv4++;
|
||||
else
|
||||
etmv3++;
|
||||
}
|
||||
} else {
|
||||
/* get configuration for all CPUs in the system */
|
||||
for (i = 0; i < cpu__max_cpu(); i++) {
|
||||
if (cs_etm_is_etmv4(itr, i))
|
||||
etmv4++;
|
||||
else
|
||||
etmv3++;
|
||||
}
|
||||
}
|
||||
|
||||
return (CS_ETM_HEADER_SIZE +
|
||||
(etmv4 * CS_ETMV4_PRIV_SIZE) +
|
||||
(etmv3 * CS_ETMV3_PRIV_SIZE));
|
||||
}
|
||||
|
||||
static const char *metadata_etmv3_ro[CS_ETM_PRIV_MAX] = {
|
||||
[CS_ETM_ETMCCER] = "mgmt/etmccer",
|
||||
[CS_ETM_ETMIDR] = "mgmt/etmidr",
|
||||
};
|
||||
|
||||
static const char *metadata_etmv4_ro[CS_ETMV4_PRIV_MAX] = {
|
||||
[CS_ETMV4_TRCIDR0] = "trcidr/trcidr0",
|
||||
[CS_ETMV4_TRCIDR1] = "trcidr/trcidr1",
|
||||
[CS_ETMV4_TRCIDR2] = "trcidr/trcidr2",
|
||||
[CS_ETMV4_TRCIDR8] = "trcidr/trcidr8",
|
||||
[CS_ETMV4_TRCAUTHSTATUS] = "mgmt/trcauthstatus",
|
||||
};
|
||||
|
||||
static bool cs_etm_is_etmv4(struct auxtrace_record *itr, int cpu)
|
||||
{
|
||||
bool ret = false;
|
||||
char path[PATH_MAX];
|
||||
int scan;
|
||||
unsigned int val;
|
||||
struct cs_etm_recording *ptr =
|
||||
container_of(itr, struct cs_etm_recording, itr);
|
||||
struct perf_pmu *cs_etm_pmu = ptr->cs_etm_pmu;
|
||||
|
||||
/* Take any of the RO files for ETMv4 and see if it present */
|
||||
snprintf(path, PATH_MAX, "cpu%d/%s",
|
||||
cpu, metadata_etmv4_ro[CS_ETMV4_TRCIDR0]);
|
||||
scan = perf_pmu__scan_file(cs_etm_pmu, path, "%x", &val);
|
||||
|
||||
/* The file was read successfully, we have a winner */
|
||||
if (scan == 1)
|
||||
ret = true;
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
static int cs_etm_get_ro(struct perf_pmu *pmu, int cpu, const char *path)
|
||||
{
|
||||
char pmu_path[PATH_MAX];
|
||||
int scan;
|
||||
unsigned int val = 0;
|
||||
|
||||
/* Get RO metadata from sysfs */
|
||||
snprintf(pmu_path, PATH_MAX, "cpu%d/%s", cpu, path);
|
||||
|
||||
scan = perf_pmu__scan_file(pmu, pmu_path, "%x", &val);
|
||||
if (scan != 1)
|
||||
pr_err("%s: error reading: %s\n", __func__, pmu_path);
|
||||
|
||||
return val;
|
||||
}
|
||||
|
||||
static void cs_etm_get_metadata(int cpu, u32 *offset,
|
||||
struct auxtrace_record *itr,
|
||||
struct auxtrace_info_event *info)
|
||||
{
|
||||
u32 increment;
|
||||
u64 magic;
|
||||
struct cs_etm_recording *ptr =
|
||||
container_of(itr, struct cs_etm_recording, itr);
|
||||
struct perf_pmu *cs_etm_pmu = ptr->cs_etm_pmu;
|
||||
|
||||
/* first see what kind of tracer this cpu is affined to */
|
||||
if (cs_etm_is_etmv4(itr, cpu)) {
|
||||
magic = __perf_cs_etmv4_magic;
|
||||
/* Get trace configuration register */
|
||||
info->priv[*offset + CS_ETMV4_TRCCONFIGR] =
|
||||
cs_etm_get_config(itr);
|
||||
/* Get traceID from the framework */
|
||||
info->priv[*offset + CS_ETMV4_TRCTRACEIDR] =
|
||||
coresight_get_trace_id(cpu);
|
||||
/* Get read-only information from sysFS */
|
||||
info->priv[*offset + CS_ETMV4_TRCIDR0] =
|
||||
cs_etm_get_ro(cs_etm_pmu, cpu,
|
||||
metadata_etmv4_ro[CS_ETMV4_TRCIDR0]);
|
||||
info->priv[*offset + CS_ETMV4_TRCIDR1] =
|
||||
cs_etm_get_ro(cs_etm_pmu, cpu,
|
||||
metadata_etmv4_ro[CS_ETMV4_TRCIDR1]);
|
||||
info->priv[*offset + CS_ETMV4_TRCIDR2] =
|
||||
cs_etm_get_ro(cs_etm_pmu, cpu,
|
||||
metadata_etmv4_ro[CS_ETMV4_TRCIDR2]);
|
||||
info->priv[*offset + CS_ETMV4_TRCIDR8] =
|
||||
cs_etm_get_ro(cs_etm_pmu, cpu,
|
||||
metadata_etmv4_ro[CS_ETMV4_TRCIDR8]);
|
||||
info->priv[*offset + CS_ETMV4_TRCAUTHSTATUS] =
|
||||
cs_etm_get_ro(cs_etm_pmu, cpu,
|
||||
metadata_etmv4_ro
|
||||
[CS_ETMV4_TRCAUTHSTATUS]);
|
||||
|
||||
/* How much space was used */
|
||||
increment = CS_ETMV4_PRIV_MAX;
|
||||
} else {
|
||||
magic = __perf_cs_etmv3_magic;
|
||||
/* Get configuration register */
|
||||
info->priv[*offset + CS_ETM_ETMCR] = cs_etm_get_config(itr);
|
||||
/* Get traceID from the framework */
|
||||
info->priv[*offset + CS_ETM_ETMTRACEIDR] =
|
||||
coresight_get_trace_id(cpu);
|
||||
/* Get read-only information from sysFS */
|
||||
info->priv[*offset + CS_ETM_ETMCCER] =
|
||||
cs_etm_get_ro(cs_etm_pmu, cpu,
|
||||
metadata_etmv3_ro[CS_ETM_ETMCCER]);
|
||||
info->priv[*offset + CS_ETM_ETMIDR] =
|
||||
cs_etm_get_ro(cs_etm_pmu, cpu,
|
||||
metadata_etmv3_ro[CS_ETM_ETMIDR]);
|
||||
|
||||
/* How much space was used */
|
||||
increment = CS_ETM_PRIV_MAX;
|
||||
}
|
||||
|
||||
/* Build generic header portion */
|
||||
info->priv[*offset + CS_ETM_MAGIC] = magic;
|
||||
info->priv[*offset + CS_ETM_CPU] = cpu;
|
||||
/* Where the next CPU entry should start from */
|
||||
*offset += increment;
|
||||
}
|
||||
|
||||
static int cs_etm_info_fill(struct auxtrace_record *itr,
|
||||
struct perf_session *session,
|
||||
struct auxtrace_info_event *info,
|
||||
size_t priv_size)
|
||||
{
|
||||
int i;
|
||||
u32 offset;
|
||||
u64 nr_cpu, type;
|
||||
const struct cpu_map *cpus = session->evlist->cpus;
|
||||
struct cs_etm_recording *ptr =
|
||||
container_of(itr, struct cs_etm_recording, itr);
|
||||
struct perf_pmu *cs_etm_pmu = ptr->cs_etm_pmu;
|
||||
|
||||
if (priv_size != cs_etm_info_priv_size(itr, session->evlist))
|
||||
return -EINVAL;
|
||||
|
||||
if (!session->evlist->nr_mmaps)
|
||||
return -EINVAL;
|
||||
|
||||
/* If the cpu_map is empty all CPUs are involved */
|
||||
nr_cpu = cpu_map__empty(cpus) ? cpu__max_cpu() : cpu_map__nr(cpus);
|
||||
/* Get PMU type as dynamically assigned by the core */
|
||||
type = cs_etm_pmu->type;
|
||||
|
||||
/* First fill out the session header */
|
||||
info->type = PERF_AUXTRACE_CS_ETM;
|
||||
info->priv[CS_HEADER_VERSION_0] = 0;
|
||||
info->priv[CS_PMU_TYPE_CPUS] = type << 32;
|
||||
info->priv[CS_PMU_TYPE_CPUS] |= nr_cpu;
|
||||
info->priv[CS_ETM_SNAPSHOT] = ptr->snapshot_mode;
|
||||
|
||||
offset = CS_ETM_SNAPSHOT + 1;
|
||||
|
||||
/* cpu map is not empty, we have specific CPUs to work with */
|
||||
if (!cpu_map__empty(cpus)) {
|
||||
for (i = 0; i < cpu_map__nr(cpus) && offset < priv_size; i++)
|
||||
cs_etm_get_metadata(cpus->map[i], &offset, itr, info);
|
||||
} else {
|
||||
/* get configuration for all CPUs in the system */
|
||||
for (i = 0; i < cpu__max_cpu(); i++)
|
||||
cs_etm_get_metadata(i, &offset, itr, info);
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int cs_etm_find_snapshot(struct auxtrace_record *itr __maybe_unused,
|
||||
int idx, struct auxtrace_mmap *mm,
|
||||
unsigned char *data __maybe_unused,
|
||||
u64 *head, u64 *old)
|
||||
{
|
||||
pr_debug3("%s: mmap index %d old head %zu new head %zu size %zu\n",
|
||||
__func__, idx, (size_t)*old, (size_t)*head, mm->len);
|
||||
|
||||
*old = *head;
|
||||
*head += mm->len;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int cs_etm_snapshot_start(struct auxtrace_record *itr)
|
||||
{
|
||||
struct cs_etm_recording *ptr =
|
||||
container_of(itr, struct cs_etm_recording, itr);
|
||||
struct perf_evsel *evsel;
|
||||
|
||||
evlist__for_each_entry(ptr->evlist, evsel) {
|
||||
if (evsel->attr.type == ptr->cs_etm_pmu->type)
|
||||
return perf_evsel__disable(evsel);
|
||||
}
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
static int cs_etm_snapshot_finish(struct auxtrace_record *itr)
|
||||
{
|
||||
struct cs_etm_recording *ptr =
|
||||
container_of(itr, struct cs_etm_recording, itr);
|
||||
struct perf_evsel *evsel;
|
||||
|
||||
evlist__for_each_entry(ptr->evlist, evsel) {
|
||||
if (evsel->attr.type == ptr->cs_etm_pmu->type)
|
||||
return perf_evsel__enable(evsel);
|
||||
}
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
static u64 cs_etm_reference(struct auxtrace_record *itr __maybe_unused)
|
||||
{
|
||||
return (((u64) rand() << 0) & 0x00000000FFFFFFFFull) |
|
||||
(((u64) rand() << 32) & 0xFFFFFFFF00000000ull);
|
||||
}
|
||||
|
||||
static void cs_etm_recording_free(struct auxtrace_record *itr)
|
||||
{
|
||||
struct cs_etm_recording *ptr =
|
||||
container_of(itr, struct cs_etm_recording, itr);
|
||||
free(ptr);
|
||||
}
|
||||
|
||||
static int cs_etm_read_finish(struct auxtrace_record *itr, int idx)
|
||||
{
|
||||
struct cs_etm_recording *ptr =
|
||||
container_of(itr, struct cs_etm_recording, itr);
|
||||
struct perf_evsel *evsel;
|
||||
|
||||
evlist__for_each_entry(ptr->evlist, evsel) {
|
||||
if (evsel->attr.type == ptr->cs_etm_pmu->type)
|
||||
return perf_evlist__enable_event_idx(ptr->evlist,
|
||||
evsel, idx);
|
||||
}
|
||||
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
struct auxtrace_record *cs_etm_record_init(int *err)
|
||||
{
|
||||
struct perf_pmu *cs_etm_pmu;
|
||||
struct cs_etm_recording *ptr;
|
||||
|
||||
cs_etm_pmu = perf_pmu__find(CORESIGHT_ETM_PMU_NAME);
|
||||
|
||||
if (!cs_etm_pmu) {
|
||||
*err = -EINVAL;
|
||||
goto out;
|
||||
}
|
||||
|
||||
ptr = zalloc(sizeof(struct cs_etm_recording));
|
||||
if (!ptr) {
|
||||
*err = -ENOMEM;
|
||||
goto out;
|
||||
}
|
||||
|
||||
ptr->cs_etm_pmu = cs_etm_pmu;
|
||||
ptr->itr.parse_snapshot_options = cs_etm_parse_snapshot_options;
|
||||
ptr->itr.recording_options = cs_etm_recording_options;
|
||||
ptr->itr.info_priv_size = cs_etm_info_priv_size;
|
||||
ptr->itr.info_fill = cs_etm_info_fill;
|
||||
ptr->itr.find_snapshot = cs_etm_find_snapshot;
|
||||
ptr->itr.snapshot_start = cs_etm_snapshot_start;
|
||||
ptr->itr.snapshot_finish = cs_etm_snapshot_finish;
|
||||
ptr->itr.reference = cs_etm_reference;
|
||||
ptr->itr.free = cs_etm_recording_free;
|
||||
ptr->itr.read_finish = cs_etm_read_finish;
|
||||
|
||||
*err = 0;
|
||||
return &ptr->itr;
|
||||
out:
|
||||
return NULL;
|
||||
}
|
||||
|
||||
static FILE *cs_device__open_file(const char *name)
|
||||
{
|
||||
struct stat st;
|
||||
char path[PATH_MAX];
|
||||
const char *sysfs;
|
||||
|
||||
sysfs = sysfs__mountpoint();
|
||||
if (!sysfs)
|
||||
return NULL;
|
||||
|
||||
snprintf(path, PATH_MAX,
|
||||
"%s" CS_BUS_DEVICE_PATH "%s", sysfs, name);
|
||||
|
||||
printf("path: %s\n", path);
|
||||
|
||||
if (stat(path, &st) < 0)
|
||||
return NULL;
|
||||
|
||||
return fopen(path, "w");
|
||||
|
||||
}
|
||||
|
||||
static __attribute__((format(printf, 2, 3)))
|
||||
int cs_device__print_file(const char *name, const char *fmt, ...)
|
||||
{
|
||||
va_list args;
|
||||
FILE *file;
|
||||
int ret = -EINVAL;
|
||||
|
||||
va_start(args, fmt);
|
||||
file = cs_device__open_file(name);
|
||||
if (file) {
|
||||
ret = vfprintf(file, fmt, args);
|
||||
fclose(file);
|
||||
}
|
||||
va_end(args);
|
||||
return ret;
|
||||
}
|
||||
|
||||
int cs_etm_set_drv_config(struct perf_evsel_config_term *term)
|
||||
{
|
||||
int ret;
|
||||
char enable_sink[ENABLE_SINK_MAX];
|
||||
|
||||
snprintf(enable_sink, ENABLE_SINK_MAX, "%s/%s",
|
||||
term->val.drv_cfg, "enable_sink");
|
||||
|
||||
ret = cs_device__print_file(enable_sink, "%d", 1);
|
||||
if (ret < 0)
|
||||
return ret;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
|
@ -0,0 +1,26 @@
|
|||
/*
|
||||
* Copyright(C) 2015 Linaro Limited. All rights reserved.
|
||||
* Author: Mathieu Poirier <mathieu.poirier@linaro.org>
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify it
|
||||
* under the terms of the GNU General Public License version 2 as published by
|
||||
* the Free Software Foundation.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful, but WITHOUT
|
||||
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
|
||||
* more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License along with
|
||||
* this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#ifndef INCLUDE__PERF_CS_ETM_H__
|
||||
#define INCLUDE__PERF_CS_ETM_H__
|
||||
|
||||
#include "../../util/evsel.h"
|
||||
|
||||
struct auxtrace_record *cs_etm_record_init(int *err);
|
||||
int cs_etm_set_drv_config(struct perf_evsel_config_term *term);
|
||||
|
||||
#endif
|
||||
|
|
@ -0,0 +1,36 @@
|
|||
/*
|
||||
* Copyright(C) 2015 Linaro Limited. All rights reserved.
|
||||
* Author: Mathieu Poirier <mathieu.poirier@linaro.org>
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify it
|
||||
* under the terms of the GNU General Public License version 2 as published by
|
||||
* the Free Software Foundation.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful, but WITHOUT
|
||||
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
|
||||
* more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License along with
|
||||
* this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#include <string.h>
|
||||
#include <linux/coresight-pmu.h>
|
||||
#include <linux/perf_event.h>
|
||||
|
||||
#include "cs-etm.h"
|
||||
#include "../../util/pmu.h"
|
||||
|
||||
struct perf_event_attr
|
||||
*perf_pmu__get_default_config(struct perf_pmu *pmu __maybe_unused)
|
||||
{
|
||||
#ifdef HAVE_AUXTRACE_SUPPORT
|
||||
if (!strcmp(pmu->name, CORESIGHT_ETM_PMU_NAME)) {
|
||||
/* add ETM default config here */
|
||||
pmu->selectable = true;
|
||||
pmu->set_drv_config = cs_etm_set_drv_config;
|
||||
}
|
||||
#endif
|
||||
return NULL;
|
||||
}
|
||||
|
|
@ -1,2 +1,6 @@
|
|||
libperf-$(CONFIG_DWARF) += dwarf-regs.o
|
||||
libperf-$(CONFIG_LOCAL_LIBUNWIND) += unwind-libunwind.o
|
||||
|
||||
libperf-$(CONFIG_AUXTRACE) += ../../arm/util/pmu.o \
|
||||
../../arm/util/auxtrace.o \
|
||||
../../arm/util/cs-etm.o
|
||||
|
|
|
|||
|
|
@ -22,6 +22,7 @@
|
|||
#include "util/evlist.h"
|
||||
#include "util/evsel.h"
|
||||
#include "util/debug.h"
|
||||
#include "util/drv_configs.h"
|
||||
#include "util/session.h"
|
||||
#include "util/tool.h"
|
||||
#include "util/symbol.h"
|
||||
|
|
@ -383,6 +384,7 @@ static int record__open(struct record *rec)
|
|||
struct perf_evlist *evlist = rec->evlist;
|
||||
struct perf_session *session = rec->session;
|
||||
struct record_opts *opts = &rec->opts;
|
||||
struct perf_evsel_config_term *err_term;
|
||||
int rc = 0;
|
||||
|
||||
perf_evlist__config(evlist, opts, &callchain_param);
|
||||
|
|
@ -412,6 +414,14 @@ try_again:
|
|||
goto out;
|
||||
}
|
||||
|
||||
if (perf_evlist__apply_drv_configs(evlist, &pos, &err_term)) {
|
||||
error("failed to set config \"%s\" on event %s with %d (%s)\n",
|
||||
err_term->val.drv_cfg, perf_evsel__name(pos), errno,
|
||||
str_error_r(errno, msg, sizeof(msg)));
|
||||
rc = -1;
|
||||
goto out;
|
||||
}
|
||||
|
||||
rc = record__mmap(rec);
|
||||
if (rc)
|
||||
goto out;
|
||||
|
|
|
|||
|
|
@ -52,6 +52,7 @@
|
|||
#include "util/evlist.h"
|
||||
#include "util/evsel.h"
|
||||
#include "util/debug.h"
|
||||
#include "util/drv_configs.h"
|
||||
#include "util/color.h"
|
||||
#include "util/stat.h"
|
||||
#include "util/header.h"
|
||||
|
|
@ -540,6 +541,7 @@ static int __run_perf_stat(int argc, const char **argv)
|
|||
int status = 0;
|
||||
const bool forks = (argc > 0);
|
||||
bool is_pipe = STAT_RECORD ? perf_stat.file.is_pipe : false;
|
||||
struct perf_evsel_config_term *err_term;
|
||||
|
||||
if (interval) {
|
||||
ts.tv_sec = interval / USEC_PER_MSEC;
|
||||
|
|
@ -611,6 +613,13 @@ try_again:
|
|||
return -1;
|
||||
}
|
||||
|
||||
if (perf_evlist__apply_drv_configs(evsel_list, &counter, &err_term)) {
|
||||
error("failed to set config \"%s\" on event %s with %d (%s)\n",
|
||||
err_term->val.drv_cfg, perf_evsel__name(counter), errno,
|
||||
str_error_r(errno, msg, sizeof(msg)));
|
||||
return -1;
|
||||
}
|
||||
|
||||
if (STAT_RECORD) {
|
||||
int err, fd = perf_data_file__fd(&perf_stat.file);
|
||||
|
||||
|
|
|
|||
|
|
@ -24,6 +24,7 @@
|
|||
#include "util/annotate.h"
|
||||
#include "util/config.h"
|
||||
#include "util/color.h"
|
||||
#include "util/drv_configs.h"
|
||||
#include "util/evlist.h"
|
||||
#include "util/evsel.h"
|
||||
#include "util/machine.h"
|
||||
|
|
@ -913,6 +914,10 @@ static int callchain_param__setup_sample_type(struct callchain_param *callchain)
|
|||
|
||||
static int __cmd_top(struct perf_top *top)
|
||||
{
|
||||
char msg[512];
|
||||
struct perf_evsel *pos;
|
||||
struct perf_evsel_config_term *err_term;
|
||||
struct perf_evlist *evlist = top->evlist;
|
||||
struct record_opts *opts = &top->record_opts;
|
||||
pthread_t thread;
|
||||
int ret;
|
||||
|
|
@ -947,6 +952,14 @@ static int __cmd_top(struct perf_top *top)
|
|||
if (ret)
|
||||
goto out_delete;
|
||||
|
||||
ret = perf_evlist__apply_drv_configs(evlist, &pos, &err_term);
|
||||
if (ret) {
|
||||
error("failed to set config \"%s\" on event %s with %d (%s)\n",
|
||||
err_term->val.drv_cfg, perf_evsel__name(pos), errno,
|
||||
str_error_r(errno, msg, sizeof(msg)));
|
||||
goto out_delete;
|
||||
}
|
||||
|
||||
top->session->evlist = top->evlist;
|
||||
perf_session__set_id_hdr_size(top->session);
|
||||
|
||||
|
|
|
|||
|
|
@ -1080,7 +1080,7 @@ struct hpp_arg {
|
|||
bool current_entry;
|
||||
};
|
||||
|
||||
static int __hpp__slsmg_color_printf(struct perf_hpp *hpp, const char *fmt, ...)
|
||||
int __hpp__slsmg_color_printf(struct perf_hpp *hpp, const char *fmt, ...)
|
||||
{
|
||||
struct hpp_arg *arg = hpp->ptr;
|
||||
int ret, len;
|
||||
|
|
|
|||
|
|
@ -237,7 +237,7 @@ static int hpp__header_fn(struct perf_hpp_fmt *fmt, struct perf_hpp *hpp,
|
|||
return scnprintf(hpp->buf, hpp->size, "%*s", len, fmt->name);
|
||||
}
|
||||
|
||||
static int hpp_color_scnprintf(struct perf_hpp *hpp, const char *fmt, ...)
|
||||
int hpp_color_scnprintf(struct perf_hpp *hpp, const char *fmt, ...)
|
||||
{
|
||||
va_list args;
|
||||
ssize_t ssize = hpp->size;
|
||||
|
|
|
|||
|
|
@ -373,7 +373,8 @@ static size_t hist_entry_callchain__fprintf(struct hist_entry *he,
|
|||
return 0;
|
||||
}
|
||||
|
||||
static int hist_entry__snprintf(struct hist_entry *he, struct perf_hpp *hpp)
|
||||
int __hist_entry__snprintf(struct hist_entry *he, struct perf_hpp *hpp,
|
||||
struct perf_hpp_list *hpp_list)
|
||||
{
|
||||
const char *sep = symbol_conf.field_sep;
|
||||
struct perf_hpp_fmt *fmt;
|
||||
|
|
@ -384,7 +385,7 @@ static int hist_entry__snprintf(struct hist_entry *he, struct perf_hpp *hpp)
|
|||
if (symbol_conf.exclude_other && !he->parent)
|
||||
return 0;
|
||||
|
||||
hists__for_each_format(he->hists, fmt) {
|
||||
perf_hpp_list__for_each_format(hpp_list, fmt) {
|
||||
if (perf_hpp__should_skip(fmt, he->hists))
|
||||
continue;
|
||||
|
||||
|
|
@ -410,6 +411,11 @@ static int hist_entry__snprintf(struct hist_entry *he, struct perf_hpp *hpp)
|
|||
return hpp->buf - start;
|
||||
}
|
||||
|
||||
static int hist_entry__snprintf(struct hist_entry *he, struct perf_hpp *hpp)
|
||||
{
|
||||
return __hist_entry__snprintf(he, hpp, he->hists->hpp_list);
|
||||
}
|
||||
|
||||
static int hist_entry__hierarchy_fprintf(struct hist_entry *he,
|
||||
struct perf_hpp *hpp,
|
||||
struct hists *hists,
|
||||
|
|
@ -696,9 +702,9 @@ hists__fprintf_standard_headers(struct hists *hists,
|
|||
return hpp_list->nr_header_lines + 2;
|
||||
}
|
||||
|
||||
static int hists__fprintf_headers(struct hists *hists, FILE *fp)
|
||||
int hists__fprintf_headers(struct hists *hists, FILE *fp)
|
||||
{
|
||||
char bf[96];
|
||||
char bf[1024];
|
||||
struct perf_hpp dummy_hpp = {
|
||||
.buf = bf,
|
||||
.size = sizeof(bf),
|
||||
|
|
|
|||
|
|
@ -86,6 +86,7 @@ libperf-y += term.o
|
|||
libperf-y += help-unknown-cmd.o
|
||||
libperf-y += mem-events.o
|
||||
libperf-y += vsprintf.o
|
||||
libperf-y += drv_configs.o
|
||||
|
||||
libperf-$(CONFIG_LIBBPF) += bpf-loader.o
|
||||
libperf-$(CONFIG_BPF_PROLOGUE) += bpf-prologue.o
|
||||
|
|
|
|||
|
|
@ -892,6 +892,7 @@ int perf_event__process_auxtrace_info(struct perf_tool *tool __maybe_unused,
|
|||
return intel_pt_process_auxtrace_info(event, session);
|
||||
case PERF_AUXTRACE_INTEL_BTS:
|
||||
return intel_bts_process_auxtrace_info(event, session);
|
||||
case PERF_AUXTRACE_CS_ETM:
|
||||
case PERF_AUXTRACE_UNKNOWN:
|
||||
default:
|
||||
return -EINVAL;
|
||||
|
|
|
|||
|
|
@ -41,6 +41,7 @@ enum auxtrace_type {
|
|||
PERF_AUXTRACE_UNKNOWN,
|
||||
PERF_AUXTRACE_INTEL_PT,
|
||||
PERF_AUXTRACE_INTEL_BTS,
|
||||
PERF_AUXTRACE_CS_ETM,
|
||||
};
|
||||
|
||||
enum itrace_period_type {
|
||||
|
|
|
|||
|
|
@ -0,0 +1,74 @@
|
|||
/*
|
||||
* Copyright(C) 2015 Linaro Limited. All rights reserved.
|
||||
* Author: Mathieu Poirier <mathieu.poirier@linaro.org>
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify it
|
||||
* under the terms of the GNU General Public License version 2 as published by
|
||||
* the Free Software Foundation.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful, but WITHOUT
|
||||
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
|
||||
* more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License along with
|
||||
* this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#ifndef INCLUDE__UTIL_PERF_CS_ETM_H__
|
||||
#define INCLUDE__UTIL_PERF_CS_ETM_H__
|
||||
|
||||
/* Versionning header in case things need tro change in the future. That way
|
||||
* decoding of old snapshot is still possible.
|
||||
*/
|
||||
enum {
|
||||
/* Starting with 0x0 */
|
||||
CS_HEADER_VERSION_0,
|
||||
/* PMU->type (32 bit), total # of CPUs (32 bit) */
|
||||
CS_PMU_TYPE_CPUS,
|
||||
CS_ETM_SNAPSHOT,
|
||||
CS_HEADER_VERSION_0_MAX,
|
||||
};
|
||||
|
||||
/* Beginning of header common to both ETMv3 and V4 */
|
||||
enum {
|
||||
CS_ETM_MAGIC,
|
||||
CS_ETM_CPU,
|
||||
};
|
||||
|
||||
/* ETMv3/PTM metadata */
|
||||
enum {
|
||||
/* Dynamic, configurable parameters */
|
||||
CS_ETM_ETMCR = CS_ETM_CPU + 1,
|
||||
CS_ETM_ETMTRACEIDR,
|
||||
/* RO, taken from sysFS */
|
||||
CS_ETM_ETMCCER,
|
||||
CS_ETM_ETMIDR,
|
||||
CS_ETM_PRIV_MAX,
|
||||
};
|
||||
|
||||
/* ETMv4 metadata */
|
||||
enum {
|
||||
/* Dynamic, configurable parameters */
|
||||
CS_ETMV4_TRCCONFIGR = CS_ETM_CPU + 1,
|
||||
CS_ETMV4_TRCTRACEIDR,
|
||||
/* RO, taken from sysFS */
|
||||
CS_ETMV4_TRCIDR0,
|
||||
CS_ETMV4_TRCIDR1,
|
||||
CS_ETMV4_TRCIDR2,
|
||||
CS_ETMV4_TRCIDR8,
|
||||
CS_ETMV4_TRCAUTHSTATUS,
|
||||
CS_ETMV4_PRIV_MAX,
|
||||
};
|
||||
|
||||
#define KiB(x) ((x) * 1024)
|
||||
#define MiB(x) ((x) * 1024 * 1024)
|
||||
|
||||
#define CS_ETM_HEADER_SIZE (CS_HEADER_VERSION_0_MAX * sizeof(u64))
|
||||
|
||||
static const u64 __perf_cs_etmv3_magic = 0x3030303030303030ULL;
|
||||
static const u64 __perf_cs_etmv4_magic = 0x4040404040404040ULL;
|
||||
#define CS_ETMV3_PRIV_SIZE (CS_ETM_PRIV_MAX * sizeof(u64))
|
||||
#define CS_ETMV4_PRIV_SIZE (CS_ETMV4_PRIV_MAX * sizeof(u64))
|
||||
|
||||
#endif
|
||||
|
|
@ -0,0 +1,77 @@
|
|||
/*
|
||||
* drv_configs.h: Interface to apply PMU specific configuration
|
||||
* Copyright (c) 2016-2018, Linaro Ltd.
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify it
|
||||
* under the terms and conditions of the GNU General Public License,
|
||||
* version 2, as published by the Free Software Foundation.
|
||||
*
|
||||
* This program is distributed in the hope it will be useful, but WITHOUT
|
||||
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
|
||||
* more details.
|
||||
*
|
||||
*/
|
||||
|
||||
#include "drv_configs.h"
|
||||
#include "evlist.h"
|
||||
#include "evsel.h"
|
||||
#include "pmu.h"
|
||||
|
||||
static int
|
||||
perf_evsel__apply_drv_configs(struct perf_evsel *evsel,
|
||||
struct perf_evsel_config_term **err_term)
|
||||
{
|
||||
bool found = false;
|
||||
int err = 0;
|
||||
struct perf_evsel_config_term *term;
|
||||
struct perf_pmu *pmu = NULL;
|
||||
|
||||
while ((pmu = perf_pmu__scan(pmu)) != NULL)
|
||||
if (pmu->type == evsel->attr.type) {
|
||||
found = true;
|
||||
break;
|
||||
}
|
||||
|
||||
list_for_each_entry(term, &evsel->config_terms, list) {
|
||||
if (term->type != PERF_EVSEL__CONFIG_TERM_DRV_CFG)
|
||||
continue;
|
||||
|
||||
/*
|
||||
* We have a configuration term, report an error if we
|
||||
* can't find the PMU or if the PMU driver doesn't support
|
||||
* cmd line driver configuration.
|
||||
*/
|
||||
if (!found || !pmu->set_drv_config) {
|
||||
err = -EINVAL;
|
||||
*err_term = term;
|
||||
break;
|
||||
}
|
||||
|
||||
err = pmu->set_drv_config(term);
|
||||
if (err) {
|
||||
*err_term = term;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
return err;
|
||||
}
|
||||
|
||||
int perf_evlist__apply_drv_configs(struct perf_evlist *evlist,
|
||||
struct perf_evsel **err_evsel,
|
||||
struct perf_evsel_config_term **err_term)
|
||||
{
|
||||
struct perf_evsel *evsel;
|
||||
int err = 0;
|
||||
|
||||
evlist__for_each_entry(evlist, evsel) {
|
||||
err = perf_evsel__apply_drv_configs(evsel, err_term);
|
||||
if (err) {
|
||||
*err_evsel = evsel;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
return err;
|
||||
}
|
||||
|
|
@ -0,0 +1,26 @@
|
|||
/*
|
||||
* drv_configs.h: Interface to apply PMU specific configuration
|
||||
* Copyright (c) 2016-2018, Linaro Ltd.
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify it
|
||||
* under the terms and conditions of the GNU General Public License,
|
||||
* version 2, as published by the Free Software Foundation.
|
||||
*
|
||||
* This program is distributed in the hope it will be useful, but WITHOUT
|
||||
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
|
||||
* more details.
|
||||
*
|
||||
*/
|
||||
|
||||
#ifndef __PERF_DRV_CONFIGS_H
|
||||
#define __PERF_DRV_CONFIGS_H
|
||||
|
||||
#include "drv_configs.h"
|
||||
#include "evlist.h"
|
||||
#include "evsel.h"
|
||||
|
||||
int perf_evlist__apply_drv_configs(struct perf_evlist *evlist,
|
||||
struct perf_evsel **err_evsel,
|
||||
struct perf_evsel_config_term **term);
|
||||
#endif
|
||||
|
|
@ -1728,7 +1728,6 @@ int perf_evsel__parse_sample(struct perf_evsel *evsel, union perf_event *event,
|
|||
data->cpu = data->pid = data->tid = -1;
|
||||
data->stream_id = data->id = data->time = -1ULL;
|
||||
data->period = evsel->attr.sample_period;
|
||||
data->weight = 0;
|
||||
data->cpumode = event->header.misc & PERF_RECORD_MISC_CPUMODE_MASK;
|
||||
|
||||
if (event->header.type != PERF_RECORD_SAMPLE) {
|
||||
|
|
@ -1935,7 +1934,6 @@ int perf_evsel__parse_sample(struct perf_evsel *evsel, union perf_event *event,
|
|||
}
|
||||
}
|
||||
|
||||
data->weight = 0;
|
||||
if (type & PERF_SAMPLE_WEIGHT) {
|
||||
OVERFLOW_CHECK_u64(array);
|
||||
data->weight = *array;
|
||||
|
|
|
|||
|
|
@ -485,5 +485,10 @@ static inline struct rb_node *rb_hierarchy_next(struct rb_node *node)
|
|||
#define HIERARCHY_INDENT 3
|
||||
|
||||
bool hist_entry__has_hierarchy_children(struct hist_entry *he, float limit);
|
||||
int hpp_color_scnprintf(struct perf_hpp *hpp, const char *fmt, ...);
|
||||
int __hpp__slsmg_color_printf(struct perf_hpp *hpp, const char *fmt, ...);
|
||||
int __hist_entry__snprintf(struct hist_entry *he, struct perf_hpp *hpp,
|
||||
struct perf_hpp_list *hpp_list);
|
||||
int hists__fprintf_headers(struct hists *hists, FILE *fp);
|
||||
|
||||
#endif /* __PERF_HIST_H */
|
||||
|
|
|
|||
|
|
@ -4,6 +4,7 @@
|
|||
#include <linux/bitmap.h>
|
||||
#include <linux/perf_event.h>
|
||||
#include <stdbool.h>
|
||||
#include "evsel.h"
|
||||
#include "parse-events.h"
|
||||
|
||||
enum {
|
||||
|
|
@ -25,6 +26,7 @@ struct perf_pmu {
|
|||
struct list_head format; /* HEAD struct perf_pmu_format -> list */
|
||||
struct list_head aliases; /* HEAD struct perf_pmu_alias -> list */
|
||||
struct list_head list; /* ELEM */
|
||||
int (*set_drv_config) (struct perf_evsel_config_term *term);
|
||||
};
|
||||
|
||||
struct perf_pmu_info {
|
||||
|
|
|
|||
|
|
@ -867,7 +867,7 @@ struct sort_entry sort_cycles = {
|
|||
};
|
||||
|
||||
/* --sort daddr_sym */
|
||||
static int64_t
|
||||
int64_t
|
||||
sort__daddr_cmp(struct hist_entry *left, struct hist_entry *right)
|
||||
{
|
||||
uint64_t l = 0, r = 0;
|
||||
|
|
@ -896,7 +896,7 @@ static int hist_entry__daddr_snprintf(struct hist_entry *he, char *bf,
|
|||
width);
|
||||
}
|
||||
|
||||
static int64_t
|
||||
int64_t
|
||||
sort__iaddr_cmp(struct hist_entry *left, struct hist_entry *right)
|
||||
{
|
||||
uint64_t l = 0, r = 0;
|
||||
|
|
@ -1062,7 +1062,7 @@ static int hist_entry__snoop_snprintf(struct hist_entry *he, char *bf,
|
|||
return repsep_snprintf(bf, size, "%-*s", width, out);
|
||||
}
|
||||
|
||||
static int64_t
|
||||
int64_t
|
||||
sort__dcacheline_cmp(struct hist_entry *left, struct hist_entry *right)
|
||||
{
|
||||
u64 l, r;
|
||||
|
|
@ -2308,9 +2308,9 @@ int hpp_dimension__add_output(unsigned col)
|
|||
return __hpp_dimension__add_output(&perf_hpp_list, &hpp_sort_dimensions[col]);
|
||||
}
|
||||
|
||||
static int sort_dimension__add(struct perf_hpp_list *list, const char *tok,
|
||||
struct perf_evlist *evlist,
|
||||
int level)
|
||||
int sort_dimension__add(struct perf_hpp_list *list, const char *tok,
|
||||
struct perf_evlist *evlist,
|
||||
int level)
|
||||
{
|
||||
unsigned int i;
|
||||
|
||||
|
|
@ -2685,7 +2685,7 @@ void sort__setup_elide(FILE *output)
|
|||
}
|
||||
}
|
||||
|
||||
static int output_field_add(struct perf_hpp_list *list, char *tok)
|
||||
int output_field_add(struct perf_hpp_list *list, char *tok)
|
||||
{
|
||||
unsigned int i;
|
||||
|
||||
|
|
@ -2748,7 +2748,7 @@ static int setup_output_list(struct perf_hpp_list *list, char *str)
|
|||
return ret;
|
||||
}
|
||||
|
||||
static void reset_dimensions(void)
|
||||
void reset_dimensions(void)
|
||||
{
|
||||
unsigned int i;
|
||||
|
||||
|
|
|
|||
|
|
@ -269,4 +269,15 @@ int report_parse_ignore_callees_opt(const struct option *opt, const char *arg, i
|
|||
bool is_strict_order(const char *order);
|
||||
|
||||
int hpp_dimension__add_output(unsigned col);
|
||||
void reset_dimensions(void);
|
||||
int sort_dimension__add(struct perf_hpp_list *list, const char *tok,
|
||||
struct perf_evlist *evlist,
|
||||
int level);
|
||||
int output_field_add(struct perf_hpp_list *list, char *tok);
|
||||
int64_t
|
||||
sort__iaddr_cmp(struct hist_entry *left, struct hist_entry *right);
|
||||
int64_t
|
||||
sort__daddr_cmp(struct hist_entry *left, struct hist_entry *right);
|
||||
int64_t
|
||||
sort__dcacheline_cmp(struct hist_entry *left, struct hist_entry *right);
|
||||
#endif /* __PERF_SORT_H */
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче