linux-kernel - Re: [PATCH] perf cgroups: Fix perf_cgroup

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <1349178781.7780.29.camel@twins>
Date:	Tue, 02 Oct 2012 13:53:01 +0200
From:	Peter Zijlstra <a.p.zijlstra@...llo.nl>
To:	Jiri Olsa <jolsa@...hat.com>
Cc:	linux-kernel@...r.kernel.org,
	Frederic Weisbecker <fweisbec@...il.com>,
	Ingo Molnar <mingo@...e.hu>, Paul Mackerras <paulus@...ba.org>,
	Arnaldo Carvalho de Melo <acme@...hat.com>,
	Stephane Eranian <eranian@...gle.com>
Subject: Re: [PATCH] perf cgroups: Fix perf_cgroup_switch schedule in warning

On Tue, 2012-10-02 at 13:42 +0200, Jiri Olsa wrote:
> +++ b/kernel/events/core.c
> @@ -394,7 +394,8 @@ void perf_cgroup_switch(struct task_struct *task, int mode)
>                         }
>  
>                         if (mode & PERF_CGROUP_SWIN) {
> -                               WARN_ON_ONCE(cpuctx->cgrp);
> +                               WARN_ON_ONCE(cpuctx->cgrp && !cpuctx->ctx.is_active);
> +
>                                 /* set cgrp before ctxsw in to
>                                  * allow event_filter_match() to not
>                                  * have to pass task around 

OK, like you mentioned this is the result of multiple PMU being able to
share a cpuctx, shouldn't we in that case avoid the second loop over the
cpuctx as a whole?

Would something like the below do? IIRC I introduced that active_pmu for
exactly such reasons..

---
 kernel/events/core.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/kernel/events/core.c b/kernel/events/core.c
index 7b9df35..e98f014 100644
--- a/kernel/events/core.c
+++ b/kernel/events/core.c
@@ -372,6 +372,8 @@ void perf_cgroup_switch(struct task_struct *task, int mode)
 
 	list_for_each_entry_rcu(pmu, &pmus, entry) {
 		cpuctx = this_cpu_ptr(pmu->pmu_cpu_context);
+		if (cpuctx->active_pmu != pmu)
+			continue;
 
 		/*
 		 * perf_cgroup_events says at least one

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/