perf: Fix swapping of cpu_map and stat_config records
PATCH 1/1 perf: Fix swapping of cpu_map and stat_config records
'data' field in perf_record_cpu_map_data struct is 16-bit wide and so should be swapped using bswap_16().
'nr' field in perf_record_stat_config struct should be swapped before being used for size calculation.
--- tools/perf/util/session.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
tools/perf/util/session.c +2 -2
@@ -904,7 +904,7 @@ static void perf_event__cpu_map_swap(union perf_event *event,struct perf_record_record_cpu_map *mask;unsigned i; - data->type =bswap_64 (data->type); + data->type =bswap_16 (data->type);switch (data->type) {case PERF_CPU_MAP__CPUS :
@@ -937,7 +937,7 @@ static void perf_event__stat_config_swap(union perf_event *event, {u64 size; - size = event->stat_config.nr *sizeof (event->stat_config.data[0 ]); + size =bswap_64 (event->stat_config.nr) *sizeof (event->stat_config.data[0 ]); size +=1 ;/* nr item itself */ mem_bswap_64 (&event->stat_config.nr, size); }
Signature · 1 line
2.25.1
Quoted 7 lines · Dmitry Koshelev
'data' field in
perf_record_cpu_map_datastruct is 16-bit wide and so should be swapped usingbswap_16().'nr' field in
perf_record_stat_configstruct should be swapped before being used for size calculation.Signed-off-by Dmitry Koshelev <[email protected]>
thanks,
jirka
Quoted 29 lines
--- tools/perf/util/session.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)tools/perf/util/session.c +2
-2@@ -904,7 +904,7 @@ static void perf_event__cpu_map_swap(union perf_event *event,struct perf_record_record_cpu_map *mask;unsigned i; - data->type =bswap_64 (data->type); + data->type =bswap_16 (data->type);switch (data->type) {case PERF_CPU_MAP__CPUS :@@ -937,7 +937,7 @@ static void perf_event__stat_config_swap(union perf_event *event, {u64 size; - size = event->stat_config.nr *sizeof (event->stat_config.data[0 ]); + size =bswap_64 (event->stat_config.nr) *sizeof (event->stat_config.data[0 ]); size +=1 ;/* nr item itself */ mem_bswap_64 (&event->stat_config.nr, size); }Signature · 1 line
2.25.1
Em Thu, May 06, 2021 at 03:32:10PM +0200, Jiri Olsa escreveu:
Quoted 10 lines · Dmitry Koshelev
Quoted 7 lines
'data' field in
perf_record_cpu_map_datastruct is 16-bit wide and so should be swapped usingbswap_16().'nr' field in
perf_record_stat_configstruct should be swapped before being used for size calculation.Signed-off-by Dmitry Koshelev <[email protected]>Acked-by Jiri Olsa <[email protected]>
Thanks, applied.
- Arnaldo
Quoted 33 lines
thanks,
jirkaQuoted 29 lines
--- tools/perf/util/session.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)tools/perf/util/session.c +2
-2@@ -904,7 +904,7 @@ static void perf_event__cpu_map_swap(union perf_event *event,struct perf_record_record_cpu_map *mask;unsigned i; - data->type =bswap_64 (data->type); + data->type =bswap_16 (data->type);switch (data->type) {case PERF_CPU_MAP__CPUS :@@ -937,7 +937,7 @@ static void perf_event__stat_config_swap(union perf_event *event, {u64 size; - size = event->stat_config.nr *sizeof (event->stat_config.data[0 ]); + size =bswap_64 (event->stat_config.nr) *sizeof (event->stat_config.data[0 ]); size +=1 ;/* nr item itself */ mem_bswap_64 (&event->stat_config.nr, size); }Signature · 1 line
2.25.1
Signature · 1 line
- Arnaldo