1 files changed, 4 insertions, 2 deletions

diff --git a/kernel/events/core.c b/kernel/events/core.c
index 9d93db81fa36..10cdb9c26b5d 100644
--- a/kernel/events/core.c
+++ b/kernel/events/core.c
@@ -901,9 +901,11 @@ list_update_cgroup_event(struct perf_event *event,
         cpuctx_entry = &cpuctx->cgrp_cpuctx_entry;
         /* cpuctx->cgrp is NULL unless a cgroup event is active in this CPU .*/
         if (add) {
+                struct perf_cgroup *cgrp = perf_cgroup_from_task(current, ctx);
+
                 list_add(cpuctx_entry, this_cpu_ptr(&cgrp_cpuctx_list));
-                if (perf_cgroup_from_task(current, ctx) == event->cgrp)
-                        cpuctx->cgrp = event->cgrp;
+                if (cgroup_is_descendant(cgrp->css.cgroup, event->cgrp->css.cgroup))
+                        cpuctx->cgrp = cgrp;
         } else {
                 list_del(cpuctx_entry);
                 cpuctx->cgrp = NULL;