* [PATCH] perf/core: set cgroup for cpu contexts for new cgroup events
@ 2016-08-02 3:04 David Carrillo-Cisneros
2016-08-02 3:30 ` kbuild test robot
0 siblings, 1 reply; 3+ messages in thread
From: David Carrillo-Cisneros @ 2016-08-02 3:04 UTC (permalink / raw)
To: linux-kernel
Cc: x86, Ingo Molnar, Thomas Gleixner, Andi Kleen, Kan Liang,
Peter Zijlstra, Vegard Nossum, Paul Turner, Stephane Eranian,
David Carrillo-Cisneros
There is an optimization in perf_cgroup_sched_{in,out} that skips the
switch of cgroup events if the old and new cgroups in a task context
switch are the same. This optimization interacts with the current code
in two ways that cause a cpu context's cgroup (cpuctx->cgrp) to be NULL
despite having a cgroup event that matches the current task. These are:
1. On creation of the first cgroup event in a CPU: In current code,
cpuctx->cpu is only set in perf_cgroup_sched_in, but due to the
aforesaid optimization, perf_cgroup_sched_in will run until the next
cgroup switch in that cpu. This may happen late or never happen,
depending on system's number of cgroups, cpu load, etc.
2. On deletion of the last cgroup event in a cpuctx: In list_del_event,
cpuctx->cgrp is set NULL. Any new cgroup event will not be sched in
because cpuctx->cgrp == NULL until a cgroup switch occurs and
perf_cgroup_sched_in is executed (updating cpuctx->cgrp).
This patch fixes both problems by setting cpuctx->cgrp in list_add_event,
mirroring what list_del_event does when removing a cgroup event from CPU
context, as introduced in:
commit 68cacd29167b ("perf_events: Fix stale ->cgrp pointer in update_cgrp_time_from_cpuctx()")
With this patch, cpuctx->cgrp is always set/clear when installing/removing
the first/last cgroup event in/from the cpu context. Having cpuctx->cgrp
correctly set since the event is installed in the context allows
event_filter_match to work correctly while scheduling in and out events
without relying on a cgroup switch that may occur late (if ever).
The problem is easy to observe in a machine with only one cgroup:
$ perf stat -e cycles -I 1000 -C 0 -G /
# time counts unit events
1.000161699 <not counted> cycles /
2.000355591 <not counted> cycles /
3.000565154 <not counted> cycles /
4.000951350 <not counted> cycles /
After the fix, the output is as expected:
$ perf stat -e cycles -I 1000 -a -G /
# time counts unit events
1.004699159 627342882 cycles /
2.007397156 615272690 cycles /
3.010019057 616726074 cycles /
This patch also do minor style edit into list_del_event.
Rebased at peterz/queue/perf/core.
Signed-off-by: David Carrillo-Cisneros <davidcc@google.com>
Reviewed-by: Stephane Eranian <eranian@google.com>
---
kernel/events/core.c | 33 ++++++++++++++++++++++++---------
1 file changed, 24 insertions(+), 9 deletions(-)
diff --git a/kernel/events/core.c b/kernel/events/core.c
index 9345028..1efa89d 100644
--- a/kernel/events/core.c
+++ b/kernel/events/core.c
@@ -1392,6 +1392,8 @@ ctx_group_list(struct perf_event *event, struct perf_event_context *ctx)
static void
list_add_event(struct perf_event *event, struct perf_event_context *ctx)
{
+ struct perf_cpu_context *cpuctx;
+
lockdep_assert_held(&ctx->lock);
WARN_ON_ONCE(event->attach_state & PERF_ATTACH_CONTEXT);
@@ -1412,8 +1414,21 @@ list_add_event(struct perf_event *event, struct perf_event_context *ctx)
list_add_tail(&event->group_entry, list);
}
- if (is_cgroup_event(event))
- ctx->nr_cgroups++;
+ if (is_cgroup_event(event)) {
+ /*
+ * If there are no more cgroup events, set cgrp in context
+ * so event_filter_match works.
+ */
+ if (!ctx->nr_cgroups++) {
+ /*
+ * Because cgroup events are always per-cpu events,
+ * this will always be called from the right CPU.
+ */
+ cpuctx = __get_cpu_context(ctx);
+ cpuctx->cgrp = event->cgrp;
+ }
+ }
+
list_add_rcu(&event->event_entry, &ctx->event_list);
ctx->nr_events++;
@@ -1595,18 +1610,18 @@ list_del_event(struct perf_event *event, struct perf_event_context *ctx)
event->attach_state &= ~PERF_ATTACH_CONTEXT;
if (is_cgroup_event(event)) {
- ctx->nr_cgroups--;
- /*
- * Because cgroup events are always per-cpu events, this will
- * always be called from the right CPU.
- */
- cpuctx = __get_cpu_context(ctx);
/*
* If there are no more cgroup events then clear cgrp to avoid
* stale pointer in update_cgrp_time_from_cpuctx().
*/
- if (!ctx->nr_cgroups)
+ if (!--ctx->nr_cgroups) {
+ /*
+ * Because cgroup events are always per-cpu events,
+ * this will always be called from the right CPU.
+ */
+ cpuctx = __get_cpu_context(ctx);
cpuctx->cgrp = NULL;
+ }
}
ctx->nr_events--;
--
2.8.0.rc3.226.g39d4020
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] perf/core: set cgroup for cpu contexts for new cgroup events
2016-08-02 3:04 [PATCH] perf/core: set cgroup for cpu contexts for new cgroup events David Carrillo-Cisneros
@ 2016-08-02 3:30 ` kbuild test robot
2016-08-02 7:21 ` David Carrillo-Cisneros
0 siblings, 1 reply; 3+ messages in thread
From: kbuild test robot @ 2016-08-02 3:30 UTC (permalink / raw)
To: David Carrillo-Cisneros
Cc: kbuild-all, linux-kernel, x86, Ingo Molnar, Thomas Gleixner,
Andi Kleen, Kan Liang, Peter Zijlstra, Vegard Nossum,
Paul Turner, Stephane Eranian, David Carrillo-Cisneros
[-- Attachment #1: Type: text/plain, Size: 1283 bytes --]
Hi David,
[auto build test ERROR on tip/perf/core]
[also build test ERROR on v4.7 next-20160801]
[if your patch is applied to the wrong git tree, please drop us a note to help improve the system]
url: https://github.com/0day-ci/linux/commits/David-Carrillo-Cisneros/perf-core-set-cgroup-for-cpu-contexts-for-new-cgroup-events/20160802-110924
config: x86_64-randconfig-x012-201631 (attached as .config)
compiler: gcc-6 (Debian 6.1.1-9) 6.1.1 20160705
reproduce:
# save the attached .config to linux build tree
make ARCH=x86_64
All errors (new ones prefixed by >>):
kernel/events/core.c: In function 'list_add_event':
>> kernel/events/core.c:1428:24: error: 'struct perf_event' has no member named 'cgrp'
cpuctx->cgrp = event->cgrp;
^~
vim +1428 kernel/events/core.c
1422 if (!ctx->nr_cgroups++) {
1423 /*
1424 * Because cgroup events are always per-cpu events,
1425 * this will always be called from the right CPU.
1426 */
1427 cpuctx = __get_cpu_context(ctx);
> 1428 cpuctx->cgrp = event->cgrp;
1429 }
1430 }
1431
---
0-DAY kernel test infrastructure Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all Intel Corporation
[-- Attachment #2: .config.gz --]
[-- Type: application/octet-stream, Size: 23892 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] perf/core: set cgroup for cpu contexts for new cgroup events
2016-08-02 3:30 ` kbuild test robot
@ 2016-08-02 7:21 ` David Carrillo-Cisneros
0 siblings, 0 replies; 3+ messages in thread
From: David Carrillo-Cisneros @ 2016-08-02 7:21 UTC (permalink / raw)
Cc: linux-kernel, x86, Ingo Molnar, Thomas Gleixner, Andi Kleen,
Kan Liang, Peter Zijlstra, Vegard Nossum, Paul Turner,
Stephane Eranian
Sending new version with build error fixed in another thread.
On Mon, Aug 1, 2016 at 8:30 PM, kbuild test robot <lkp@intel.com> wrote:
> Hi David,
>
> [auto build test ERROR on tip/perf/core]
> [also build test ERROR on v4.7 next-20160801]
> [if your patch is applied to the wrong git tree, please drop us a note to help improve the system]
>
> url: https://github.com/0day-ci/linux/commits/David-Carrillo-Cisneros/perf-core-set-cgroup-for-cpu-contexts-for-new-cgroup-events/20160802-110924
> config: x86_64-randconfig-x012-201631 (attached as .config)
> compiler: gcc-6 (Debian 6.1.1-9) 6.1.1 20160705
> reproduce:
> # save the attached .config to linux build tree
> make ARCH=x86_64
>
> All errors (new ones prefixed by >>):
>
> kernel/events/core.c: In function 'list_add_event':
>>> kernel/events/core.c:1428:24: error: 'struct perf_event' has no member named 'cgrp'
> cpuctx->cgrp = event->cgrp;
> ^~
>
> vim +1428 kernel/events/core.c
>
> 1422 if (!ctx->nr_cgroups++) {
> 1423 /*
> 1424 * Because cgroup events are always per-cpu events,
> 1425 * this will always be called from the right CPU.
> 1426 */
> 1427 cpuctx = __get_cpu_context(ctx);
>> 1428 cpuctx->cgrp = event->cgrp;
> 1429 }
> 1430 }
> 1431
>
> ---
> 0-DAY kernel test infrastructure Open Source Technology Center
> https://lists.01.org/pipermail/kbuild-all Intel Corporation
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2016-08-02 9:12 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-08-02 3:04 [PATCH] perf/core: set cgroup for cpu contexts for new cgroup events David Carrillo-Cisneros
2016-08-02 3:30 ` kbuild test robot
2016-08-02 7:21 ` David Carrillo-Cisneros
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.