aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorleilei.lin <[email protected]>2017-09-29 13:54:44 +0800
committerIngo Molnar <[email protected]>2017-10-10 10:06:55 +0200
commite6a5203399d19871021c1fa0eb2a08fc63b67e91 (patch)
treedc4b75868d25650e6ca608107f5c1f3cc150a90a
parentdf0062b27ebf473b372914a3e3574d93790e2b72 (diff)
perf/core: Fix cgroup time when scheduling descendants
Update cgroup time when an event is scheduled in by descendants. Reviewed-and-tested-by: Jiri Olsa <[email protected]> Signed-off-by: leilei.lin <[email protected]> Signed-off-by: Peter Zijlstra (Intel) <[email protected]> Cc: Jiri Olsa <[email protected]> Cc: Linus Torvalds <[email protected]> Cc: Peter Zijlstra <[email protected]> Cc: Stephane Eranian <[email protected]> Cc: Thomas Gleixner <[email protected]> Cc: [email protected] Cc: [email protected] Cc: [email protected] Cc: [email protected] Link: http://lkml.kernel.org/r/CALPjY3mkHiekRkRECzMi9G-bjUQOvOjVBAqxmWkTzc-g+0LwMg@mail.gmail.com Signed-off-by: Ingo Molnar <[email protected]>
-rw-r--r--kernel/events/core.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/events/core.c b/kernel/events/core.c
index 243bfc68d0fe..9d93db81fa36 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);
}