From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932137AbbCIMrX (ORCPT ); Mon, 9 Mar 2015 08:47:23 -0400 Received: from service87.mimecast.com ([91.220.42.44]:40283 "EHLO service87.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753729AbbCIMql (ORCPT ); Mon, 9 Mar 2015 08:46:41 -0400 From: "Suzuki K. Poulose" To: will.deacon@arm.com Cc: a.p.zijlstra@chello.nl, linux@arm.linux.org.uk, acme@kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, punit.agrawal@arm.com, pawel.moll@arm.com, "Suzuki K. Poulose" Subject: [PATCH 3/3] arm-cci: Reject groups spanning multiple HW PMUs Date: Mon, 9 Mar 2015 12:46:32 +0000 Message-Id: <1425905192-10509-4-git-send-email-suzuki.poulose@arm.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1425905192-10509-1-git-send-email-suzuki.poulose@arm.com> References: <1425905192-10509-1-git-send-email-suzuki.poulose@arm.com> X-OriginalArrivalTime: 09 Mar 2015 12:46:36.0554 (UTC) FILETIME=[147BE6A0:01D05A67] X-MC-Unique: 115030912463907601 Content-Type: text/plain; charset=WINDOWS-1252 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: 8bit X-MIME-Autoconverted: from quoted-printable to 8bit by nfs id t29ClT5l008726 From: "Suzuki K. Poulose" Invalidate an event if the group has a hardware event from a different PMU as we cannot schedule all of them in the same context. The perf core code won't check the group consistency until after pmu_event_init(). Signed-off-by: Suzuki K. Poulose --- drivers/bus/arm-cci.c | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/drivers/bus/arm-cci.c b/drivers/bus/arm-cci.c index 84fd660..68ef6f2 100644 --- a/drivers/bus/arm-cci.c +++ b/drivers/bus/arm-cci.c @@ -660,12 +660,21 @@ static void cci_pmu_del(struct perf_event *event, int flags) } static int -validate_event(struct cci_pmu_hw_events *hw_events, - struct perf_event *event) +validate_event(struct pmu *cci_pmu, + struct cci_pmu_hw_events *hw_events, + struct perf_event *event) { if (is_software_event(event)) return 1; + /* + * Reject groups spanning multiple HW PMUs (e.g. CPU + CCI). The + * core perf code won't check that the pmu->ctx == leader->ctx + * until after pmu->event_init(event). + */ + if (event->pmu != cci_pmu) + return 0; + if (event->state < PERF_EVENT_STATE_OFF) return 1; @@ -687,15 +696,15 @@ validate_group(struct perf_event *event) .used_mask = CPU_BITS_NONE, }; - if (!validate_event(&fake_pmu, leader)) + if (!validate_event(event->pmu, &fake_pmu, leader)) return -EINVAL; list_for_each_entry(sibling, &leader->sibling_list, group_entry) { - if (!validate_event(&fake_pmu, sibling)) + if (!validate_event(event->pmu, &fake_pmu, sibling)) return -EINVAL; } - if (!validate_event(&fake_pmu, event)) + if (!validate_event(event->pmu, &fake_pmu, event)) return -EINVAL; return 0; -- 1.7.9.5