From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751457AbeAWEPb (ORCPT ); Mon, 22 Jan 2018 23:15:31 -0500 Received: from mail-oi0-f66.google.com ([209.85.218.66]:44524 "EHLO mail-oi0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751293AbeAWEP3 (ORCPT ); Mon, 22 Jan 2018 23:15:29 -0500 X-Google-Smtp-Source: AH8x227Jb9nbiU0n8GCytjHZDMCSw1SjFj4tiA4ir5oQ1CT+27h+plvJxlCiNOJmGQ0/473Kah5Ttw== From: linxiulei@gmail.com To: peterz@infradead.org, jolsa@redhat.com, mingo@redhat.com, acme@kernel.org, alexander.shishkin@linux.intel.com, linux-kernel@vger.kernel.org, tglx@linutronix.de, eranian@gmail.com, torvalds@linux-foundation.org, linux-perf-users@vger.kernel.org, brendan.d.gregg@gmail.com Cc: yang_oliver@hotmail.com, jinli.zjl@alibaba-inc.com, "leilei.lin" Subject: [PATCH RESEND] perf/core: Fix installing cgroup event into cpu Date: Tue, 23 Jan 2018 12:13:06 +0800 Message-Id: <20180123041306.15431-1-linxiulei@gmail.com> X-Mailer: git-send-email 2.13.4 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: "leilei.lin" Do not install cgroup event into the CPU context if the cgroup is not running on this CPU While there is no task of cgroup running specified CPU, current kernel still install cgroup event into CPU context, that causes another cgroup event can't be installed into this CPU. Signed-off-by: leilei.lin --- kernel/events/core.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/kernel/events/core.c b/kernel/events/core.c index 4df5b69..19c587b 100644 --- a/kernel/events/core.c +++ b/kernel/events/core.c @@ -2284,6 +2284,7 @@ static int __perf_install_in_context(void *info) struct perf_event_context *ctx = event->ctx; struct perf_cpu_context *cpuctx = __get_cpu_context(ctx); struct perf_event_context *task_ctx = cpuctx->task_ctx; + struct perf_cgroup *cgrp; bool reprogram = true; int ret = 0; @@ -2311,6 +2312,19 @@ static int __perf_install_in_context(void *info) raw_spin_lock(&task_ctx->lock); } + if (event->cgrp) { + /* + * Only care about cgroup events. + * + * If only the task belongs to cgroup of this event, + * we will continue the installment + */ + cgrp = perf_cgroup_from_task(current, ctx); + if (!cgroup_is_descendant(cgrp->css.cgroup, + event->cgrp->css.cgroup)) + goto unlock; + } + if (reprogram) { ctx_sched_out(ctx, cpuctx, EVENT_TIME); add_event_to_ctx(event, ctx); -- 2.8.4.31.g9ed660f