Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1535617 > unrolled thread
| Started by | David Carrillo-Cisneros <davidcc@google.com> |
|---|---|
| First post | 2016-12-04 09:50 +0100 |
| Last post | 2016-12-06 11:20 +0100 |
| Articles | 4 — 3 participants |
Back to article view | Back to linux.kernel
[PATCH] perf/core: remove invalid warning from list_update_cgroup_event David Carrillo-Cisneros <davidcc@google.com> - 2016-12-04 09:50 +0100
Re: [PATCH] perf/core: remove invalid warning from list_update_cgroup_event Peter Zijlstra <peterz@infradead.org> - 2016-12-05 10:20 +0100
Re: [PATCH] perf/core: remove invalid warning from list_update_cgroup_event David Carrillo-Cisneros <davidcc@google.com> - 2016-12-05 10:50 +0100
[tip:perf/urgent] perf/core: Remove invalid warning from list_update_cgroup_even()t tip-bot for David Carrillo-Cisneros <tipbot@zytor.com> - 2016-12-06 11:20 +0100
| From | David Carrillo-Cisneros <davidcc@google.com> |
|---|---|
| Date | 2016-12-04 09:50 +0100 |
| Subject | [PATCH] perf/core: remove invalid warning from list_update_cgroup_event |
| Message-ID | <sKAEF-4Sm-13@gated-at.bofh.it> |
The warning introduced in commit:
979bfef8607c ("perf/core: Do not set cpuctx->cgrp for unscheduled cgroups")
assumed that a cgroup switch always precedes list_del_event. This is not
the case. Remove warning.
Make sure that cpuctx->cgrp is NULL until a cgroup event is sched in or
ctx->nr_cgroups == 0.
Signed-off-by: David Carrillo-Cisneros <davidcc@google.com>
---
kernel/events/core.c | 19 ++++++++-----------
1 file changed, 8 insertions(+), 11 deletions(-)
diff --git a/kernel/events/core.c b/kernel/events/core.c
index 6ee1feb..02c8421 100644
--- a/kernel/events/core.c
+++ b/kernel/events/core.c
@@ -903,17 +903,14 @@ list_update_cgroup_event(struct perf_event *event,
*/
cpuctx = __get_cpu_context(ctx);
- /* Only set/clear cpuctx->cgrp if current task uses event->cgrp. */
- if (perf_cgroup_from_task(current, ctx) != event->cgrp) {
- /*
- * We are removing the last cpu event in this context.
- * If that event is not active in this cpu, cpuctx->cgrp
- * should've been cleared by perf_cgroup_switch.
- */
- WARN_ON_ONCE(!add && cpuctx->cgrp);
- return;
- }
- cpuctx->cgrp = add ? event->cgrp : NULL;
+ /*
+ * cpuctx->cgrp is NULL until a cgroup event is sched in or
+ * ctx->nr_cgroup == 0 .
+ */
+ if (add && perf_cgroup_from_task(current, ctx) == event->cgrp)
+ cpuctx->cgrp = event->cgrp;
+ else if (!add)
+ cpuctx->cgrp = NULL;
}
#else /* !CONFIG_CGROUP_PERF */
--
2.8.0.rc3.226.g39d4020
[toc] | [next] | [standalone]
| From | Peter Zijlstra <peterz@infradead.org> |
|---|---|
| Date | 2016-12-05 10:20 +0100 |
| Subject | Re: [PATCH] perf/core: remove invalid warning from list_update_cgroup_event |
| Message-ID | <sKXBg-2G5-17@gated-at.bofh.it> |
| In reply to | #1535617 |
On Sun, Dec 04, 2016 at 12:46:17AM -0800, David Carrillo-Cisneros wrote:
> The warning introduced in commit:
>
> 979bfef8607c ("perf/core: Do not set cpuctx->cgrp for unscheduled cgroups")
That commit doesn't exist.
You instead mean this one, right?
864c2357ca89 ("perf/core: Do not set cpuctx->cgrp for unscheduled cgroups")
[toc] | [prev] | [next] | [standalone]
| From | David Carrillo-Cisneros <davidcc@google.com> |
|---|---|
| Date | 2016-12-05 10:50 +0100 |
| Message-ID | <sKY4h-2Pg-15@gated-at.bofh.it> |
| In reply to | #1535909 |
>> The warning introduced in commit:
>>
>> 979bfef8607c ("perf/core: Do not set cpuctx->cgrp for unscheduled cgroups")
>
> That commit doesn't exist.
>
> You instead mean this one, right?
Ups, got it from the wrong tree. Yes, that's the one I meant.
>
> 864c2357ca89 ("perf/core: Do not set cpuctx->cgrp for unscheduled cgroups")
>
>
>
[toc] | [prev] | [next] | [standalone]
| From | tip-bot for David Carrillo-Cisneros <tipbot@zytor.com> |
|---|---|
| Date | 2016-12-06 11:20 +0100 |
| Subject | [tip:perf/urgent] perf/core: Remove invalid warning from list_update_cgroup_even()t |
| Message-ID | <sLl0R-L2-7@gated-at.bofh.it> |
| In reply to | #1535617 |
Commit-ID: 8fc31ce8896fc3cea1d79688c8ff950ad4e73afe
Gitweb: http://git.kernel.org/tip/8fc31ce8896fc3cea1d79688c8ff950ad4e73afe
Author: David Carrillo-Cisneros <davidcc@google.com>
AuthorDate: Sun, 4 Dec 2016 00:46:17 -0800
Committer: Ingo Molnar <mingo@kernel.org>
CommitDate: Tue, 6 Dec 2016 09:44:29 +0100
perf/core: Remove invalid warning from list_update_cgroup_even()t
The warning introduced in commit:
864c2357ca89 ("perf/core: Do not set cpuctx->cgrp for unscheduled cgroups")
assumed that a cgroup switch always precedes list_del_event. This is
not the case. Remove warning.
Make sure that cpuctx->cgrp is NULL until a cgroup event is sched in
or ctx->nr_cgroups == 0.
Signed-off-by: David Carrillo-Cisneros <davidcc@google.com>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Borislav Petkov <bp@suse.de>
Cc: Fenghua Yu <fenghua.yu@intel.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Kan Liang <kan.liang@intel.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Marcelo Tosatti <mtosatti@redhat.com>
Cc: Nilay Vaish <nilayvaish@gmail.com>
Cc: Paul Turner <pjt@google.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Ravi V Shankar <ravi.v.shankar@intel.com>
Cc: Stephane Eranian <eranian@google.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Vegard Nossum <vegard.nossum@gmail.com>
Cc: Vikas Shivappa <vikas.shivappa@linux.intel.com>
Cc: Vince Weaver <vincent.weaver@maine.edu>
Link: http://lkml.kernel.org/r/1480841177-27299-1-git-send-email-davidcc@google.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---
kernel/events/core.c | 19 ++++++++-----------
1 file changed, 8 insertions(+), 11 deletions(-)
diff --git a/kernel/events/core.c b/kernel/events/core.c
index 6ee1feb..02c8421 100644
--- a/kernel/events/core.c
+++ b/kernel/events/core.c
@@ -903,17 +903,14 @@ list_update_cgroup_event(struct perf_event *event,
*/
cpuctx = __get_cpu_context(ctx);
- /* Only set/clear cpuctx->cgrp if current task uses event->cgrp. */
- if (perf_cgroup_from_task(current, ctx) != event->cgrp) {
- /*
- * We are removing the last cpu event in this context.
- * If that event is not active in this cpu, cpuctx->cgrp
- * should've been cleared by perf_cgroup_switch.
- */
- WARN_ON_ONCE(!add && cpuctx->cgrp);
- return;
- }
- cpuctx->cgrp = add ? event->cgrp : NULL;
+ /*
+ * cpuctx->cgrp is NULL until a cgroup event is sched in or
+ * ctx->nr_cgroup == 0 .
+ */
+ if (add && perf_cgroup_from_task(current, ctx) == event->cgrp)
+ cpuctx->cgrp = event->cgrp;
+ else if (!add)
+ cpuctx->cgrp = NULL;
}
#else /* !CONFIG_CGROUP_PERF */
[toc] | [prev] | [standalone]
Back to top | Article view | linux.kernel
csiph-web