From: Thomas Richter <tmricht@linux.ibm.com>

Date: Wed, 22 Mar 2023 10:47:31 +0100

Subject: [PATCH] perf test: Fix wrong size expectation for 'Setup struct

 perf_event_attr'

References: bsc#1012628

Patch-mainline: 6.3.3

Git-commit: 30df88a80f32ccca5c5cdcf2710d1fb2de5e314d

[ Upstream commit 30df88a80f32ccca5c5cdcf2710d1fb2de5e314d ]

The test case "perf test 'Setup struct perf_event_attr'" is failing.

On s390 this output is observed:

 # ./perf test -Fvvvv 17

 17: Setup struct perf_event_attr                                    :

 --- start ---

 running './tests/attr/test-stat-C0'

 Using CPUID IBM,8561,703,T01,3.6,002f

 .....

 Event event:base-stat

      fd = 1

      group_fd = -1

      flags = 0|8

      cpu = *

      type = 0

      size = 128     <<<--- wrong, specified in file base-stat

      config = 0

      sample_period = 0

      sample_type = 65536

      ...

 'PERF_TEST_ATTR=/tmp/tmpgw574wvg ./perf stat -o \

	/tmp/tmpgw574wvg/perf.data -e cycles -C 0 kill >/dev/null \

	2>&1 ret '1', expected '1'

  loading result events

    Event event-0-0-4

      fd = 4

      group_fd = -1

      cpu = 0

      pid = -1

      flags = 8

      type = 0

      size = 136     <<<--- actual size used in system call

      .....

  compare

    matching [event-0-0-4]

      to [event:base-stat]

      [cpu] 0 *

      [flags] 8 0|8

      [type] 0 0

      [size] 136 128

    ->FAIL

    match: [event-0-0-4] matches []

  expected size=136, got 128

  FAILED './tests/attr/test-stat-C0' - match failure

This mismatch is caused by

commit 09519ec3b19e ("perf: Add perf_event_attr::config3")

which enlarges the structure perf_event_attr by 8 bytes.

Fix this by adjusting the expected value of size.

Output after:

 # ./perf test -Fvvvv 17

 17: Setup struct perf_event_attr                                    :

 --- start ---

 running './tests/attr/test-stat-C0'

 Using CPUID IBM,8561,703,T01,3.6,002f

 ...

  matched

  compare

    matching [event-0-0-4]

      to [event:base-stat]

      [cpu] 0 *

      [flags] 8 0|8

      [type] 0 0

      [size] 136 136

      ....

   ->OK

   match: [event-0-0-4] matches ['event:base-stat']

 matched

Fixes: 09519ec3b19e4144 ("perf: Add perf_event_attr::config3")

Signed-off-by: Thomas Richter <tmricht@linux.ibm.com>

Acked-by: Namhyung Kim <namhyung@kernel.org>

Cc: Heiko Carstens <hca@linux.ibm.com>

Cc: Rob Herring <robh@kernel.org>

Cc: Sumanth Korikkar <sumanthk@linux.ibm.com>

Cc: Sven Schnelle <svens@linux.ibm.com>

Cc: Vasily Gorbik <gor@linux.ibm.com>

Cc: Will Deacon <will@kernel.org>

Link: https://lore.kernel.org/r/20230322094731.1768281-1-tmricht@linux.ibm.com

Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

Signed-off-by: Sasha Levin <sashal@kernel.org>

Signed-off-by: Jiri Slaby <jslaby@suse.cz>

---

 tools/perf/tests/attr/base-record       | 2 +-

 tools/perf/tests/attr/base-stat         | 2 +-

 tools/perf/tests/attr/system-wide-dummy | 2 +-

 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/tools/perf/tests/attr/base-record b/tools/perf/tests/attr/base-record

index 3ef07a12..27c21271 100644

--- a/tools/perf/tests/attr/base-record

+++ b/tools/perf/tests/attr/base-record

@@ -5,7 +5,7 @@ group_fd=-1

 flags=0|8

 cpu=*

 type=0|1

-size=128

+size=136

 config=0

 sample_period=*

 sample_type=263

diff --git a/tools/perf/tests/attr/base-stat b/tools/perf/tests/attr/base-stat

index 40816445..a21fb65b 100644

--- a/tools/perf/tests/attr/base-stat

+++ b/tools/perf/tests/attr/base-stat

@@ -5,7 +5,7 @@ group_fd=-1

 flags=0|8

 cpu=*

 type=0

-size=128

+size=136

 config=0

 sample_period=0

 sample_type=65536

diff --git a/tools/perf/tests/attr/system-wide-dummy b/tools/perf/tests/attr/system-wide-dummy

index 8fec06ed..2f3e3eb7 100644

--- a/tools/perf/tests/attr/system-wide-dummy

+++ b/tools/perf/tests/attr/system-wide-dummy

@@ -7,7 +7,7 @@ cpu=*

 pid=-1

 flags=8

 type=1

-size=128

+size=136

 config=9

 sample_period=4000

 sample_type=455

-- 

2.35.3