Skip to contentSkip to conversation

perf header: Fix handling of PERF_EVENT_UPDATE__SCALE

tip:perf/core tip-bot for Arnaldo Carvalho de Melo 1 participant 1 message Feb 10, 2017 perf events

lore
Share & tools
lore
#0 lore raw
Commit-ID:  8434a2ec13d5c8cb25716950bfbf7c9d7b64628a
Gitweb:     http://git.kernel.org/tip/8434a2ec13d5c8cb25716950bfbf7c9d7b64628a
Author:     Arnaldo Carvalho de Melo <[email protected]>
AuthorDate: Wed, 8 Feb 2017 21:57:22 -0300
Committer:  Arnaldo Carvalho de Melo <[email protected]>
CommitDate: Wed, 8 Feb 2017 22:06:18 -0300

perf header: Fix handling of PERF_EVENT_UPDATE__SCALE

In commit daeecbc0c431 ("perf tools: Add event_update event scale type"), the handling of PERF_EVENT_UPDATE__SCALE cast struct event_update_event->data to a pointer to event_update_event_scale, uses some field from this casted struct and then ends up falling through to the handling of another event type, PERF_EVENT_UPDATE__CPUS were it casts that ev->data to yet another type, oops, fix it by inserting the missing break.

Noticed when building perf using gcc 7 on Fedora Rawhide:

util/header.c: In function 'perf_event__process_event_update':
util/header.c:3207:16: error: this statement may fall through [-Werror=implicit-fallthrough=]

     evsel->scale = ev_scale->scale;
     ~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~
  util/header.c:3208:2: note: here
    case PERF_EVENT_UPDATE__CPUS:
    ^~~~

This wasn't noticed because probably PERF_EVENT_UPDATE__CPUS comes after PERF_EVENT_UPDATE__SCALE, so we would just create a bogus evsel->own_cpus when processing a PERF_EVENT_UPDATE__SCALE to then leak it and create a new cpu map with the correct data.

Cc David Ahern <[email protected]>
Cc Jiri Olsa <[email protected]>
Cc Kan Liang <[email protected]>
Cc Namhyung Kim <[email protected]>
Cc Peter Zijlstra <[email protected]>
Fixes daeecbc0c431 ("perf tools: Add event_update event scale type")
---
 tools/perf/util/header.c | 1 +
 1 file changed, 1 insertion(+)
tools/perf/util/header.c +1 -0
index c567d9f..3d12c16 100644
@@ -3205,6 +3205,7 @@ int perf_event__process_event_update(struct perf_tool *tool __maybe_unused,
 	case PERF_EVENT_UPDATE__SCALE:
 		ev_scale = (struct event_update_event_scale *) ev->data;
 		evsel->scale = ev_scale->scale;
+		break;
 	case PERF_EVENT_UPDATE__CPUS:
 		ev_cpus = (struct event_update_event_cpus *) ev->data;