Commit 92b664dc authored by Jakub Brnak's avatar Jakub Brnak Committed by Arnaldo Carvalho de Melo
Browse files

perf test probe_vfs_getname: Skip if no suitable line detected 



In some cases when calling function add_probe_vfs_getname, line number
can't be detected by 'perf probe -L getname_flags':

  78         atomic_set(&result->refcnt, 1);

	     // one of the following lines should have line number
	     // but sometimes it does not because of optimization
	     result->uptr = filename;
             result->aname = NULL;

  81         audit_getname(result);

To prevent false failures, skip the affected tests if no suitable line
numbers can be detected.

Signed-off-by: default avatarJakub Brnak <jbrnak@redhat.com>
Acked-by: default avatarNamhyung Kim <namhyung@kernel.org>
Tested-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Ian Rogers <irogers@google.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Kan Liang <kan.liang@linux.intel.com>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Masami Hiramatsu <mhiramat@kernel.org>
Cc: Michael Petlan <mpetlan@redhat.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Tomas Glozar <tglozar@redhat.com>
Link: https://lore.kernel.org/r/20250324144523.597557-1-jbrnak@redhat.com


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 13f35928

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

+7 −1
Original line number Diff line number Diff line
@@ -19,8 +19,14 @@ add_probe_vfs_getname() { 
			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/")

		fi



		if [ -z "$line" ] ; then

			echo "Could not find probeable line"

			return 2

		fi



		perf probe -q       "vfs_getname=getname_flags:${line} pathname=result->name:string" || \

		perf probe $add_probe_verbose "vfs_getname=getname_flags:${line} pathname=filename:ustring"

		perf probe $add_probe_verbose "vfs_getname=getname_flags:${line} pathname=filename:ustring" || return 1

	fi

}

tools/perf/tests/shell/probe_vfs_getname.sh

+7 −1
Original line number Diff line number Diff line
@@ -13,7 +13,13 @@ skip_if_no_perf_probe || exit 2 
# shellcheck source=lib/probe_vfs_getname.sh

. "$(dirname $0)"/lib/probe_vfs_getname.sh



add_probe_vfs_getname || skip_if_no_debuginfo

add_probe_vfs_getname

err=$?



if [ $err -eq 1 ] ; then

	skip_if_no_debuginfo

	err=$?

fi



cleanup_probe_vfs_getname

exit $err

tools/perf/tests/shell/record+script_probe_vfs_getname.sh

+7 −1
Original line number Diff line number Diff line
@@ -35,8 +35,14 @@ perf_script_filenames() { 
	grep -E " +touch +[0-9]+ +\[[0-9]+\] +[0-9]+\.[0-9]+: +probe:vfs_getname[_0-9]*: +\([[:xdigit:]]+\) +pathname=\"${file}\""

}



add_probe_vfs_getname || skip_if_no_debuginfo

add_probe_vfs_getname

err=$?



if [ $err -eq 1 ] ; then

        skip_if_no_debuginfo

        err=$?

fi



if [ $err -ne 0 ] ; then

	exit $err

fi

tools/perf/tests/shell/trace+probe_vfs_getname.sh

+7 −2
Original line number Diff line number Diff line
@@ -25,9 +25,14 @@ trace_open_vfs_getname() { 
	grep -E " +[0-9]+\.[0-9]+ +\( +[0-9]+\.[0-9]+ ms\): +touch/[0-9]+ open(at)?\((dfd: +CWD, +)?filename: +\"?${file}\"?, +flags: CREAT\|NOCTTY\|NONBLOCK\|WRONLY, +mode: +IRUGO\|IWUGO\) += +[0-9]+$"

}



add_probe_vfs_getname

err=$?



add_probe_vfs_getname || skip_if_no_debuginfo

if [ $err -eq 1 ] ; then

        skip_if_no_debuginfo

        err=$?

fi



if [ $err -ne 0 ] ; then

	exit $err

fi