|
@@ -372,6 +372,8 @@ void perf_cgroup_switch(struct task_struct *task, int mode)
|
|
|
|
|
|
list_for_each_entry_rcu(pmu, &pmus, entry) {
|
|
list_for_each_entry_rcu(pmu, &pmus, entry) {
|
|
cpuctx = this_cpu_ptr(pmu->pmu_cpu_context);
|
|
cpuctx = this_cpu_ptr(pmu->pmu_cpu_context);
|
|
|
|
+ if (cpuctx->unique_pmu != pmu)
|
|
|
|
+ continue; /* ensure we process each cpuctx once */
|
|
|
|
|
|
/*
|
|
/*
|
|
* perf_cgroup_events says at least one
|
|
* perf_cgroup_events says at least one
|
|
@@ -395,9 +397,10 @@ void perf_cgroup_switch(struct task_struct *task, int mode)
|
|
|
|
|
|
if (mode & PERF_CGROUP_SWIN) {
|
|
if (mode & PERF_CGROUP_SWIN) {
|
|
WARN_ON_ONCE(cpuctx->cgrp);
|
|
WARN_ON_ONCE(cpuctx->cgrp);
|
|
- /* set cgrp before ctxsw in to
|
|
|
|
- * allow event_filter_match() to not
|
|
|
|
- * have to pass task around
|
|
|
|
|
|
+ /*
|
|
|
|
+ * set cgrp before ctxsw in to allow
|
|
|
|
+ * event_filter_match() to not have to pass
|
|
|
|
+ * task around
|
|
*/
|
|
*/
|
|
cpuctx->cgrp = perf_cgroup_from_task(task);
|
|
cpuctx->cgrp = perf_cgroup_from_task(task);
|
|
cpu_ctx_sched_in(cpuctx, EVENT_ALL, task);
|
|
cpu_ctx_sched_in(cpuctx, EVENT_ALL, task);
|