linux-kernel - [tip:perf/urgent] perf/core: Fix cgroup time when scheduling descendants

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Date:   Tue, 10 Oct 2017 03:53:22 -0700
From:   "tip-bot for leilei.lin" <tipbot@...or.com>
To:     linux-tip-commits@...r.kernel.org
Cc:     torvalds@...ux-foundation.org, peterz@...radead.org,
        leilei.lin@...baba-inc.com, linux-kernel@...r.kernel.org,
        jolsa@...hat.com, mingo@...nel.org, tglx@...utronix.de,
        jolsa@...nel.org, eranian@...il.com, hpa@...or.com
Subject: [tip:perf/urgent] perf/core: Fix cgroup time when scheduling
 descendants

Commit-ID:  e6a5203399d19871021c1fa0eb2a08fc63b67e91
Gitweb:     https://git.kernel.org/tip/e6a5203399d19871021c1fa0eb2a08fc63b67e91
Author:     leilei.lin <leilei.lin@...baba-inc.com>
AuthorDate: Fri, 29 Sep 2017 13:54:44 +0800
Committer:  Ingo Molnar <mingo@...nel.org>
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 <jolsa@...nel.org>
Signed-off-by: leilei.lin <leilei.lin@...baba-inc.com>
Signed-off-by: Peter Zijlstra (Intel) <peterz@...radead.org>
Cc: Jiri Olsa <jolsa@...hat.com>
Cc: Linus Torvalds <torvalds@...ux-foundation.org>
Cc: Peter Zijlstra <peterz@...radead.org>
Cc: Stephane Eranian <eranian@...il.com>
Cc: Thomas Gleixner <tglx@...utronix.de>
Cc: acme@...nel.org
Cc: alexander.shishkin@...ux.intel.com
Cc: brendan.d.gregg@...il.com
Cc: yang_oliver@...mail.com
Link: http://lkml.kernel.org/r/CALPjY3mkHiekRkRECzMi9G-bjUQOvOjVBAqxmWkTzc-g+0LwMg@mail.gmail.com
Signed-off-by: Ingo Molnar <mingo@...nel.org>
---
 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);
 }