From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757032AbcJ3Anm (ORCPT ); Sat, 29 Oct 2016 20:43:42 -0400 Received: from mail-pf0-f177.google.com ([209.85.192.177]:36387 "EHLO mail-pf0-f177.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756190AbcJ3Aka (ORCPT ); Sat, 29 Oct 2016 20:40:30 -0400 From: David Carrillo-Cisneros To: linux-kernel@vger.kernel.org Cc: "x86@kernel.org" , Ingo Molnar , Thomas Gleixner , Andi Kleen , Kan Liang , Peter Zijlstra , Vegard Nossum , Marcelo Tosatti , Nilay Vaish , Borislav Petkov , Vikas Shivappa , Ravi V Shankar , Fenghua Yu , Paul Turner , Stephane Eranian , David Carrillo-Cisneros Subject: [PATCH v3 35/46] perf/x86/intel/cmt: use PERF_EV_CAP_CGROUP_NO_RECURSION in intel_cmt Date: Sat, 29 Oct 2016 17:38:32 -0700 Message-Id: <1477787923-61185-36-git-send-email-davidcc@google.com> X-Mailer: git-send-email 2.8.0.rc3.226.g39d4020 In-Reply-To: <1477787923-61185-1-git-send-email-davidcc@google.com> References: <1477787923-61185-1-git-send-email-davidcc@google.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Use newly added flag. Signed-off-by: David Carrillo-Cisneros --- arch/x86/events/intel/cmt.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/arch/x86/events/intel/cmt.c b/arch/x86/events/intel/cmt.c index 614b2f4..194038b 100644 --- a/arch/x86/events/intel/cmt.c +++ b/arch/x86/events/intel/cmt.c @@ -1734,6 +1734,14 @@ static int intel_cmt_event_init(struct perf_event *event) INIT_LIST_HEAD(&event->hw.cmt_list); /* + * CMT hw only allows one rmid per core at the time and therefore + * it is not compatible with the way generic code handles cgroup + * dependencies. + */ + if (event->cgrp) + event->event_caps |= PERF_EV_CAP_CGROUP_NO_RECURSION; + + /* * Task events can be read in any CPU in any package. CPU events * only in CPU's package. Both can read even if inactive. */ -- 2.8.0.rc3.226.g39d4020