perf parse-events: Use uintptr_t when casting numbers to pointers
Arnaldo Carvalho de Melo
maintainerPATCH 1/1 perf parse-events: Use uintptr_t when casting numbers to pointers
Hi Ian,
Please check that this is ok with you,
Thanks,
- Arnaldo
commit 0823f768b800cca2592fad3b5649766ae6bc4eba
Author: Arnaldo Carvalho de Melo <[email protected]> Date: Thu Sep 3 15:34:20 2020 -0300
perf parse-events: Use uintptr_t when casting numbers to pointers
To address these errors found when cross building from x86_64 to MIPS little endian 32-bit:
CC /tmp/build/perf/util/parse-events-bison.o
util/parse-events.y: In function 'parse_events_parse':
util/parse-events.y:514:6: error: cast to pointer from integer of different size [-Werror=int-to-pointer-cast]
514 | (void *) $2, $6, $4);
| ^
util/parse-events.y:531:7: error: cast to pointer from integer of different size [-Werror=int-to-pointer-cast]
531 | (void *) $2, NULL, $4)) {
| ^
util/parse-events.y:547:6: error: cast to pointer from integer of different size [-Werror=int-to-pointer-cast]
547 | (void *) $2, $4, 0);
| ^
util/parse-events.y:564:7: error: cast to pointer from integer of different size [-Werror=int-to-pointer-cast]
564 | (void *) $2, NULL, 0)) {
| ^
tools/perf/util/parse-events.y +4 -4
@@ -511,7 +511,7 @@ PE_PREFIX_MEM PE_VALUE '/' PE_VALUE ':' PE_MODIFIER_BP sep_dc list = alloc_list(); ABORT_ON(!list); err = parse_events_add_breakpoint(list, &parse_state->idx, - (void *) $2, $6, $4); + (void *)(uintptr_t) $2, $6, $4); free($6); if (err) { free(list);
@@ -528,7 +528,7 @@ PE_PREFIX_MEM PE_VALUE '/' PE_VALUE sep_dc list = alloc_list(); ABORT_ON(!list); if (parse_events_add_breakpoint(list, &parse_state->idx, - (void *) $2, NULL, $4)) { + (void *)(uintptr_t) $2, NULL, $4)) { free(list); YYABORT; }
@@ -544,7 +544,7 @@ PE_PREFIX_MEM PE_VALUE ':' PE_MODIFIER_BP sep_dc list = alloc_list(); ABORT_ON(!list); err = parse_events_add_breakpoint(list, &parse_state->idx, - (void *) $2, $4, 0); + (void *)(uintptr_t) $2, $4, 0); free($4); if (err) { free(list);
@@ -561,7 +561,7 @@ PE_PREFIX_MEM PE_VALUE sep_dc list = alloc_list(); ABORT_ON(!list); if (parse_events_add_breakpoint(list, &parse_state->idx, - (void *) $2, NULL, 0)) { + (void *)(uintptr_t) $2, NULL, 0)) { free(list); YYABORT; }
Ian Rogers
reviewerQuoted 8 lines · Arnaldo Carvalho de Melo
Hi Ian,
Please check that this is ok with you,
Thanks,
- Arnaldo
Thanks Arnaldo, this looks good to me! There is a separate issue, the casts are necessary as we have PE_VALUEs that are supposed to be numbers but here are list*. It seems error prone to have something that is a pointer or a number, and so I wonder if we can introduce new tokens in parse-events.y to handle this. It'd also mean that yydestructors and the like could clean up error states. I'll try to take a look.
Thanks,
Ian
Quoted 84 lines
commit
0823f768b800cca2592fad3b5649766ae6bc4ebaAuthor: Arnaldo Carvalho de Melo <[email protected]> Date: Thu Sep 3 15:34:20 2020 -0300perf parse-events: Use
uintptr_twhen casting numbers to pointersTo address these errors found when cross building from
x86_64to MIPS little endian 32-bit:CC
/tmp/build/perf/util/parse-events-bison.o
util/parse-events.y: In function 'parse_events_parse':
util/parse-events.y:514:6: error: cast to pointer from integer of different size [-Werror=int-to-pointer-cast]
514 | (void *) $2, $6, $4);
| ^
util/parse-events.y:531:7: error: cast to pointer from integer of different size [-Werror=int-to-pointer-cast]
531 | (void *) $2, NULL, $4)) {
| ^
util/parse-events.y:547:6: error: cast to pointer from integer of different size [-Werror=int-to-pointer-cast]
547 | (void *) $2, $4, 0);
| ^
util/parse-events.y:564:7: error: cast to pointer from integer of different size [-Werror=int-to-pointer-cast]
564 | (void *) $2, NULL, 0)) {
| ^Fixes cabbf26821aa210f ("perf parse: Before yyabort-ing free components")Cc Adrian Hunter <[email protected]>Cc Alexander Shishkin <[email protected]>Cc Alexei Starovoitov <[email protected]>Cc Andi Kleen <[email protected]>Cc Daniel Borkmann <[email protected]>Cc Ian Rogers <[email protected]>Cc Jin Yao <[email protected]>Cc Jiri Olsa <[email protected]>Cc John Garry <[email protected]>Cc Kan Liang <[email protected]>Cc Mark Rutland <[email protected]>Cc Martin KaFai Lau <[email protected]>Cc Namhyung Kim <[email protected]>Cc Peter Zijlstra <[email protected]>Cc Song Liu <[email protected]>Cc Stephane Eranian <[email protected]>Cc Yonghong Song <[email protected]>Signed-off-by Arnaldo Carvalho de Melo <[email protected]>tools/perf/util/parse-events.y +4
-4@@ -511,7 +511,7 @@ PE_PREFIX_MEM PE_VALUE '/' PE_VALUE ':' PE_MODIFIER_BP sep_dc list = alloc_list(); ABORT_ON(!list); err = parse_events_add_breakpoint(list, &parse_state->idx, - (void *) $2, $6, $4); + (void *)(uintptr_t) $2, $6, $4); free($6); if (err) { free(list);@@ -528,7 +528,7 @@ PE_PREFIX_MEM PE_VALUE '/' PE_VALUE sep_dc list = alloc_list(); ABORT_ON(!list); if (parse_events_add_breakpoint(list, &parse_state->idx, - (void *) $2, NULL, $4)) { + (void *)(uintptr_t) $2, NULL, $4)) { free(list); YYABORT; }@@ -544,7 +544,7 @@ PE_PREFIX_MEM PE_VALUE ':' PE_MODIFIER_BP sep_dc list = alloc_list(); ABORT_ON(!list); err = parse_events_add_breakpoint(list, &parse_state->idx, - (void *) $2, $4, 0); + (void *)(uintptr_t) $2, $4, 0); free($4); if (err) { free(list);@@ -561,7 +561,7 @@ PE_PREFIX_MEM PE_VALUE sep_dc list = alloc_list(); ABORT_ON(!list); if (parse_events_add_breakpoint(list, &parse_state->idx, - (void *) $2, NULL, 0)) { + (void *)(uintptr_t) $2, NULL, 0)) { free(list); YYABORT; }
Arnaldo Carvalho de Melo
maintainerEm Thu, Sep 03, 2020 at 10:31:09PM -0700, Ian Rogers escreveu:
Quoted 4 lines · Arnaldo Carvalho de Melo
Quoted 1 line
Please check that this is ok with you,
Thanks Arnaldo, this looks good to me!
Thanks for checkint!
- Arnaldo
Quoted 94 lines
There is a separate issue, the casts are necessary as we have
PE_VALUEsthat are supposed to be numbers but here are list*. It seems error prone to have something that is a pointer or a number, and so I wonder if we can introduce new tokens in parse-events.y to handle this. It'd also mean that yydestructors and the like could clean up error states. I'll try to take a look.Thanks,
IanQuoted 84 lines
commit
0823f768b800cca2592fad3b5649766ae6bc4ebaAuthor: Arnaldo Carvalho de Melo <[email protected]> Date: Thu Sep 3 15:34:20 2020 -0300perf parse-events: Use
uintptr_twhen casting numbers to pointersTo address these errors found when cross building from
x86_64to MIPS little endian 32-bit:CC
/tmp/build/perf/util/parse-events-bison.o
util/parse-events.y: In function 'parse_events_parse':
util/parse-events.y:514:6: error: cast to pointer from integer of different size [-Werror=int-to-pointer-cast]
514 | (void *) $2, $6, $4);
| ^
util/parse-events.y:531:7: error: cast to pointer from integer of different size [-Werror=int-to-pointer-cast]
531 | (void *) $2, NULL, $4)) {
| ^
util/parse-events.y:547:6: error: cast to pointer from integer of different size [-Werror=int-to-pointer-cast]
547 | (void *) $2, $4, 0);
| ^
util/parse-events.y:564:7: error: cast to pointer from integer of different size [-Werror=int-to-pointer-cast]
564 | (void *) $2, NULL, 0)) {
| ^Fixes cabbf26821aa210f ("perf parse: Before yyabort-ing free components")Cc Adrian Hunter <[email protected]>Cc Alexander Shishkin <[email protected]>Cc Alexei Starovoitov <[email protected]>Cc Andi Kleen <[email protected]>Cc Daniel Borkmann <[email protected]>Cc Ian Rogers <[email protected]>Cc Jin Yao <[email protected]>Cc Jiri Olsa <[email protected]>Cc John Garry <[email protected]>Cc Kan Liang <[email protected]>Cc Mark Rutland <[email protected]>Cc Martin KaFai Lau <[email protected]>Cc Namhyung Kim <[email protected]>Cc Peter Zijlstra <[email protected]>Cc Song Liu <[email protected]>Cc Stephane Eranian <[email protected]>Cc Yonghong Song <[email protected]>Signed-off-by Arnaldo Carvalho de Melo <[email protected]>tools/perf/util/parse-events.y +4
-4@@ -511,7 +511,7 @@ PE_PREFIX_MEM PE_VALUE '/' PE_VALUE ':' PE_MODIFIER_BP sep_dc list = alloc_list(); ABORT_ON(!list); err = parse_events_add_breakpoint(list, &parse_state->idx, - (void *) $2, $6, $4); + (void *)(uintptr_t) $2, $6, $4); free($6); if (err) { free(list);@@ -528,7 +528,7 @@ PE_PREFIX_MEM PE_VALUE '/' PE_VALUE sep_dc list = alloc_list(); ABORT_ON(!list); if (parse_events_add_breakpoint(list, &parse_state->idx, - (void *) $2, NULL, $4)) { + (void *)(uintptr_t) $2, NULL, $4)) { free(list); YYABORT; }@@ -544,7 +544,7 @@ PE_PREFIX_MEM PE_VALUE ':' PE_MODIFIER_BP sep_dc list = alloc_list(); ABORT_ON(!list); err = parse_events_add_breakpoint(list, &parse_state->idx, - (void *) $2, $4, 0); + (void *)(uintptr_t) $2, $4, 0); free($4); if (err) { free(list);@@ -561,7 +561,7 @@ PE_PREFIX_MEM PE_VALUE sep_dc list = alloc_list(); ABORT_ON(!list); if (parse_events_add_breakpoint(list, &parse_state->idx, - (void *) $2, NULL, 0)) { + (void *)(uintptr_t) $2, NULL, 0)) { free(list); YYABORT; }
Signature · 1 line
- Arnaldo