Commit-ID: e6a5203399d19871021c1fa0eb2a08fc63b67e91 Gitweb: https://git.kernel.org/tip/e6a5203399d19871021c1fa0eb2a08fc63b67e91 Author: leilei.lin <[email protected]> AuthorDate: Fri, 29 Sep 2017 13:54:44 +0800 Committer: Ingo Molnar <[email protected]> CommitDate: Tue, 10 Oct 2017 10:06:55 +0200
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+0l...@mail.gmail.com Signed-off-by: Ingo Molnar <[email protected]> --- kernel/events/core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel/events/core.c b/kernel/events/core.c index 243bfc6..9d93db8 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); }
