diff options
| author | David Miller <davem@davemloft.net> | 2018-10-11 22:46:55 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-11-13 11:14:51 -0800 |
| commit | 1309de40f2e0e47cc05c7b4e7a3637c5e71a89af (patch) | |
| tree | fe70fc6e84a9e6440d5c5f2e27e1cef5dbd9d825 /tools | |
| parent | faf96991f88265dd55bf3207109dc5106e570d0c (diff) | |
perf cpu_map: Align cpu map synthesized events properly.
[ Upstream commit 0ed149cf5239cc6e7e65bf00f769e8f1e91076c0 ]
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>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/perf/util/event.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/tools/perf/util/event.c b/tools/perf/util/event.c index fc690fecbfd6..a19e840db54a 100644 --- a/tools/perf/util/event.c +++ b/tools/perf/util/event.c @@ -951,6 +951,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); } |