Received: by 2002:ad5:474a:0:0:0:0:0 with SMTP id i10csp5631191imu; Mon, 26 Nov 2018 03:15:20 -0800 (PST) X-Google-Smtp-Source: AJdET5dpgN9QMu+IvjqIh5tzv3bG988rABCMtJUCEHOXGYX1QYeqH3CDbN1/xGniqsq7TPWpJoun X-Received: by 2002:a62:3707:: with SMTP id e7-v6mr27406849pfa.70.1543230920541; Mon, 26 Nov 2018 03:15:20 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1543230920; cv=none; d=google.com; s=arc-20160816; b=0zD/Gc+NL/Boj30Lkk4bn95njnu5jVbxd02qZdDAchsLMoeq5BxXIERGD/eQ5t2tqm GlrK5EVgAwXOo1yNxhpHw/qHJiW68lewTTM6LTbwTyDy4ztibdp5vbF7NXmwVRxy01v5 eljU99bWOIYwRPGUJpAjeIZcWJ36QEyexzCmLYQZEXbmi0leSK8FOGIZ6lCd4zSIF5Of Qcm3QRErHNtroEbtiSCuwAvueRyT8QSnqjynqM9HdFVnzyU7pBVOJA2dW2dPSchYKIxI D/EwG8GgIGZoWzr+CnMViwQaLFDlxDAmOtNZJjGorV9bUsXLHiKSZeYpeAF1gAvkcrgf IZzA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from; bh=F36OIgNiWVVCmhrKWK0H4MFqLRV6XPQwTAE/65402hQ=; b=l/XYeNCMnZ+WiqTZeuUD0bXU4dPp0+hmByuG/l0TwfFo41MoQBnrvonnjoqD1691qZ uoF+90b2Vydyx+fsaAb9RocN4gBNSwaNJLhxLK7cRtSKhRWkZWCt8cTCKAp6cp7PEcxp q1gcO4pKmCEhZalp9q5AQUoEI3OXH51XRLAzQy86jk1EaMXfDHoIQr9RIvaD2aaFjDUi RS/YjoisTrpfMzmrTzMJGK6lMm4kC0yJ45fo5EUzxuqqVsuucLtbXIMkaPEzKi88o2iN TN+lRq6EcNwBNd7czxDT8juq3Mh2NvN5ZibTO93rSy+XXb7vv46HDfCZysjrHjzODBIC Mv7g== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id b7si26303898plb.234.2018.11.26.03.15.05; Mon, 26 Nov 2018 03:15:20 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730704AbeKZWH2 (ORCPT + 99 others); Mon, 26 Nov 2018 17:07:28 -0500 Received: from usa-sjc-mx-foss1.foss.arm.com ([217.140.101.70]:60838 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727299AbeKZWH1 (ORCPT ); Mon, 26 Nov 2018 17:07:27 -0500 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id B06443918; Mon, 26 Nov 2018 03:13:39 -0800 (PST) Received: from e119886-lin.cambridge.arm.com (unknown [10.37.6.11]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 050673F5AF; Mon, 26 Nov 2018 03:13:34 -0800 (PST) From: Andrew Murray To: Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Shawn Guo , Sascha Hauer , Will Deacon , Mark Rutland , Benjamin Herrenschmidt , Thomas Gleixner , Borislav Petkov , x86@kernel.org, Ralf Baechle , Paul Burton , James Hogan , Martin Schwidefsky , Heiko Carstens , "David S . Miller" , sparclinux@vger.kernel.org, Michael Ellerman Cc: linux-s390@vger.kernel.org, linux-mips@linux-mips.org, linuxppc-dev@lists.ozlabs.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-alpha@vger.kernel.org Subject: [PATCH v2 03/20] perf/core: add PERF_PMU_CAP_EXCLUDE for exclusion capable PMUs Date: Mon, 26 Nov 2018 11:12:19 +0000 Message-Id: <1543230756-15319-4-git-send-email-andrew.murray@arm.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1543230756-15319-1-git-send-email-andrew.murray@arm.com> References: <1543230756-15319-1-git-send-email-andrew.murray@arm.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Many PMU drivers do not have the capability to exclude counting events that occur in specific contexts such as idle, kernel, guest, etc. These drivers indicate this by returning an error in their event_init upon testing the events attribute flags. This approach is error prone and often inconsistent. Let's instead allow PMU drivers to advertise their ability to exclude based on context via a new capability: PERF_PMU_CAP_EXCLUDE. This allows the perf core to reject requests for exclusion events where there is no support in the PMU. Signed-off-by: Andrew Murray --- include/linux/perf_event.h | 1 + kernel/events/core.c | 9 +++++++++ 2 files changed, 10 insertions(+) diff --git a/include/linux/perf_event.h b/include/linux/perf_event.h index b2e806f..69b3d65 100644 --- a/include/linux/perf_event.h +++ b/include/linux/perf_event.h @@ -244,6 +244,7 @@ struct perf_event; #define PERF_PMU_CAP_EXCLUSIVE 0x10 #define PERF_PMU_CAP_ITRACE 0x20 #define PERF_PMU_CAP_HETEROGENEOUS_CPUS 0x40 +#define PERF_PMU_CAP_EXCLUDE 0x80 /** * struct pmu - generic performance monitoring unit diff --git a/kernel/events/core.c b/kernel/events/core.c index 5a97f34..9afb33c 100644 --- a/kernel/events/core.c +++ b/kernel/events/core.c @@ -9743,6 +9743,15 @@ static int perf_try_init_event(struct pmu *pmu, struct perf_event *event) if (ctx) perf_event_ctx_unlock(event->group_leader, ctx); + if (!ret) { + if (!(pmu->capabilities & PERF_PMU_CAP_EXCLUDE) && + event_has_any_exclude_flag(event)) { + if (event->destroy) + event->destroy(event); + ret = -EINVAL; + } + } + if (ret) module_put(pmu->module); -- 2.7.4