Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2ff40250 authored by Andrew Murray's avatar Andrew Murray Committed by Ingo Molnar
Browse files

perf/core, arch/x86: Use PERF_PMU_CAP_NO_EXCLUDE for exclusion incapable PMUs 



For drivers that do not support context exclusion let's advertise the
PERF_PMU_CAP_NOEXCLUDE capability. This ensures that perf will
prevent us from handling events where any exclusion flags are set.
Let's also remove the now unnecessary check for exclusion flags.

PMU drivers that support at least one exclude flag won't have the
PERF_PMU_CAP_NOEXCLUDE capability set - these PMU drivers should still
check and fail on unsupported exclude flags. These missing tests are
not added in this patch.

Signed-off-by: default avatarAndrew Murray <andrew.murray@arm.com>
Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Cc: Arnaldo Carvalho de Melo <acme@kernel.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Ivan Kokshaysky <ink@jurassic.park.msu.ru>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Matt Turner <mattst88@gmail.com>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Richard Henderson <rth@twiddle.net>
Cc: Russell King <linux@armlinux.org.uk>
Cc: Sascha Hauer <s.hauer@pengutronix.de>
Cc: Shawn Guo <shawnguo@kernel.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Will Deacon <will.deacon@arm.com>
Cc: linux-arm-kernel@lists.infradead.org
Cc: linuxppc-dev@lists.ozlabs.org
Cc: robin.murphy@arm.com
Cc: suzuki.poulose@arm.com
Link: https://lkml.kernel.org/r/1547128414-50693-11-git-send-email-andrew.murray@arm.com


Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent c2c9091d

arch/x86/events/amd/ibs.c

+1 −12
Original line number Diff line number Diff line
@@ -253,15 +253,6 @@ static int perf_ibs_precise_event(struct perf_event *event, u64 *config) 
	return -EOPNOTSUPP;

}



static const struct perf_event_attr ibs_notsupp = {

	.exclude_user	= 1,

	.exclude_kernel	= 1,

	.exclude_hv	= 1,

	.exclude_idle	= 1,

	.exclude_host	= 1,

	.exclude_guest	= 1,

};



static int perf_ibs_init(struct perf_event *event)

{

	struct hw_perf_event *hwc = &event->hw;
@@ -282,9 +273,6 @@ static int perf_ibs_init(struct perf_event *event) 
	if (event->pmu != &perf_ibs->pmu)

		return -ENOENT;



	if (perf_flags(&event->attr) & perf_flags(&ibs_notsupp))

		return -EINVAL;



	if (config & ~perf_ibs->config_mask)

		return -EINVAL;
@@ -537,6 +525,7 @@ static struct perf_ibs perf_ibs_fetch = { 
		.start		= perf_ibs_start,

		.stop		= perf_ibs_stop,

		.read		= perf_ibs_read,

		.capabilities	= PERF_PMU_CAP_NO_EXCLUDE,

	},

	.msr			= MSR_AMD64_IBSFETCHCTL,

	.config_mask		= IBS_FETCH_CONFIG_MASK,

arch/x86/events/amd/power.c

+2 −8
Original line number Diff line number Diff line
@@ -136,14 +136,7 @@ static int pmu_event_init(struct perf_event *event) 
		return -ENOENT;



	/* 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  ||

	    /* no sampling */

	    event->attr.sample_period)

	if (event->attr.sample_period)

		return -EINVAL;



	if (cfg != AMD_POWER_EVENTSEL_PKG)
@@ -226,6 +219,7 @@ static struct pmu pmu_class = { 
	.start		= pmu_event_start,

	.stop		= pmu_event_stop,

	.read		= pmu_event_read,

	.capabilities	= PERF_PMU_CAP_NO_EXCLUDE,

};



static int power_cpu_exit(unsigned int cpu)

arch/x86/events/intel/cstate.c

+3 −9
Original line number Diff line number Diff line
@@ -280,13 +280,7 @@ static int cstate_pmu_event_init(struct perf_event *event) 
		return -ENOENT;



	/* 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  ||

	    event->attr.sample_period) /* no sampling */

	if (event->attr.sample_period) /* no sampling */

		return -EINVAL;



	if (event->cpu < 0)
@@ -437,7 +431,7 @@ static struct pmu cstate_core_pmu = { 
	.start		= cstate_pmu_event_start,

	.stop		= cstate_pmu_event_stop,

	.read		= cstate_pmu_event_update,

	.capabilities	= PERF_PMU_CAP_NO_INTERRUPT,

	.capabilities	= PERF_PMU_CAP_NO_INTERRUPT | PERF_PMU_CAP_NO_EXCLUDE,

	.module		= THIS_MODULE,

};
@@ -451,7 +445,7 @@ static struct pmu cstate_pkg_pmu = { 
	.start		= cstate_pmu_event_start,

	.stop		= cstate_pmu_event_stop,

	.read		= cstate_pmu_event_update,

	.capabilities	= PERF_PMU_CAP_NO_INTERRUPT,

	.capabilities	= PERF_PMU_CAP_NO_INTERRUPT | PERF_PMU_CAP_NO_EXCLUDE,

	.module		= THIS_MODULE,

};

arch/x86/events/intel/rapl.c

+2 −7
Original line number Diff line number Diff line
@@ -397,13 +397,7 @@ static int rapl_pmu_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  ||

	    event->attr.sample_period) /* no sampling */

	if (event->attr.sample_period) /* no sampling */

		return -EINVAL;



	/* must be done before validate_group */
@@ -699,6 +693,7 @@ static int __init init_rapl_pmus(void) 
	rapl_pmus->pmu.stop		= rapl_pmu_event_stop;

	rapl_pmus->pmu.read		= rapl_pmu_event_read;

	rapl_pmus->pmu.module		= THIS_MODULE;

	rapl_pmus->pmu.capabilities	= PERF_PMU_CAP_NO_EXCLUDE;

	return 0;

}

arch/x86/events/intel/uncore_snb.c

+2 −7
Original line number Diff line number Diff line
@@ -397,13 +397,7 @@ static int snb_uncore_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  ||

	    event->attr.sample_period) /* no sampling */

	if (event->attr.sample_period) /* no sampling */

		return -EINVAL;



	/*
@@ -497,6 +491,7 @@ static struct pmu snb_uncore_imc_pmu = { 
	.start		= uncore_pmu_event_start,

	.stop		= uncore_pmu_event_stop,

	.read		= uncore_pmu_event_read,

	.capabilities	= PERF_PMU_CAP_NO_EXCLUDE,

};



static struct intel_uncore_ops snb_uncore_imc_ops = {