Skip to contentSkip to conversation

perf tests shell lib: Use a wildcard to remove the vfs_getname probe

tip:perf/core tip-bot for Arnaldo Carvalho de Melo 1 participant 1 message Feb 17, 2018 perf events

lore
Share & tools
lore
#0 lore raw
Commit-ID:  21316ac6803d4a1aadd74b896db8d60a92cd1140
Gitweb:     https://git.kernel.org/tip/21316ac6803d4a1aadd74b896db8d60a92cd1140
Author:     Arnaldo Carvalho de Melo <[email protected]>
AuthorDate: Fri, 16 Feb 2018 15:26:51 -0300
Committer:  Arnaldo Carvalho de Melo <[email protected]>
CommitDate: Fri, 16 Feb 2018 15:31:12 -0300

perf tests shell lib: Use a wildcard to remove the vfs_getname probe

In some situations the vfs_getname is being added both as requested and with a _1 suffix (inlines?):

probe:vfs_getname_1 (on getname_flags:63@acme/git/linux/fs/namei.c with pathname)

This ends up making the cleanup to miss that one, as it removes just 'probe:vfs_getname', which makes the second test to use this probe point to fail, since it finds that leftover from the first test, use a wildcard to remove both.

Before:

  # perf test 60 61 62 63
  60: Use vfs_getname probe to get syscall args filenames   : FAILED!
  61: probe libc's inet_pton & backtrace it with ping       : Ok
  62: Check open filename arg using perf trace + vfs_getname: FAILED!
  63: Add vfs_getname probe to get syscall args filenames   : Ok

After:

  # perf test 60 61 62 63
  60: Use vfs_getname probe to get syscall args filenames   : Ok
  61: probe libc's inet_pton & backtrace it with ping       : Ok
  62: Check open filename arg using perf trace + vfs_getname: Ok
  63: Add vfs_getname probe to get syscall args filenames   : Ok
  #
---
 tools/perf/tests/shell/lib/probe_vfs_getname.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
tools/perf/tests/shell/lib/probe_vfs_getname.sh +1 -1
index 30a950c..1c16e56 100644
@@ -5,7 +5,7 @@ had_vfs_getname=$?
 
 cleanup_probe_vfs_getname() {
 	if [ $had_vfs_getname -eq 1 ] ; then
-		perf probe -q -d probe:vfs_getname
+		perf probe -q -d probe:vfs_getname*
 	fi
 }