Patch "perf test: Fix 'perf script' tests on s390" has been added to the 6.7-stable tree

[Sasha Levin <sashal@xxxxxxxxxx>]

This is a note to let you know that I've just added the patch titled

    perf test: Fix 'perf script' tests on s390

to the 6.7-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     perf-test-fix-perf-script-tests-on-s390.patch
and it can be found in the queue-6.7 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.



commit 1c04539c63f70dfdcf690df72947c4279d781499
Author: Thomas Richter <tmricht@xxxxxxxxxxxxx>
Date:   Thu Jan 25 11:03:51 2024 +0100

    perf test: Fix 'perf script' tests on s390
    
    [ Upstream commit 2dac1f089add90a45d93fe8217938281532b86c7 ]
    
    In linux next repo, test case 'perf script tests' fails on s390.
    
    The root case is a command line invocation of 'perf record' with
    call-graph information. On s390 only DWARF formatted call-graphs are
    supported and only on software events.
    
    Change the command line parameters for s390.
    
    Output before:
    
      # perf test 89
      89: perf script tests              : FAILED!
      #
    
    Output after:
    
      # perf test 89
      89: perf script tests              : Ok
      #
    
    Fixes: 0dd5041c9a0eaf8c ("perf addr_location: Add init/exit/copy functions")
    Reviewed-by: Ian Rogers <irogers@xxxxxxxxxx>
    Signed-off-by: Thomas Richter <tmricht@xxxxxxxxxxxxx>
    Cc: Heiko Carstens <hca@xxxxxxxxxxxxx>
    Cc: Namhyung Kim <namhyung@xxxxxxxxxx>
    Cc: Sumanth Korikkar <sumanthk@xxxxxxxxxxxxx>
    Cc: Sven Schnelle <svens@xxxxxxxxxxxxx>
    Cc: Vasily Gorbik <gor@xxxxxxxxxxxxx>
    Link: https://lore.kernel.org/r/20240125100351.936262-1-tmricht@xxxxxxxxxxxxx
    Signed-off-by: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
    Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>

diff --git a/tools/perf/tests/shell/script.sh b/tools/perf/tests/shell/script.sh
index 5ae7bd0031a8..2973adab445d 100755
--- a/tools/perf/tests/shell/script.sh
+++ b/tools/perf/tests/shell/script.sh
@@ -54,7 +54,14 @@ def sample_table(*args):
 def call_path_table(*args):
     print(f'call_path_table({args}')
 _end_of_file_
-	perf record -g -o "${perfdatafile}" true
+	case $(uname -m)
+	in s390x)
+		cmd_flags="--call-graph dwarf -e cpu-clock";;
+	*)
+		cmd_flags="-g";;
+	esac
+
+	perf record $cmd_flags -o "${perfdatafile}" true
 	perf script -i "${perfdatafile}" -s "${db_test}"
 	echo "DB test [Success]"
 }