Commit 735a3ac3 authored by Leo Yan's avatar Leo Yan Committed by Arnaldo Carvalho de Melo
Browse files

perf test probe_vfs_getname: Add regex for searching probe line 



Since commit 61185101 ("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: 61185101 ("fs: dedup handling of struct filename init and refcounts bumps")
Suggested-by: default avatarArnaldo Carvalho de Melo <acme@kernel.org>
Signed-off-by: default avatarLeo Yan <leo.yan@arm.com>
Tested-by: default avatarArnaldo 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: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 4d4eb387

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

+10 −2
Original line number Diff line number Diff line
@@ -13,8 +13,16 @@ cleanup_probe_vfs_getname() { 
add_probe_vfs_getname() {

	add_probe_verbose=$1

	if [ $had_vfs_getname -eq 1 ] ; then

		result_initname_re="[[:space:]]+([[:digit:]]+)[[:space:]]+initname.*"

		line=$(perf probe -L getname_flags 2>&1 | grep -E "$result_initname_re" | sed -r "s/$result_initname_re/\1/")



		# Search the old regular expressions so that this will

		# pass on older kernels as well.

		if [ -z "$line" ] ; then

			result_filename_re="[[:space:]]+([[:digit:]]+)[[:space:]]+result->uptr.*"

			line=$(perf probe -L getname_flags 2>&1 | grep -E "$result_filename_re" | sed -r "s/$result_filename_re/\1/")

		fi



		if [ -z "$line" ] ; then

			result_aname_re="[[:space:]]+([[:digit:]]+)[[:space:]]+result->aname = NULL;"

			line=$(perf probe -L getname_flags 2>&1 | grep -E "$result_aname_re" | sed -r "s/$result_aname_re/\1/")