Skip to content

Commit 735a3ac

Browse files
Leo-Yanacmel
authored andcommitted
perf test probe_vfs_getname: Add regex for searching probe line
Since commit 6118510 ("fs: dedup handling of struct filename init and refcounts bumps"), the kernel has been refactored to use a new inline function initname(), moving name initialization into it. As a result, the perf probe test can no longer find the source line that matches the defined regular expressions. This causes the script to fail when attempting to add probes. Add a regular expression to search for the call site of initname(). This provides a valid source line number for adding the probe. Keeps the older regular expressions for passing test on older kernels. Fixes: 6118510 ("fs: dedup handling of struct filename init and refcounts bumps") Suggested-by: Arnaldo Carvalho de Melo <[email protected]> Signed-off-by: Leo Yan <[email protected]> Tested-by: Arnaldo Carvalho de Melo <[email protected]> Cc: Adrian Hunter <[email protected]> Cc: Christian Brauner <[email protected]> Cc: Ian Rogers <[email protected]> Cc: Jakub Brnak <[email protected]> Cc: Jiri Olsa <[email protected]> Cc: Kan Liang <[email protected]> Cc: Mateusz Guzik <[email protected]> Cc: Namhyung Kim <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Arnaldo Carvalho de Melo <[email protected]>
1 parent 4d4eb38 commit 735a3ac

File tree

1 file changed

+10
-2
lines changed

1 file changed

+10
-2
lines changed

tools/perf/tests/shell/lib/probe_vfs_getname.sh

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,16 @@ cleanup_probe_vfs_getname() {
1313
add_probe_vfs_getname() {
1414
add_probe_verbose=$1
1515
if [ $had_vfs_getname -eq 1 ] ; then
16-
result_filename_re="[[:space:]]+([[:digit:]]+)[[:space:]]+result->uptr.*"
17-
line=$(perf probe -L getname_flags 2>&1 | grep -E "$result_filename_re" | sed -r "s/$result_filename_re/\1/")
16+
result_initname_re="[[:space:]]+([[:digit:]]+)[[:space:]]+initname.*"
17+
line=$(perf probe -L getname_flags 2>&1 | grep -E "$result_initname_re" | sed -r "s/$result_initname_re/\1/")
18+
19+
# Search the old regular expressions so that this will
20+
# pass on older kernels as well.
21+
if [ -z "$line" ] ; then
22+
result_filename_re="[[:space:]]+([[:digit:]]+)[[:space:]]+result->uptr.*"
23+
line=$(perf probe -L getname_flags 2>&1 | grep -E "$result_filename_re" | sed -r "s/$result_filename_re/\1/")
24+
fi
25+
1826
if [ -z "$line" ] ; then
1927
result_aname_re="[[:space:]]+([[:digit:]]+)[[:space:]]+result->aname = NULL;"
2028
line=$(perf probe -L getname_flags 2>&1 | grep -E "$result_aname_re" | sed -r "s/$result_aname_re/\1/")

0 commit comments

Comments
 (0)