| From foo@baz Sat Nov 10 11:24:34 PST 2018 |
| From: David Miller <davem@davemloft.net> |
| Date: Thu, 11 Oct 2018 22:46:55 -0700 |
| Subject: perf cpu_map: Align cpu map synthesized events properly. |
| |
| From: David Miller <davem@davemloft.net> |
| |
| [ 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> |
| --- |
| tools/perf/util/event.c | 1 + |
| 1 file changed, 1 insertion(+) |
| |
| --- a/tools/perf/util/event.c |
| +++ b/tools/perf/util/event.c |
| @@ -839,6 +839,7 @@ void *cpu_map_data__alloc(struct cpu_map |
| } |
| |
| *size += sizeof(struct cpu_map_data); |
| + *size = PERF_ALIGN(*size, sizeof(u64)); |
| return zalloc(*size); |
| } |
| |
