diff options
| author | Pawel Moll <pawel.moll@arm.com> | 2016-08-11 14:00:36 +0300 |
|---|---|---|
| committer | Pawel Moll <pawel.moll@arm.com> | 2016-08-17 13:42:46 +0300 |
| commit | 3249bce459ff0bb7c1621b00a8e2d6afe24c53bb (patch) | |
| tree | 9d06a1f8662533874eadd2a79469bf0f9d8f4a36 | |
| parent | 90d11e267a32a25d2cb69127174a96b9e518395e (diff) | |
| download | linux-3249bce459ff0bb7c1621b00a8e2d6afe24c53bb.tar.xz | |
bus: arm-ccn: Add missing event attribute exclusions for host/guest
CCN PMUs have no knowledge into VM-related origins of the memory
traffic, therefore can't handle requests for host-only or guest-only
events.
Added appropriate exclusions (they should have been there from the
beginning). This required changing the error code returned, as the
userspace tool only re-negotiates the options (exclude_guest is true by
default) only for EINVAL.
Signed-off-by: Pawel Moll <pawel.moll@arm.com>
| -rw-r--r-- | drivers/bus/arm-ccn.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/bus/arm-ccn.c b/drivers/bus/arm-ccn.c index ddb65c117012..02f81e308dff 100644 --- a/drivers/bus/arm-ccn.c +++ b/drivers/bus/arm-ccn.c @@ -745,9 +745,10 @@ static int arm_ccn_pmu_event_init(struct perf_event *event) if (has_branch_stack(event) || event->attr.exclude_user || event->attr.exclude_kernel || event->attr.exclude_hv || - event->attr.exclude_idle) { + event->attr.exclude_idle || event->attr.exclude_host || + event->attr.exclude_guest) { dev_warn(ccn->dev, "Can't exclude execution levels!\n"); - return -EOPNOTSUPP; + return -EINVAL; } if (event->cpu < 0) { |