diff options
author | Ingo Molnar | 2017-10-20 11:02:05 +0200 |
---|---|---|
committer | Ingo Molnar | 2017-10-20 11:02:05 +0200 |
commit | ca4b9c3b743da39a6e0756a5c68edb35f6fc5e53 (patch) | |
tree | 95ce0819f92e25bc4d768ab13cee1f385a83a7b2 /kernel/events | |
parent | kprobes: Use synchronize_rcu_tasks() for optprobe with CONFIG_PREEMPT=y (diff) | |
parent | Merge tag 'perf-urgent-for-mingo-4.14-20171019' of git://git.kernel.org/pub/s... (diff) | |
download | kernel-qcow2-linux-ca4b9c3b743da39a6e0756a5c68edb35f6fc5e53.tar.gz kernel-qcow2-linux-ca4b9c3b743da39a6e0756a5c68edb35f6fc5e53.tar.xz kernel-qcow2-linux-ca4b9c3b743da39a6e0756a5c68edb35f6fc5e53.zip |
Merge branch 'perf/urgent' into perf/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'kernel/events')
-rw-r--r-- | kernel/events/core.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/kernel/events/core.c b/kernel/events/core.c index 5ee62714f9a6..04989fb769f0 100644 --- a/kernel/events/core.c +++ b/kernel/events/core.c @@ -662,7 +662,7 @@ static inline void update_cgrp_time_from_event(struct perf_event *event) /* * Do not update time when cgroup is not active */ - if (cgrp == event->cgrp) + if (cgroup_is_descendant(cgrp->css.cgroup, event->cgrp->css.cgroup)) __update_cgrp_time(event->cgrp); } @@ -8955,6 +8955,14 @@ static struct perf_cpu_context __percpu *find_pmu_context(int ctxn) static void free_pmu_context(struct pmu *pmu) { + /* + * Static contexts such as perf_sw_context have a global lifetime + * and may be shared between different PMUs. Avoid freeing them + * when a single PMU is going away. + */ + if (pmu->task_ctx_nr > perf_invalid_context) + return; + mutex_lock(&pmus_lock); free_percpu(pmu->pmu_cpu_context); mutex_unlock(&pmus_lock); |