mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-20 14:16:02 +00:00
perf evsel: Allow specifying if the inherit bit should be set
As this is a per-cpu attribute, we can't set it up in advance and use it for all the calls. Cc: Frederic Weisbecker <fweisbec@gmail.com> Cc: Ingo Molnar <mingo@elte.hu> Cc: Mike Galbraith <efault@gmx.de> Cc: Paul Mackerras <paulus@samba.org> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Stephane Eranian <eranian@google.com> Cc: Tom Zanussi <tzanussi@gmail.com> LKML-Reference: <new-submission> Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
parent
f08199d314
commit
9d04f17817
4 changed files with 16 additions and 14 deletions
|
@ -169,7 +169,7 @@ static int create_perf_stat_counter(struct perf_evsel *evsel)
|
|||
PERF_FORMAT_TOTAL_TIME_RUNNING;
|
||||
|
||||
if (system_wide)
|
||||
return perf_evsel__open_per_cpu(evsel, cpus, false);
|
||||
return perf_evsel__open_per_cpu(evsel, cpus, false, false);
|
||||
|
||||
attr->inherit = !no_inherit;
|
||||
if (target_pid == -1 && target_tid == -1) {
|
||||
|
@ -177,7 +177,7 @@ static int create_perf_stat_counter(struct perf_evsel *evsel)
|
|||
attr->enable_on_exec = 1;
|
||||
}
|
||||
|
||||
return perf_evsel__open_per_thread(evsel, threads, false);
|
||||
return perf_evsel__open_per_thread(evsel, threads, false, false);
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
|
@ -289,7 +289,7 @@ static int test__open_syscall_event(void)
|
|||
goto out_thread_map_delete;
|
||||
}
|
||||
|
||||
if (perf_evsel__open_per_thread(evsel, threads, false) < 0) {
|
||||
if (perf_evsel__open_per_thread(evsel, threads, false, false) < 0) {
|
||||
pr_debug("failed to open counter: %s, "
|
||||
"tweak /proc/sys/kernel/perf_event_paranoid?\n",
|
||||
strerror(errno));
|
||||
|
@ -364,7 +364,7 @@ static int test__open_syscall_event_on_all_cpus(void)
|
|||
goto out_thread_map_delete;
|
||||
}
|
||||
|
||||
if (perf_evsel__open(evsel, cpus, threads, false) < 0) {
|
||||
if (perf_evsel__open(evsel, cpus, threads, false, false) < 0) {
|
||||
pr_debug("failed to open counter: %s, "
|
||||
"tweak /proc/sys/kernel/perf_event_paranoid?\n",
|
||||
strerror(errno));
|
||||
|
|
|
@ -128,7 +128,7 @@ int __perf_evsel__read(struct perf_evsel *evsel,
|
|||
}
|
||||
|
||||
static int __perf_evsel__open(struct perf_evsel *evsel, struct cpu_map *cpus,
|
||||
struct thread_map *threads, bool group)
|
||||
struct thread_map *threads, bool group, bool inherit)
|
||||
{
|
||||
int cpu, thread;
|
||||
|
||||
|
@ -139,6 +139,8 @@ static int __perf_evsel__open(struct perf_evsel *evsel, struct cpu_map *cpus,
|
|||
for (cpu = 0; cpu < cpus->nr; cpu++) {
|
||||
int group_fd = -1;
|
||||
|
||||
evsel->attr.inherit = (cpus->map[cpu] < 0) && inherit;
|
||||
|
||||
for (thread = 0; thread < threads->nr; thread++) {
|
||||
FD(evsel, cpu, thread) = sys_perf_event_open(&evsel->attr,
|
||||
threads->map[thread],
|
||||
|
@ -182,7 +184,7 @@ static struct {
|
|||
};
|
||||
|
||||
int perf_evsel__open(struct perf_evsel *evsel, struct cpu_map *cpus,
|
||||
struct thread_map *threads, bool group)
|
||||
struct thread_map *threads, bool group, bool inherit)
|
||||
{
|
||||
if (cpus == NULL) {
|
||||
/* Work around old compiler warnings about strict aliasing */
|
||||
|
@ -192,17 +194,17 @@ int perf_evsel__open(struct perf_evsel *evsel, struct cpu_map *cpus,
|
|||
if (threads == NULL)
|
||||
threads = &empty_thread_map.map;
|
||||
|
||||
return __perf_evsel__open(evsel, cpus, threads, group);
|
||||
return __perf_evsel__open(evsel, cpus, threads, group, inherit);
|
||||
}
|
||||
|
||||
int perf_evsel__open_per_cpu(struct perf_evsel *evsel,
|
||||
struct cpu_map *cpus, bool group)
|
||||
struct cpu_map *cpus, bool group, bool inherit)
|
||||
{
|
||||
return __perf_evsel__open(evsel, cpus, &empty_thread_map.map, group);
|
||||
return __perf_evsel__open(evsel, cpus, &empty_thread_map.map, group, inherit);
|
||||
}
|
||||
|
||||
int perf_evsel__open_per_thread(struct perf_evsel *evsel,
|
||||
struct thread_map *threads, bool group)
|
||||
struct thread_map *threads, bool group, bool inherit)
|
||||
{
|
||||
return __perf_evsel__open(evsel, &empty_cpu_map.map, threads, group);
|
||||
return __perf_evsel__open(evsel, &empty_cpu_map.map, threads, group, inherit);
|
||||
}
|
||||
|
|
|
@ -46,11 +46,11 @@ void perf_evsel__free_fd(struct perf_evsel *evsel);
|
|||
void perf_evsel__close_fd(struct perf_evsel *evsel, int ncpus, int nthreads);
|
||||
|
||||
int perf_evsel__open_per_cpu(struct perf_evsel *evsel,
|
||||
struct cpu_map *cpus, bool group);
|
||||
struct cpu_map *cpus, bool group, bool inherit);
|
||||
int perf_evsel__open_per_thread(struct perf_evsel *evsel,
|
||||
struct thread_map *threads, bool group);
|
||||
struct thread_map *threads, bool group, bool inherit);
|
||||
int perf_evsel__open(struct perf_evsel *evsel, struct cpu_map *cpus,
|
||||
struct thread_map *threads, bool group);
|
||||
struct thread_map *threads, bool group, bool inherit);
|
||||
|
||||
#define perf_evsel__match(evsel, t, c) \
|
||||
(evsel->attr.type == PERF_TYPE_##t && \
|
||||
|
|
Loading…
Reference in a new issue