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

For drivers that do not support context exclusion let's advertise the 


PERF_PMU_CAP_NO_EXCLUDE 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.

Signed-off-by: default avatarAndrew Murray <andrew.murray@arm.com>
Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Acked-by: default avatarWill Deacon <will.deacon@arm.com>
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: 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-8-git-send-email-andrew.murray@arm.com


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

drivers/perf/arm-cci.c

+1 −9
Original line number Diff line number Diff line
@@ -1327,15 +1327,6 @@ static int cci_pmu_event_init(struct perf_event *event) 
	if (is_sampling_event(event) || event->attach_state & PERF_ATTACH_TASK)

		return -EOPNOTSUPP;



	/* We have no filtering of any kind */

	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)

		return -EINVAL;



	/*

	 * Following the example set by other "uncore" PMUs, we accept any CPU

	 * and rewrite its affinity dynamically rather than having perf core
@@ -1433,6 +1424,7 @@ static int cci_pmu_init(struct cci_pmu *cci_pmu, struct platform_device *pdev) 
		.stop		= cci_pmu_stop,

		.read		= pmu_read,

		.attr_groups	= pmu_attr_groups,

		.capabilities	= PERF_PMU_CAP_NO_EXCLUDE,

	};



	cci_pmu->plat_device = pdev;

drivers/perf/arm-ccn.c

+2 −4
Original line number Diff line number Diff line
@@ -741,10 +741,7 @@ static int arm_ccn_pmu_event_init(struct perf_event *event) 
		return -EOPNOTSUPP;

	}



	if (has_branch_stack(event) || 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 (has_branch_stack(event)) {

		dev_dbg(ccn->dev, "Can't exclude execution levels!\n");

		return -EINVAL;

	}
@@ -1290,6 +1287,7 @@ static int arm_ccn_pmu_init(struct arm_ccn *ccn) 
		.read = arm_ccn_pmu_event_read,

		.pmu_enable = arm_ccn_pmu_enable,

		.pmu_disable = arm_ccn_pmu_disable,

		.capabilities = PERF_PMU_CAP_NO_EXCLUDE,

	};



	/* No overflow interrupt? Have to use a timer instead. */

drivers/perf/arm_dsu_pmu.c

+2 −7
Original line number Diff line number Diff line
@@ -562,13 +562,7 @@ static int dsu_pmu_event_init(struct perf_event *event) 
		return -EINVAL;

	}



	if (has_branch_stack(event) ||

	    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 (has_branch_stack(event)) {

		dev_dbg(dsu_pmu->pmu.dev, "Can't support filtering\n");

		return -EINVAL;

	}
@@ -735,6 +729,7 @@ static int dsu_pmu_device_probe(struct platform_device *pdev) 
		.read		= dsu_pmu_read,



		.attr_groups	= dsu_pmu_attr_groups,

		.capabilities	= PERF_PMU_CAP_NO_EXCLUDE,

	};



	rc = perf_pmu_register(&dsu_pmu->pmu, name, -1);

drivers/perf/hisilicon/hisi_uncore_ddrc_pmu.c

+1 −0
Original line number Diff line number Diff line
@@ -396,6 +396,7 @@ static int hisi_ddrc_pmu_probe(struct platform_device *pdev) 
		.stop		= hisi_uncore_pmu_stop,

		.read		= hisi_uncore_pmu_read,

		.attr_groups	= hisi_ddrc_pmu_attr_groups,

		.capabilities	= PERF_PMU_CAP_NO_EXCLUDE,

	};



	ret = perf_pmu_register(&ddrc_pmu->pmu, name, -1);

drivers/perf/hisilicon/hisi_uncore_hha_pmu.c

+1 −0
Original line number Diff line number Diff line
@@ -407,6 +407,7 @@ static int hisi_hha_pmu_probe(struct platform_device *pdev) 
		.stop		= hisi_uncore_pmu_stop,

		.read		= hisi_uncore_pmu_read,

		.attr_groups	= hisi_hha_pmu_attr_groups,

		.capabilities	= PERF_PMU_CAP_NO_EXCLUDE,

	};



	ret = perf_pmu_register(&hha_pmu->pmu, name, -1);

CRA Git | Maintained and supported by SUSTech CRA and CCSE