Re: [PATCH 03/11] perf: Do not get values from disabled countersin group format read

From: Peter Zijlstra
Date: Thu May 02 2013 - 09:41:06 EST


On Mon, Feb 04, 2013 at 01:32:57PM +0100, Jiri Olsa wrote:
> From: "jolsa@xxxxxxxxxx" <jolsa@xxxxxxxxxx>
>
> It's possible some of the counters in the group could be
> disabled when sampling member of the event group is reading
> the rest via PERF_SAMPLE_READ sample type processing. Disabled
> counters could then produce wrong numbers.
>
> Fixing that by reading only enabled counters for PERF_SAMPLE_READ
> sample type processing.
>
> Signed-off-by: Jiri Olsa <jolsa@xxxxxxxxxx>
> Cc: Arnaldo Carvalho de Melo <acme@xxxxxxxxxxxxxxxxxx>

I had to like re-read our previous thread on this; which I think says that the
Changelog isn't perfect. However:

Acked-by: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx>

> Cc: Ingo Molnar <mingo@xxxxxxx>
> Cc: Paul Mackerras <paulus@xxxxxxxxx>
> Cc: Corey Ashford <cjashfor@xxxxxxxxxxxxxxxxxx>
> Cc: Frederic Weisbecker <fweisbec@xxxxxxxxx>
> Cc: Namhyung Kim <namhyung@xxxxxxxxxx>
> ---
> kernel/events/core.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/kernel/events/core.c b/kernel/events/core.c
> index 4081261..e2ea1b9 100644
> --- a/kernel/events/core.c
> +++ b/kernel/events/core.c
> @@ -4018,7 +4018,8 @@ static void perf_output_read_group(struct perf_output_handle *handle,
> list_for_each_entry(sub, &leader->sibling_list, group_entry) {
> n = 0;
>
> - if (sub != event)
> + if ((sub != event) &&
> + (sub->state == PERF_EVENT_STATE_ACTIVE))
> sub->pmu->read(sub);
>
> values[n++] = perf_event_count(sub);
> --
> 1.7.11.7
>
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/