From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755952AbdJJK56 (ORCPT ); Tue, 10 Oct 2017 06:57:58 -0400 Received: from terminus.zytor.com ([65.50.211.136]:40771 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755669AbdJJK55 (ORCPT ); Tue, 10 Oct 2017 06:57:57 -0400 Date: Tue, 10 Oct 2017 03:53:22 -0700 From: "tip-bot for leilei.lin" Message-ID: Cc: torvalds@linux-foundation.org, peterz@infradead.org, leilei.lin@alibaba-inc.com, linux-kernel@vger.kernel.org, jolsa@redhat.com, mingo@kernel.org, tglx@linutronix.de, jolsa@kernel.org, eranian@gmail.com, hpa@zytor.com Reply-To: torvalds@linux-foundation.org, peterz@infradead.org, leilei.lin@alibaba-inc.com, linux-kernel@vger.kernel.org, mingo@kernel.org, jolsa@redhat.com, eranian@gmail.com, jolsa@kernel.org, tglx@linutronix.de, hpa@zytor.com In-Reply-To: References: To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/urgent] perf/core: Fix cgroup time when scheduling descendants Git-Commit-ID: e6a5203399d19871021c1fa0eb2a08fc63b67e91 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: e6a5203399d19871021c1fa0eb2a08fc63b67e91 Gitweb: https://git.kernel.org/tip/e6a5203399d19871021c1fa0eb2a08fc63b67e91 Author: leilei.lin AuthorDate: Fri, 29 Sep 2017 13:54:44 +0800 Committer: Ingo Molnar 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 Signed-off-by: leilei.lin Signed-off-by: Peter Zijlstra (Intel) Cc: Jiri Olsa Cc: Linus Torvalds Cc: Peter Zijlstra Cc: Stephane Eranian Cc: Thomas Gleixner Cc: acme@kernel.org Cc: alexander.shishkin@linux.intel.com Cc: brendan.d.gregg@gmail.com Cc: yang_oliver@hotmail.com Link: http://lkml.kernel.org/r/CALPjY3mkHiekRkRECzMi9G-bjUQOvOjVBAqxmWkTzc-g+0LwMg@mail.gmail.com Signed-off-by: Ingo Molnar --- 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); }