tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

perf test probe_vfs_getname: Add regex for searching probe line

Since commit 611851010c74046c ("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: 611851010c74046c ("fs: dedup handling of struct filename init and refcounts bumps")
Suggested-by: Arnaldo Carvalho de Melo <acme@kernel.org>
Signed-off-by: Leo Yan <leo.yan@arm.com>
Tested-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Christian Brauner <brauner@kernel.org>
Cc: Ian Rogers <irogers@google.com>
Cc: Jakub Brnak <jbrnak@redhat.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Kan Liang <kan.liang@linux.intel.com>
Cc: Mateusz Guzik <mjguzik@gmail.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Link: https://lore.kernel.org/r/20250519082755.1669187-1-leo.yan@arm.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

authored by

Leo Yan and committed by
Arnaldo Carvalho de Melo 735a3ac3 4d4eb387

+10 -2
+10 -2
tools/perf/tests/shell/lib/probe_vfs_getname.sh
··· 13 13 add_probe_vfs_getname() { 14 14 add_probe_verbose=$1 15 15 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 + 18 26 if [ -z "$line" ] ; then 19 27 result_aname_re="[[:space:]]+([[:digit:]]+)[[:space:]]+result->aname = NULL;" 20 28 line=$(perf probe -L getname_flags 2>&1 | grep -E "$result_aname_re" | sed -r "s/$result_aname_re/\1/")