On Fri, 2010-11-26 at 03:05 +0000, Deng-Cheng Zhu wrote:
> Ignore events that are in off/error state or belong to a different PMU.
>
> This patch originates from the following commit for ARM by Will Deacon:
>
> 65b4711ff513767341aa1915c822de6ec0de65cb
> ARM: 6352/1: perf: fix event validation
>
> Signed-off-by: Deng-Cheng Zhu <dengcheng.zhu@xxxxxxxxx>
> ---
> arch/mips/kernel/perf_event.c | 5 +++--
> 1 files changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/arch/mips/kernel/perf_event.c b/arch/mips/kernel/perf_event.c
> index 1ee44a3..3d55761 100644
> --- a/arch/mips/kernel/perf_event.c
> +++ b/arch/mips/kernel/perf_event.c
> @@ -486,8 +486,9 @@ static int validate_event(struct cpu_hw_events *cpuc,
> {
> struct hw_perf_event fake_hwc = event->hw;
>
> - if (event->pmu && event->pmu != &pmu)
> - return 0;
> + /* Allow mixed event group. So return 1 to pass validation. */
> + if (event->pmu != &pmu || event->state <= PERF_EVENT_STATE_OFF)
> + return 1;
>
> return mipspmu->alloc_counter(cpuc, &fake_hwc) >= 0;
> }
This looks better,
Acked-by: Will Deacon <will.deacon@xxxxxxx>
Will
