[PATCH] perf: Align cpu map events properly.

[PATCH] perf: Align cpu map events properly.

[David Miller]

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.

Fixes: 6c872901af07 ("perf cpu_map: Add cpu_map event synthesize function")
Signed-off-by: David S. Miller <davem@davemloft.net>

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);
 }
 

Re: [PATCH] perf: Align cpu map events properly.

[Arnaldo Carvalho de Melo]

Em Thu, Oct 11, 2018 at 10:46:55PM -0700, David Miller escreveu:
> 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.
> 
> Fixes: 6c872901af07 ("perf cpu_map: Add cpu_map event synthesize function")
> Signed-off-by: David S. Miller <davem@davemloft.net>

Thanks, applied to perf/urgent.

- Arnaldo
 
> 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);
>  }
>  

[tip:perf/urgent] perf cpu_map: Align cpu map synthesized events properly.

[tip-bot for David Miller]

Commit-ID:  0ed149cf5239cc6e7e65bf00f769e8f1e91076c0
Gitweb:     https://git.kernel.org/tip/0ed149cf5239cc6e7e65bf00f769e8f1e91076c0
Author:     David Miller <davem@davemloft.net>
AuthorDate: Thu, 11 Oct 2018 22:46:55 -0700
Committer:  Arnaldo Carvalho de Melo <acme@redhat.com>
CommitDate: Tue, 16 Oct 2018 12:30:03 -0300

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>
---
 tools/perf/util/event.c | 1 +
 1 file changed, 1 insertion(+)

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);
 }