2
0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-24 05:04:00 +08:00

libperf: Fix alignment trap with xyarray contents in 'perf stat'

Following the patch 'perf stat: Fix --no-scale', an alignment trap
happens in process_counter_values() on ARMv7 platforms due to the
attempt to copy non 64 bits aligned double words (pointed by 'count')
via a NEON vectored instruction ('vld1' with 64 bits alignment
constraint).

This patch sets a 64 bits alignment constraint on 'contents[]' field in
'struct xyarray' since the 'count' pointer used above points to such a
structure.

Signed-off-by: Gerald Baeza <gerald.baeza@st.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Alexandre Torgue <alexandre.torgue@st.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Mathieu Poirier <mathieu.poirier@linaro.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/r/1566464769-16374-1-git-send-email-gerald.baeza@st.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
Gerald BAEZA 2019-08-22 09:07:01 +00:00 committed by Arnaldo Carvalho de Melo
parent 1ea770f6c1
commit d9c5c08341

View File

@ -2,6 +2,7 @@
#ifndef __LIBPERF_INTERNAL_XYARRAY_H #ifndef __LIBPERF_INTERNAL_XYARRAY_H
#define __LIBPERF_INTERNAL_XYARRAY_H #define __LIBPERF_INTERNAL_XYARRAY_H
#include <linux/compiler.h>
#include <sys/types.h> #include <sys/types.h>
struct xyarray { struct xyarray {
@ -10,7 +11,7 @@ struct xyarray {
size_t entries; size_t entries;
size_t max_x; size_t max_x;
size_t max_y; size_t max_y;
char contents[]; char contents[] __aligned(8);
}; };
struct xyarray *xyarray__new(int xlen, int ylen, size_t entry_size); struct xyarray *xyarray__new(int xlen, int ylen, size_t entry_size);