Various fixes around undefined behavior
Ian Rogers
reviewerv2 cover Various fixes around undefined behavior
Fix various undefined behavior issues, improve tests to make them easier to diagnose and add assertions so that problems don't recur.
v2: Add Namhyung's acked-by. Drop container_of assert that ptr !=
NULL, to simplify the series. The bsearch UB fix was picked up as a patch by CT:
https://lore.kernel.org/r/[email protected]
It seems this patch series fell-through the cracks as v1 was sent/acked 9 months ago.
v1: https://lore.kernel.org/lkml/[email protected]/
Ian Rogers (5):
perf disasm: Avoid undefined behavior in incrementing NULL perf test trace_btf_enum: Skip if permissions are insufficient perf evsel: Avoid container_of on a NULL leader
perf test shell lock_contention: Extra debug diagnostics libperf event: Ensure tracing data is multiple of 8 sized
tools/lib/perf/include/perf/event.h | 1 + tools/perf/tests/shell/lock_contention.sh | 7 ++++++- tools/perf/tests/shell/trace_btf_enum.sh | 11 +++++++++++ tools/perf/util/disasm.c | 7 +++++-- tools/perf/util/evsel.c | 2 ++ 5 files changed, 25 insertions(+), 3 deletions(-)
Signature · 1 line
2.51.0.rc1.193.gad69d77794-goog
Ian Rogers
reviewerPATCH v2 1/5 perf disasm: Avoid undefined behavior in incrementing NULL
Incrementing NULL is undefined behavior and triggers ubsan during the perf annotate test. Split a compound statement over two lines to avoid this.
--- tools/perf/util/disasm.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
tools/perf/util/disasm.c +5 -2
@@ -390,13 +390,16 @@ static int jump__parse(struct arch *arch, struct ins_operands *ops, struct map_s* skip over possible up to 2 operands to get to address, e.g.: * tbnz w0, #26, ffff0000083cd190 <security_file_permission+0xd0> */ -if (c++ !=NULL ) { +if (c !=NULL ) { + c++; ops->target.addr =strtoull (c,NULL ,16 );if (!ops->target.addr) { c =strchr (c,',' ); c =validate_comma (c, ops); -if (c++ !=NULL ) +if (c !=NULL ) { + c++; ops->target.addr =strtoull (c,NULL ,16 ); + } } }else { ops->target.addr =strtoull (ops->raw,NULL ,16 );
Signature · 1 line
2.51.0.rc1.193.gad69d77794-goog
Re: [PATCH v2 1/5] perf disasm: Avoid undefined behavior in incrementing NULL
Quoted 24 lines · Ian Rogers
Incrementing NULL is undefined behavior and triggers ubsan during the perf annotate test. Split a compound statement over two lines to avoid this.
Fixes 98f69a573c66 ("perf annotate: Split out util/disasm.c")Signed-off-by Ian Rogers <[email protected]>Acked-by Namhyung Kim <[email protected]>--- tools/perf/util/disasm.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)tools/perf/util/disasm.c +2
-1@@ -390,13 +390,16 @@ static int jump__parse(struct arch *arch, struct ins_operands *ops, struct map_s* skip over possible up to 2 operands to get to address, e.g.: * tbnz w0, #26, ffff0000083cd190 <security_file_permission+0xd0> */ -if (c++ !=NULL ) { +if (c !=NULL ) { + c++; ops->target.addr =strtoull (c,NULL ,16 );if (!ops->target.addr) {
tools/perf/util/disasm.c static int jump__parse(struct arch *arch, struct ins_operands *ops, struct map_s · line 405
Quoted 10 lines
tools/perf/util/disasm.c +3
-1c =strchr (c,',' ); c =validate_comma (c, ops); -if (c++ !=NULL ) +if (c !=NULL ) { + c++; ops->target.addr =strtoull (c,NULL ,16 ); + } } }else { ops->target.addr =strtoull (ops->raw,NULL ,16 );
It is undefined behavior, but works correctly with GCC and Clang. In Gnulib, we allow it and suggest using -fno-sanitize=pointer-overflow instead [1].
But I can understand that is not every projects preference. Therefore, this change looks good to me.
Collin
[1] https://www.gnu.org/software/gnulib/manual/html_node/Unsupported-Platforms.html
Ian Rogers
reviewerPATCH v2 2/5 perf test trace_btf_enum: Skip if permissions are insufficient
In reply to Ian RogersModify test behavior to skip if BPF calls fail with "Operation not permitted".
--- tools/perf/tests/shell/trace_btf_enum.sh | 11 +++++++++++ 1 file changed, 11 insertions(+)
tools/perf/tests/shell/trace_btf_enum.sh +11 -0
@@ -23,6 +23,14 @@ check_vmlinux() { fi } +check_permissions() { + if perf trace -e $syscall $TESTPROG 2>&1 | grep -q "Operation not permitted" + then + echo "trace+enum test [Skipped permissions]" + err=2 + fi +} + trace_landlock() { echo "Tracing syscall ${syscall}"
@@ -56,6 +64,9 @@ trace_non_syscall() { } check_vmlinux +if [ $err = 0 ]; then + check_permissions +fi if [ $err = 0 ]; then trace_landlock
Signature · 1 line
2.51.0.rc1.193.gad69d77794-goog
Ian Rogers
reviewerPATCH v2 3/5 perf evsel: Avoid container_of on a NULL leader
In reply to Ian RogersAn evsel should typically have a leader of itself, however, in tests like 'Sample parsing' a NULL leader may occur and the container_of will return a corrupt pointer. Avoid this with an explicit NULL test.
--- tools/perf/util/evsel.c | 2 ++ 1 file changed, 2 insertions(+)
tools/perf/util/evsel.c +2 -0
@@ -3935,6 +3935,8 @@ bool evsel__is_hybrid(const struct evsel *evsel)struct evsel *evsel__leader (const struct evsel *evsel) { +if (evsel->core.leader ==NULL ) +return NULL ; return container_of(evsel->core.leader, struct evsel, core); }
Signature · 1 line
2.51.0.rc1.193.gad69d77794-goog
Ian Rogers
reviewerPATCH v2 4/5 perf test shell lock_contention: Extra debug diagnostics
In reply to Ian RogersIn test_record_concurrent, as stderr is sent to /dev/null, error messages are hidden. Change this to gather the error messages and dump them on failure.
Some minor sh->bash changes to add some more diagnostics in trap_cleanup.
--- tools/perf/tests/shell/lock_contention.sh | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
tools/perf/tests/shell/lock_contention.sh +6 -1
@@ -7,14 +7,17 @@ set -e err=0 perfdata=$(mktemp /tmp/__perf_test.perf.data.XXXXX) result=$(mktemp /tmp/__perf_test.result.XXXXX) +errout=$(mktemp /tmp/__perf_test.errout.XXXXX) cleanup() { rm -f ${perfdata} rm -f ${result} + rm -f ${errout} trap - EXIT TERM INT } trap_cleanup() { + echo "Unexpected signal in ${FUNCNAME[1]}" cleanup exit ${err} }
@@ -75,10 +78,12 @@ test_bpf() test_record_concurrent() { echo "Testing perf lock record and perf lock contention at the same time" - perf lock record -o- -- perf bench sched messaging -p 2> /dev/null | \ + perf lock record -o- -- perf bench sched messaging -p 2> ${errout} | \ perf lock contention -i- -E 1 -q 2> ${result} if [ "$(cat "${result}" | wc -l)" != "1" ]; then echo "[Fail] Recorded result count is not 1:" "$(cat "${result}" | wc -l)" + cat ${errout} + cat ${result} err=1 exit fi
Signature · 1 line
2.51.0.rc1.193.gad69d77794-goog
Ian Rogers
reviewerPATCH v2 5/5 libperf event: Ensure tracing data is multiple of 8 sized
In reply to Ian RogersPerf's synthetic-events.c will ensure 8-byte alignment of tracing data, writing it after a perf_record_header_tracing_data event. Add padding to struct perf_record_header_tracing_data to make it 16-byte rather than 12-byte sized.
--- tools/lib/perf/include/perf/event.h | 1 + 1 file changed, 1 insertion(+)
tools/lib/perf/include/perf/event.h +1 -0
@@ -291,6 +291,7 @@ struct perf_record_header_event_type {struct perf_record_header_tracing_data {struct perf_event_header header;__u32 size; +__u32 pad; };#define PERF_RECORD_MISC_BUILD_ID_SIZE (1 << 15)
Signature · 1 line
2.51.0.rc1.193.gad69d77794-goog
Quoted 19 lines · Ian Rogers
Fix various undefined behavior issues, improve tests to make them easier to diagnose and add assertions so that problems don't recur.
v2: Add Namhyung's acked-by. Drop
container_ofassert that ptr !=
NULL, to simplify the series. The bsearch UB fix was picked up as a patch by CT:
https://lore.kernel.org/r/[email protected]
It seems this patch series fell-through the cracks as v1 was sent/acked 9 months ago.v1: https://lore.kernel.org/lkml/[email protected]/
Ian Rogers (5):
perf disasm: Avoid undefined behavior in incrementing NULL perf testtrace_btf_enum: Skip if permissions are insufficient perf evsel: Avoidcontainer_ofon a NULL leader
perf test shelllock_contention: Extra debug diagnostics libperf event: Ensure tracing data is multiple of 8 sized
Quoted 7 lines
tools/lib/perf/include/perf/event.h | 1 + tools/perf/tests/shell/lock_contention.sh | 7 ++++++- tools/perf/tests/shell/trace_btf_enum.sh | 11 +++++++++++ tools/perf/util/disasm.c | 7 +++++-- tools/perf/util/evsel.c | 2 ++ 5 files changed, 25 insertions(+), 3 deletions(-)
Quoted 5 lines · James Clark
Quoted 2 lines · Ian Rogers
Fix various undefined behavior issues, improve tests to make them easier to diagnose and add assertions so that problems don't recur.
Reviewed-by James Clark <[email protected]>
Thanks, applied to perf-tools-next,
- Arnaldo