[PATCH v2] perf/core: Fix updating cgroup time with descendants

[Lin Xiulei]

From: "leilei.lin" <leilei.lin@xxxxxxxxxxxxxxx>

This fix updating cgroup time when event is being scheduled in
by descendants

Signed-off-by: leilei.lin <leilei.lin@xxxxxxxxxxxxxxx>
Reviewed-and-tested-by: Jiri Olsa <jolsa@xxxxxxxxxx>
---
 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 3e691b7..e3a5e32 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);
 }