[PATCH] ARM: perf: fix event validation

[PATCH] ARM: perf: fix event validation

[Will Deacon]

The validate_event function in the ARM perf events backend has the
following problems:

1.) Events that are disabled count towards the cost.
2.) Events associated with other PMUs [for example, software events or
    breakpoints] do not count towards the cost, but do fail validation,
    causing the group to fail.

This patch changes validate_event so that it ignores events in the
PERF_EVENT_STATE_OFF state or that are scheduled for other PMUs.

Cc: Jamie Iles <jamie.iles@picochip.com>
Reported-by: Pawe?? Moll <pawel.moll@arm.com>
Signed-off-by: Will Deacon <will.deacon@arm.com>
---
 arch/arm/kernel/perf_event.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/arm/kernel/perf_event.c b/arch/arm/kernel/perf_event.c
index e213925..ecbb028 100644
--- a/arch/arm/kernel/perf_event.c
+++ b/arch/arm/kernel/perf_event.c
@@ -319,8 +319,8 @@ validate_event(struct cpu_hw_events *cpuc,
 {
 	struct hw_perf_event fake_event = event->hw;
 
-	if (event->pmu && event->pmu != &pmu)
-		return 0;
+	if (event->pmu != &pmu || event->state <= PERF_EVENT_STATE_OFF)
+		return 1;
 
 	return armpmu->get_event_idx(cpuc, &fake_event) >= 0;
 }
-- 
1.6.3.3

[PATCH] ARM: perf: fix event validation

[Will Deacon]

The validate_event function in the ARM perf events backend has the
following problems:

1.) Events that are disabled count towards the cost.
2.) Events associated with other PMUs [for example, software events or
    breakpoints] do not count towards the cost, but do fail validation,
    causing the group to fail.

This patch changes validate_event so that it ignores events in the
PERF_EVENT_STATE_OFF state or that are scheduled for other PMUs.

Cc: Jamie Iles <jamie.iles@picochip.com>
Reported-by: Pawel Moll <pawel.moll@arm.com>
Signed-off-by: Will Deacon <will.deacon@arm.com>
---

Resend with correct spelling of Pawel's email address on CC.
Jamie - are you ok with this fix?

 arch/arm/kernel/perf_event.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/arm/kernel/perf_event.c b/arch/arm/kernel/perf_event.c
index e213925..ecbb028 100644
--- a/arch/arm/kernel/perf_event.c
+++ b/arch/arm/kernel/perf_event.c
@@ -319,8 +319,8 @@ validate_event(struct cpu_hw_events *cpuc,
 {
 	struct hw_perf_event fake_event = event->hw;
 
-	if (event->pmu && event->pmu != &pmu)
-		return 0;
+	if (event->pmu != &pmu || event->state <= PERF_EVENT_STATE_OFF)
+		return 1;
 
 	return armpmu->get_event_idx(cpuc, &fake_event) >= 0;
 }
-- 
1.6.3.3

[PATCH] ARM: perf: fix event validation

[Jamie Iles]

On Wed, Sep 01, 2010 at 01:11:22PM +0100, Will Deacon wrote:
> The validate_event function in the ARM perf events backend has the
> following problems:
> 
> 1.) Events that are disabled count towards the cost.
> 2.) Events associated with other PMUs [for example, software events or
>     breakpoints] do not count towards the cost, but do fail validation,
>     causing the group to fail.
> 
> This patch changes validate_event so that it ignores events in the
> PERF_EVENT_STATE_OFF state or that are scheduled for other PMUs.
> 
> Cc: Jamie Iles <jamie.iles@picochip.com>
> Reported-by: Pawel Moll <pawel.moll@arm.com>
> Signed-off-by: Will Deacon <will.deacon@arm.com>
> ---
> 
> Resend with correct spelling of Pawel's email address on CC.
> Jamie - are you ok with this fix?
Yes, looks good to me.

Acked-by: Jamie Iles <jamie.iles@picochip.com>

[PATCH] ARM: perf: fix event validation

[Will Deacon]

Hi Jamie,

> On Wed, Sep 01, 2010 at 01:11:22PM +0100, Will Deacon wrote:
> > The validate_event function in the ARM perf events backend has the
> > following problems:
> >
> > 1.) Events that are disabled count towards the cost.
> > 2.) Events associated with other PMUs [for example, software events or
> >     breakpoints] do not count towards the cost, but do fail validation,
> >     causing the group to fail.
> >
> > This patch changes validate_event so that it ignores events in the
> > PERF_EVENT_STATE_OFF state or that are scheduled for other PMUs.
> >
> > Cc: Jamie Iles <jamie.iles@picochip.com>
> > Reported-by: Pawel Moll <pawel.moll@arm.com>
> > Signed-off-by: Will Deacon <will.deacon@arm.com>
> > ---
> >
> > Resend with correct spelling of Pawel's email address on CC.
> > Jamie - are you ok with this fix?
> Yes, looks good to me.
> 
> Acked-by: Jamie Iles <jamie.iles@picochip.com>

Thanks for this. Submitted as 6352/1.

Will