summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorDavid Miller <davem@davemloft.net>2018-10-11 22:46:55 -0700
committerArnaldo Carvalho de Melo <acme@redhat.com>2018-10-16 12:30:03 -0300
commit0ed149cf5239cc6e7e65bf00f769e8f1e91076c0 (patch)
treef8537e09d76a587f32f4585e573cd8bc5d5de308 /tools
parentc458a6206d2a8600934617ccf88ba7d3a030faba (diff)
downloadlinux-stable-0ed149cf5239cc6e7e65bf00f769e8f1e91076c0.tar.gz
linux-stable-0ed149cf5239cc6e7e65bf00f769e8f1e91076c0.tar.bz2
linux-stable-0ed149cf5239cc6e7e65bf00f769e8f1e91076c0.zip
perf cpu_map: Align cpu map synthesized events properly.
The size of the resulting cpu map can be smaller than a multiple of sizeof(u64), resulting in SIGBUS on cpus like Sparc as the next event will not be aligned properly. Signed-off-by: David S. Miller <davem@davemloft.net> Cc: Jiri Olsa <jolsa@kernel.org> Cc: Kan Liang <kan.liang@intel.com> Fixes: 6c872901af07 ("perf cpu_map: Add cpu_map event synthesize function") Link: http://lkml.kernel.org/r/20181011.224655.716771175766946817.davem@davemloft.net Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools')
-rw-r--r--tools/perf/util/event.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/tools/perf/util/event.c b/tools/perf/util/event.c
index 0cd42150f712..0988eb3b844b 100644
--- a/tools/perf/util/event.c
+++ b/tools/perf/util/event.c
@@ -1081,6 +1081,7 @@ void *cpu_map_data__alloc(struct cpu_map *map, size_t *size, u16 *type, int *max
}
*size += sizeof(struct cpu_map_data);
+ *size = PERF_ALIGN(*size, sizeof(u64));
return zalloc(*size);
}