Skip to contentSkip to conversation

perf probe: skip test_uprobe_from_different_cu if there is no gcc

PATCH In review Georg Müller 3 participants 5 messages Jul 28, 2023 – Aug 1, 2023 perf events

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 perf probe: skip test_uprobe_from_different_cu if there is no gcc

Without gcc, the test will fail.

On cleanup, ignore probe removal errors. Otherwise, in case of an error adding the probe, the temporary directory is not removed.

Fixes 56cbeacf1435 ("perf probe: Add test for regression introduced by switch to die_get_decl_file()")
---
 tools/perf/tests/shell/test_uprobe_from_different_cu.sh | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)
tools/perf/tests/shell/test_uprobe_from_different_cu.sh +7 -1
index 00d2e0e2e0c2..319f36ebb9a4 100755
@@ -4,6 +4,12 @@
 
 set -e
 
+# skip if there's no gcc
+if ! [ -x "$(command -v gcc)" ]; then
+        echo "failed: no gcc compiler"
+        exit 2
+fi
+
 temp_dir=$(mktemp -d /tmp/perf-uprobe-different-cu-sh.XXXXXXXXXX)
 
 cleanup()
@@ -11,7 +17,7 @@ cleanup()
 	trap - EXIT TERM INT
 	if [[ "${temp_dir}" =~ ^/tmp/perf-uprobe-different-cu-sh.*$ ]]; then
 		echo "--- Cleaning up ---"
-		perf probe -x ${temp_dir}/testfile -d foo
+		perf probe -x ${temp_dir}/testfile -d foo || true
 		rm -f "${temp_dir}/"*
 		rmdir "${temp_dir}"
 	fi

--
2.41.0

reviewer Acked-by on v1 1/1
#1 lore raw
Quoted 9 lines · Georg Müller

Without gcc, the test will fail.

On cleanup, ignore probe removal errors. Otherwise, in case of an error adding the probe, the temporary directory is not removed.

Fixes 56cbeacf1435 ("perf probe: Add test for regression introduced by switch to die_get_decl_file()")

Thanks!
Ian

Quoted 33 lines
---
 tools/perf/tests/shell/test_uprobe_from_different_cu.sh | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)
tools/perf/tests/shell/test_uprobe_from_different_cu.sh +7 -2
index 00d2e0e2e0c2..319f36ebb9a4 100755
@@ -4,6 +4,12 @@
 
 set -e
 
+# skip if there's no gcc
+if ! [ -x "$(command -v gcc)" ]; then
+        echo "failed: no gcc compiler"
+        exit 2
+fi
+
 temp_dir=$(mktemp -d /tmp/perf-uprobe-different-cu-sh.XXXXXXXXXX)
 
 cleanup()
@@ -11,7 +17,7 @@ cleanup()
        trap - EXIT TERM INT
        if [[ "${temp_dir}" =~ ^/tmp/perf-uprobe-different-cu-sh.*$ ]]; then
                echo "--- Cleaning up ---"
-               perf probe -x ${temp_dir}/testfile -d foo
+               perf probe -x ${temp_dir}/testfile -d foo || true
                rm -f "${temp_dir}/"*
                rmdir "${temp_dir}"
        fi
--

2.41.0

Reviewed-by on v1 1/1
#2 lore raw
In reply to Georg Müller
Quoted 4 lines · On Fri, 28 Jul 2023 17:18:12 +0200 Georg Müller <[email protected]> wrote:

Without gcc, the test will fail.

On cleanup, ignore probe removal errors. Otherwise, in case of an error adding the probe, the temporary directory is not removed.

Interesting, so clang will not generate DWARF or perf probe is not able to handle clang generated DWARF?

Anyway, this looks good to me.

Quoted 37 lines
Fixes 56cbeacf1435 ("perf probe: Add test for regression introduced by switch to die_get_decl_file()")
---
 tools/perf/tests/shell/test_uprobe_from_different_cu.sh | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)
tools/perf/tests/shell/test_uprobe_from_different_cu.sh +7 -2
index 00d2e0e2e0c2..319f36ebb9a4 100755
@@ -4,6 +4,12 @@
 
 set -e
 
+# skip if there's no gcc
+if ! [ -x "$(command -v gcc)" ]; then
+        echo "failed: no gcc compiler"
+        exit 2
+fi
+
 temp_dir=$(mktemp -d /tmp/perf-uprobe-different-cu-sh.XXXXXXXXXX)
 
 cleanup()
@@ -11,7 +17,7 @@ cleanup()
 	trap - EXIT TERM INT
 	if [[ "${temp_dir}" =~ ^/tmp/perf-uprobe-different-cu-sh.*$ ]]; then
 		echo "--- Cleaning up ---"
-		perf probe -x ${temp_dir}/testfile -d foo
+		perf probe -x ${temp_dir}/testfile -d foo || true
 		rm -f "${temp_dir}/"*
 		rmdir "${temp_dir}"
 	fi
--

2.41.0

Signature · 1 line
Masami Hiramatsu (Google) <[email protected]>
#3 lore raw

Am 29.07.23 um 02:38 schrieb Masami Hiramatsu (Google):

Quoted 4 lines

Interesting, so clang will not generate DWARF or perf probe is not able to handle clang generated DWARF?

clang does not accept mixed -flto and non-lto CUs and the problem is not reproducible by this sample code using clang if using -flto for all CUs. There might be (bigger?) examples where the same issue is triggered by clang and bigger examples (like systemd on fedora) where I ran into the bug, but this small example only shows the problem when using gcc and mixing -flto and non-lto CUs.

#4 lore raw
Quoted 7 lines · On Sat, 29 Jul 2023 12:59:50 +0200 Georg Müller <[email protected]> wrote:

Am 29.07.23 um 02:38 schrieb Masami Hiramatsu (Google):

Quoted 4 lines

Interesting, so clang will not generate DWARF or perf probe is not able to handle clang generated DWARF?

Quoted 6 lines

clang does not accept mixed -flto and non-lto CUs and the problem is not reproducible by this sample code using clang if using -flto for all CUs. There might be (bigger?) examples where the same issue is triggered by clang and bigger examples (like systemd on fedora) where I ran into the bug, but this small example only shows the problem when using gcc and mixing -flto and non-lto CUs.

Thanks for the explanation! So the problem will be in the compiler side (and maybe fixed when it is updated.)

Thank you,

Signature · 1 line
Masami Hiramatsu (Google) <[email protected]>