linuxppc-dev.lists.ozlabs.org archive mirror
 help / color / mirror / Atom feed
From: Andrew Murray <andrew.murray@arm.com>
To: Peter Zijlstra <peterz@infradead.org>,
	Ingo Molnar <mingo@redhat.com>,
	Arnaldo Carvalho de Melo <acme@kernel.org>,
	Shawn Guo <shawnguo@kernel.org>,
	Sascha Hauer <s.hauer@pengutronix.de>,
	Will Deacon <will.deacon@arm.com>,
	Mark Rutland <mark.rutland@arm.com>,
	Benjamin Herrenschmidt <benh@kernel.crashing.org>,
	Thomas Gleixner <tglx@linutronix.de>,
	Borislav Petkov <bp@alien8.de>,
	x86@kernel.org
Cc: linuxppc-dev@lists.ozlabs.org, linux-kernel@vger.kernel.org,
	linux-arm-kernel@lists.infradead.org,
	linux-alpha@vger.kernel.org
Subject: [PATCH 04/10] powerpc: perf/core: generalise event exclusion checking with perf macro
Date: Fri, 16 Nov 2018 10:24:07 +0000	[thread overview]
Message-ID: <1542363853-13849-5-git-send-email-andrew.murray@arm.com> (raw)
In-Reply-To: <1542363853-13849-1-git-send-email-andrew.murray@arm.com>

Replace checking of perf event exclusion flags with perf macro.

Signed-off-by: Andrew Murray <andrew.murray@arm.com>
---
 arch/powerpc/perf/hv-24x7.c |  7 +------
 arch/powerpc/perf/hv-gpci.c |  7 +------
 arch/powerpc/perf/imc-pmu.c | 14 ++------------
 3 files changed, 4 insertions(+), 24 deletions(-)

diff --git a/arch/powerpc/perf/hv-24x7.c b/arch/powerpc/perf/hv-24x7.c
index 72238ee..60db22d 100644
--- a/arch/powerpc/perf/hv-24x7.c
+++ b/arch/powerpc/perf/hv-24x7.c
@@ -1307,12 +1307,7 @@ static int h_24x7_event_init(struct perf_event *event)
 	}
 
 	/* unsupported modes and filters */
-	if (event->attr.exclude_user   ||
-	    event->attr.exclude_kernel ||
-	    event->attr.exclude_hv     ||
-	    event->attr.exclude_idle   ||
-	    event->attr.exclude_host   ||
-	    event->attr.exclude_guest)
+	if (event_has_exclude_flags(event))
 		return -EINVAL;
 
 	/* no branch sampling */
diff --git a/arch/powerpc/perf/hv-gpci.c b/arch/powerpc/perf/hv-gpci.c
index 43fabb3..2d2b5c0 100644
--- a/arch/powerpc/perf/hv-gpci.c
+++ b/arch/powerpc/perf/hv-gpci.c
@@ -233,12 +233,7 @@ static int h_gpci_event_init(struct perf_event *event)
 	}
 
 	/* unsupported modes and filters */
-	if (event->attr.exclude_user   ||
-	    event->attr.exclude_kernel ||
-	    event->attr.exclude_hv     ||
-	    event->attr.exclude_idle   ||
-	    event->attr.exclude_host   ||
-	    event->attr.exclude_guest)
+	if (event_has_exclude_flags(event))
 		return -EINVAL;
 
 	/* no branch sampling */
diff --git a/arch/powerpc/perf/imc-pmu.c b/arch/powerpc/perf/imc-pmu.c
index 1fafc32b..1ae1d3f 100644
--- a/arch/powerpc/perf/imc-pmu.c
+++ b/arch/powerpc/perf/imc-pmu.c
@@ -474,12 +474,7 @@ static int nest_imc_event_init(struct perf_event *event)
 		return -EINVAL;
 
 	/* unsupported modes and filters */
-	if (event->attr.exclude_user   ||
-	    event->attr.exclude_kernel ||
-	    event->attr.exclude_hv     ||
-	    event->attr.exclude_idle   ||
-	    event->attr.exclude_host   ||
-	    event->attr.exclude_guest)
+	if (event_has_exclude_flags(event))
 		return -EINVAL;
 
 	if (event->cpu < 0)
@@ -749,12 +744,7 @@ static int core_imc_event_init(struct perf_event *event)
 		return -EINVAL;
 
 	/* unsupported modes and filters */
-	if (event->attr.exclude_user   ||
-	    event->attr.exclude_kernel ||
-	    event->attr.exclude_hv     ||
-	    event->attr.exclude_idle   ||
-	    event->attr.exclude_host   ||
-	    event->attr.exclude_guest)
+	if (event_has_exclude_flags(event))
 		return -EINVAL;
 
 	if (event->cpu < 0)
-- 
2.7.4


  parent reply	other threads:[~2018-11-16 10:36 UTC|newest]

Thread overview: 29+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-11-16 10:24 [PATCH 00/10] perf/core: Generalise event exclusion checking Andrew Murray
2018-11-16 10:24 ` [PATCH 01/10] perf/core: Add macro to test for event exclusion flags Andrew Murray
2018-11-19 12:58   ` Peter Zijlstra
2018-11-19 16:01   ` Mark Rutland
2018-11-20 11:28   ` Michael Ellerman
2018-11-23 14:32     ` Andrew Murray
2018-11-16 10:24 ` [PATCH 02/10] arm: perf/core: generalise event exclusion checking with perf macro Andrew Murray
2018-11-16 10:24 ` [PATCH 03/10] arm: perf: add additional validation to set_event_filter Andrew Murray
2018-11-16 10:24 ` Andrew Murray [this message]
2018-11-20 11:21   ` [PATCH 04/10] powerpc: perf/core: generalise event exclusion checking with perf macro Michael Ellerman
2018-11-16 10:24 ` [PATCH 05/10] powerpc/pmu/fsl: add additional validation to event_init Andrew Murray
2018-11-16 10:24 ` [PATCH 06/10] alpha: perf/core: generalise event exclusion checking with perf macro Andrew Murray
2018-11-16 10:24 ` [PATCH 07/10] x86: " Andrew Murray
2018-11-16 10:24 ` [PATCH 08/10] perf/core: Remove unused perf_flags Andrew Murray
2018-11-16 10:24 ` [PATCH 09/10] drivers/perf: perf/core: generalise event exclusion checking with perf macro Andrew Murray
2018-11-19 16:03   ` Mark Rutland
2018-11-23 14:31     ` Andrew Murray
2018-11-16 10:24 ` [PATCH 10/10] perf/doc: update design.txt for exclude_{host|guest} flags Andrew Murray
2018-11-20 11:31   ` Michael Ellerman
2018-11-20 13:32     ` Andrew Murray
2018-12-11 11:06       ` Michael Ellerman
2018-12-11 13:59         ` Andrew Murray
2018-12-12  4:48           ` Michael Ellerman
2018-12-12  8:07           ` Christoffer Dall
2018-12-12 17:08             ` Andrew Murray
2018-11-19 13:08 ` [PATCH 00/10] perf/core: Generalise event exclusion checking Peter Zijlstra
2018-11-22 12:21   ` Andrew Murray
2018-11-22 12:26     ` Peter Zijlstra
2018-11-22 12:59       ` Andrew Murray

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1542363853-13849-5-git-send-email-andrew.murray@arm.com \
    --to=andrew.murray@arm.com \
    --cc=acme@kernel.org \
    --cc=benh@kernel.crashing.org \
    --cc=bp@alien8.de \
    --cc=linux-alpha@vger.kernel.org \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linuxppc-dev@lists.ozlabs.org \
    --cc=mark.rutland@arm.com \
    --cc=mingo@redhat.com \
    --cc=peterz@infradead.org \
    --cc=s.hauer@pengutronix.de \
    --cc=shawnguo@kernel.org \
    --cc=tglx@linutronix.de \
    --cc=will.deacon@arm.com \
    --cc=x86@kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).