Skip to contentSkip to conversation

perf tests: Fix record+script_probe_vfs_getname.sh /tmp cleanup

PATCH Applied James Clark 4 participants 10 messages Sep 21, 2021 – Oct 26, 2021 1 message not in the archive perf events

lore
Share & tools
lore
#0 lore raw

PATCH 1/3 perf tests: Fix record+script_probe_vfs_getname.sh /tmp cleanup

The temp files are only cleaned up if the test is not skipped, so delay making them until after the skip so they don't get left behind in /tmp.

---
 tools/perf/tests/shell/record+script_probe_vfs_getname.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
tools/perf/tests/shell/record+script_probe_vfs_getname.sh +3 -3
index bf9e729b3ecf..8d9c04e450ae 100755
@@ -15,9 +15,6 @@ skip_if_no_perf_probe || exit 2
 
 . $(dirname $0)/lib/probe_vfs_getname.sh
 
-perfdata=$(mktemp /tmp/__perf_test.perf.data.XXXXX)
-file=$(mktemp /tmp/temporary_file.XXXXX)
-
 record_open_file() {
 	echo "Recording open file:"
 	perf record -o ${perfdata} -e probe:vfs_getname\* touch $file
@@ -35,6 +32,9 @@ if [ $err -ne 0 ] ; then
 	exit $err
 fi
 
+perfdata=$(mktemp /tmp/__perf_test.perf.data.XXXXX)
+file=$(mktemp /tmp/temporary_file.XXXXX)
+
 record_open_file && perf_script_filenames
 err=$?
 rm -f ${perfdata}
Signature · 1 line
2.28.0
#1 lore raw

PATCH 2/3 perf tests: Fix trace+probe_vfs_getname.sh /tmp cleanup

The temp file is only cleaned up if the test is not skipped, so delay making it until after the skip so it doesn't get left behind in /tmp.

---
 tools/perf/tests/shell/trace+probe_vfs_getname.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
tools/perf/tests/shell/trace+probe_vfs_getname.sh +2 -2
index 3d31c1d560d6..3d60e993d2b8 100755
@@ -17,8 +17,6 @@ skip_if_no_perf_trace || exit 2
 
 . $(dirname $0)/lib/probe_vfs_getname.sh
 
-file=$(mktemp /tmp/temporary_file.XXXXX)
-
 trace_open_vfs_getname() {
 	evts=$(echo $(perf list syscalls:sys_enter_open* 2>/dev/null | egrep 'open(at)? ' | sed -r 's/.*sys_enter_([a-z]+) +\[.*$/\1/') | sed 's/ /,/')
 	perf trace -e $evts touch $file 2>&1 | \
@@ -32,6 +30,8 @@ if [ $err -ne 0 ] ; then
 	exit $err
 fi
 
+file=$(mktemp /tmp/temporary_file.XXXXX)
+
 # Do not use whatever ~/.perfconfig file, it may change the output
 # via trace.{show_timestamp,show_prefix,etc}
 export PERF_CONFIG=/dev/null
Signature · 1 line
2.28.0
#2 lore raw

PATCH 3/3 perf tests: Improve temp file cleanup in test_arm_coresight.sh

In reply to James Clark

Cleanup perf.data.old files which are also dropped by perf, handle sigint and propagate it to the parent in case the test is run in a bash while loop and don't create the temp files if the test will be skipped.

---
 tools/perf/tests/shell/test_arm_coresight.sh | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)
tools/perf/tests/shell/test_arm_coresight.sh +8 -3
index c9eef0bba6f1..6de53b7ef5ff 100755
@@ -9,8 +9,6 @@
 # SPDX-License-Identifier: GPL-2.0
 # Leo Yan <[email protected]>, 2020
 
-perfdata=$(mktemp /tmp/__perf_test.perf.data.XXXXX)
-file=$(mktemp /tmp/temporary_file.XXXXX)
 glb_err=0
 
 skip_if_no_cs_etm_event() {
@@ -22,13 +20,20 @@ skip_if_no_cs_etm_event() {
 
 skip_if_no_cs_etm_event || exit 2
 
+perfdata=$(mktemp /tmp/__perf_test.perf.data.XXXXX)
+file=$(mktemp /tmp/temporary_file.XXXXX)
+
 cleanup_files()
 {
 	rm -f ${perfdata}
 	rm -f ${file}
+	rm -f "${perfdata}.old"
+	trap - exit term int
+	kill -2 $$
+	exit $glb_err
 }
 
-trap cleanup_files exit
+trap cleanup_files exit term int
 
 record_touch_file() {
 	echo "Recording trace (only user mode) with path: CPU$2 => $1"
Signature · 1 line
2.28.0
reviewer Acked-by on v1 3/3
#3 lore raw

Re: [PATCH 3/3] perf tests: Improve temp file cleanup in test_arm_coresight.sh

Quoted 6 lines · James Clark

Cleanup perf.data.old files which are also dropped by perf, handle sigint and propagate it to the parent in case the test is run in a bash while loop and don't create the temp files if the test will be skipped.

Thanks,
Ian

Quoted 43 lines
---
 tools/perf/tests/shell/test_arm_coresight.sh | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)
tools/perf/tests/shell/test_arm_coresight.sh +8 -4
index c9eef0bba6f1..6de53b7ef5ff 100755
@@ -9,8 +9,6 @@
 # SPDX-License-Identifier: GPL-2.0
 # Leo Yan <[email protected]>, 2020
 
-perfdata=$(mktemp /tmp/__perf_test.perf.data.XXXXX)
-file=$(mktemp /tmp/temporary_file.XXXXX)
 glb_err=0
 
 skip_if_no_cs_etm_event() {
@@ -22,13 +20,20 @@ skip_if_no_cs_etm_event() {
 
 skip_if_no_cs_etm_event || exit 2
 
+perfdata=$(mktemp /tmp/__perf_test.perf.data.XXXXX)
+file=$(mktemp /tmp/temporary_file.XXXXX)
+
 cleanup_files()
 {
        rm -f ${perfdata}
        rm -f ${file}
+       rm -f "${perfdata}.old"
+       trap - exit term int
+       kill -2 $$
+       exit $glb_err
 }
 
-trap cleanup_files exit
+trap cleanup_files exit term int
 
 record_touch_file() {
        echo "Recording trace (only user mode) with path: CPU$2 => $1"
--

2.28.0

Reviewed-by on v1 3/3
#4 lore raw

Re: [PATCH 3/3] perf tests: Improve temp file cleanup in test_arm_coresight.sh

In reply to James Clark
Quoted 26 lines · James Clark

Cleanup perf.data.old files which are also dropped by perf, handle sigint and propagate it to the parent in case the test is run in a bash while loop and don't create the temp files if the test will be skipped.

---
 tools/perf/tests/shell/test_arm_coresight.sh | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)
tools/perf/tests/shell/test_arm_coresight.sh +0 -2
index c9eef0bba6f1..6de53b7ef5ff 100755
@@ -9,8 +9,6 @@
 # SPDX-License-Identifier: GPL-2.0
 # Leo Yan <[email protected]>, 2020
 
-perfdata=$(mktemp /tmp/__perf_test.perf.data.XXXXX)
-file=$(mktemp /tmp/temporary_file.XXXXX)
 glb_err=0
 
 skip_if_no_cs_etm_event() {
@@ -22,13 +20,20 @@ skip_if_no_cs_etm_event() {
 
 skip_if_no_cs_etm_event || exit 2
 

tools/perf/tests/shell/test_arm_coresight.sh skip_if_no_cs_etm_event() { · line 32

Quoted 10 lines
tools/perf/tests/shell/test_arm_coresight.sh +6 -0
+perfdata=$(mktemp /tmp/__perf_test.perf.data.XXXXX)
+file=$(mktemp /tmp/temporary_file.XXXXX)
+
 cleanup_files()
 {
 	rm -f ${perfdata}
 	rm -f ${file}
+	rm -f "${perfdata}.old"
+	trap - exit term int
+	kill -2 $$

Here it always sends signal SIGINT to current PID with $$, another choice is to send signal based on the incoming signal type, like below:

  [[ "$1" = "int" ]] || kill -SIGINT $$
  [[ "$1" = "term" ]] || kill -SIGTERM $$

If you think the current change is sufficient to meet the testing requirement, then this patch would be fine for me either:

Quoted 11 lines
tools/perf/tests/shell/test_arm_coresight.sh +2 -1
+	exit $glb_err
 }
 
-trap cleanup_files exit
+trap cleanup_files exit term int
 
 record_touch_file() {
 	echo "Recording trace (only user mode) with path: CPU$2 => $1"
Signature · 1 line
2.28.0
#5 lore raw

Re: [PATCH 3/3] perf tests: Improve temp file cleanup in test_arm_coresight.sh

Quoted 41 lines · Leo Yan
Quoted 26 lines · James Clark

Cleanup perf.data.old files which are also dropped by perf, handle sigint and propagate it to the parent in case the test is run in a bash while loop and don't create the temp files if the test will be skipped.

---
 tools/perf/tests/shell/test_arm_coresight.sh | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)
tools/perf/tests/shell/test_arm_coresight.sh +0 -2
index c9eef0bba6f1..6de53b7ef5ff 100755
@@ -9,8 +9,6 @@
 # SPDX-License-Identifier: GPL-2.0
 # Leo Yan <[email protected]>, 2020
 
-perfdata=$(mktemp /tmp/__perf_test.perf.data.XXXXX)
-file=$(mktemp /tmp/temporary_file.XXXXX)
 glb_err=0
 
 skip_if_no_cs_etm_event() {
@@ -22,13 +20,20 @@ skip_if_no_cs_etm_event() {
 
 skip_if_no_cs_etm_event || exit 2
 

tools/perf/tests/shell/test_arm_coresight.sh skip_if_no_cs_etm_event() { · line 32

Quoted 10 lines
tools/perf/tests/shell/test_arm_coresight.sh +6 -0
+perfdata=$(mktemp /tmp/__perf_test.perf.data.XXXXX)
+file=$(mktemp /tmp/temporary_file.XXXXX)
+
 cleanup_files()
 {
 	rm -f ${perfdata}
 	rm -f ${file}
+	rm -f "${perfdata}.old"
+	trap - exit term int
+	kill -2 $$

Here it always sends signal SIGINT to current PID with $$, another choice is to send signal based on the incoming signal type, like below:

Quoted 2 lines
  [[ "$1" = "int" ]] || kill -SIGINT $$
  [[ "$1" = "term" ]] || kill -SIGTERM $$

Yes I thought that this might be an issue, but I tested it in a few different scenarios. Especially when running it under the normal ./perf test command and it didn't seem to cause an issue whether it passed or failed. So I'm not sure if it's worth changing or not. Maybe it is in case it gets copy pasted into another shell test?

James

Quoted 17 lines

If you think the current change is sufficient to meet the testing requirement, then this patch would be fine for me either:

Quoted 11 lines
tools/perf/tests/shell/test_arm_coresight.sh +2 -1
+	exit $glb_err
 }
 
-trap cleanup_files exit
+trap cleanup_files exit term int
 
 record_touch_file() {
 	echo "Recording trace (only user mode) with path: CPU$2 => $1"
Signature · 1 line
2.28.0
#6 lore raw

Re: [PATCH 3/3] perf tests: Improve temp file cleanup in test_arm_coresight.sh

Hi James,

On Wed, Sep 22, 2021 at 02:40:54PM +0100, James Clark wrote:

[...]

Quoted 11 lines
Quoted 11 lines

tools/perf/tests/shell/test_arm_coresight.sh skip_if_no_cs_etm_event() { · line 32

Quoted 7 lines

cleanup_files()
{

tools/perf/tests/shell/test_arm_coresight.sh +3 -0
 	rm -f ${perfdata}
 	rm -f ${file}
+	rm -f "${perfdata}.old"
+	trap - exit term int
+	kill -2 $$

Here it always sends signal SIGINT to current PID with $$, another choice is to send signal based on the incoming signal type, like below:

Quoted 8 lines
Quoted 2 lines
  [[ "$1" = "int" ]] || kill -SIGINT $$
  [[ "$1" = "term" ]] || kill -SIGTERM $$

Yes I thought that this might be an issue, but I tested it in a few different scenarios. Especially when running it under the normal ./perf test command and it didn't seem to cause an issue whether it passed or failed. So I'm not sure if it's worth changing or not. Maybe it is in case it gets copy pasted into another shell test?

I think it's not very necessary to send signal again with command "kill -2 $$" at here.

"kill -2 $$" sends the signal to the shell process itself rather than propagating signal to its parent process. And the up level's script should can detect an error with the returned exit code.

So below change should be sufficient?

cleanup_files()

{
	rm -f ${perfdata}
	rm -f ${file}

+ rm -f "${perfdata}.old"
+ exit $glb_err
}

Sorry if I miss anything at here and cause noise.

Thanks,
Leo

#7 lore raw

Re: [PATCH 3/3] perf tests: Improve temp file cleanup in test_arm_coresight.sh

Quoted 43 lines · Leo Yan

Hi James,

On Wed, Sep 22, 2021 at 02:40:54PM +0100, James Clark wrote:

[...]

Quoted 11 lines
Quoted 11 lines

tools/perf/tests/shell/test_arm_coresight.sh skip_if_no_cs_etm_event() { · line 32

Quoted 7 lines

cleanup_files()
{

tools/perf/tests/shell/test_arm_coresight.sh +3 -0
 	rm -f ${perfdata}
 	rm -f ${file}
+	rm -f "${perfdata}.old"
+	trap - exit term int
+	kill -2 $$

Here it always sends signal SIGINT to current PID with $$, another choice is to send signal based on the incoming signal type, like below:

Quoted 8 lines
Quoted 2 lines
  [[ "$1" = "int" ]] || kill -SIGINT $$
  [[ "$1" = "term" ]] || kill -SIGTERM $$

Yes I thought that this might be an issue, but I tested it in a few different scenarios. Especially when running it under the normal ./perf test command and it didn't seem to cause an issue whether it passed or failed. So I'm not sure if it's worth changing or not. Maybe it is in case it gets copy pasted into another shell test?

I think it's not very necessary to send signal again with command "kill -2 $$" at here.

"kill -2 $$" sends the signal to the shell process itself rather than propagating signal to its parent process. And the up level's script should can detect an error with the returned exit code.

So below change should be sufficient?

cleanup_files()

{
	rm -f ${perfdata}
	rm -f ${file}
tools/perf/tests/shell/test_arm_coresight.sh +2 -0
+       rm -f "${perfdata}.old"
+       exit $glb_err

}

Quoted 1 line

Sorry if I miss anything at here and cause noise.

The problem with not re-sending the sigint is that if you want to run the script in a bash while loop like:

while ! tests/shell/test_arm_coresight.sh; do echo loop; done

Then it's impossible to exit with Ctrl-C and delete the temp files at the same time. It exits if we don't trap sigint like it is at the moment, but then it leaves the temporary files. This change is so we can have both behaviours of Ctrl-C in a loop and keep the cleanup working.

Quoted 4 lines

Thanks,
Leo

#8 lore raw

Re: [PATCH 3/3] perf tests: Improve temp file cleanup in test_arm_coresight.sh

On Wed, Sep 22, 2021 at 05:49:55PM +0100, James Clark wrote:

[...]

Quoted 15 lines
Quoted 11 lines

So below change should be sufficient?

cleanup_files()

{
	rm -f ${perfdata}
	rm -f ${file}
tools/perf/tests/shell/test_arm_coresight.sh +2 -0
+       rm -f "${perfdata}.old"
+       exit $glb_err

}

Sorry if I miss anything at here and cause noise.

The problem with not re-sending the sigint is that if you want to run the script in a bash while loop like:

Quoted 6 lines

while ! tests/shell/test_arm_coresight.sh; do echo loop; done

Then it's impossible to exit with Ctrl-C and delete the temp files at the same time. It exits if we don't trap sigint like it is at the moment, but then it leaves the temporary files. This change is so we can have both behaviours of Ctrl-C in a loop and keep the cleanup working.

Okay, I cannot think out better idea to handle this test case; so current patch is fine for me. Thanks for explanation.

Thanks,
Leo

A message that is not in the archive (sent off-list or not yet received): CAP-5=fU_CSPv2Kry6ObbfYG4rNJpprhBrFUOJsNugM-AqQ3xoA@mail.gmail.com