perf test: Fix attr tests for PERF_FORMAT_LOST
cover perf test: Fix attr tests for PERF_FORMAT_LOST
I'm not sure what the rule is for backwards compatibility of tests, but in this case my change will not work on older kernels because I replaced the previous expected value, rather than adding it as another valid one with an OR. Like "read_format=4|20"
To me it seems that running the tests is a different workflow than say someone running Perf itself on older kernels. And if we keep adding to the valid values in tests, then the tests become less useful over time.
PERF_FORMAT_LOST is not an optional feature so it _should_ always be present. For that reason I chose to not add it as an extra valid value, but I'm happy to change it if we think that new tests should also pass on older kernels.
Thanks
James
James Clark (1):
perf test: Fix attr tests for PERF_FORMAT_LOST
tools/perf/tests/attr/base-record | 2 +- tools/perf/tests/attr/system-wide-dummy | 2 +- tools/perf/tests/attr/test-record-group | 4 ++-- tools/perf/tests/attr/test-record-group-sampling | 6 +++--- tools/perf/tests/attr/test-record-group1 | 4 ++-- tools/perf/tests/attr/test-record-group2 | 4 ++-- 6 files changed, 11 insertions(+), 11 deletions(-)
Signature · 1 line
2.28.0
PATCH 1/1 perf test: Fix attr tests for PERF_FORMAT_LOST
Since PERF_FORMAT_LOST was added, the default read format has that bit set, so add it to the tests. When running on an older kernel the tests will still fail because Perf will not set that bit.
This fixes the following failure:
expected read_format=0|4, got 20
FAILED './tests/attr/test-record-C0' - match failure
--- tools/perf/tests/attr/base-record | 2 +- tools/perf/tests/attr/system-wide-dummy | 2 +- tools/perf/tests/attr/test-record-group | 4 ++-- tools/perf/tests/attr/test-record-group-sampling | 6 +++--- tools/perf/tests/attr/test-record-group1 | 4 ++-- tools/perf/tests/attr/test-record-group2 | 4 ++-- 6 files changed, 11 insertions(+), 11 deletions(-)
tools/perf/tests/attr/base-record +1 -1
@@ -9,7 +9,7 @@ size=128 config=0 sample_period=* sample_type=263 -read_format=0|4 +read_format=0|20 disabled=1 inherit=1 pinned=0
tools/perf/tests/attr/system-wide-dummy +1 -1
@@ -11,7 +11,7 @@ size=128 config=9 sample_period=4000 sample_type=455 -read_format=4 +read_format=20 # Event will be enabled right away. disabled=0 inherit=1
tools/perf/tests/attr/test-record-group +2 -2
@@ -7,14 +7,14 @@ ret = 1 fd=1 group_fd=-1 sample_type=327 -read_format=4 +read_format=20 [event-2:base-record] fd=2 group_fd=1 config=1 sample_type=327 -read_format=4 +read_format=20 mmap=0 comm=0 task=0
tools/perf/tests/attr/test-record-group-sampling +3 -3
@@ -7,7 +7,7 @@ ret = 1 fd=1 group_fd=-1 sample_type=343 -read_format=12 +read_format=28 inherit=0 [event-2:base-record]
@@ -21,8 +21,8 @@ config=3 # default | PERF_SAMPLE_READ sample_type=343 -# PERF_FORMAT_ID | PERF_FORMAT_GROUP -read_format=12 +# PERF_FORMAT_ID | PERF_FORMAT_GROUP | PERF_FORMAT_LOST +read_format=28 task=0 mmap=0 comm=0
tools/perf/tests/attr/test-record-group1 +2 -2
@@ -7,7 +7,7 @@ ret = 1 fd=1 group_fd=-1 sample_type=327 -read_format=4 +read_format=20 [event-2:base-record] fd=2
@@ -15,7 +15,7 @@ group_fd=1 type=0 config=1 sample_type=327 -read_format=4 +read_format=20 mmap=0 comm=0 task=0
tools/perf/tests/attr/test-record-group2 +2 -2
@@ -9,7 +9,7 @@ group_fd=-1 config=0|1 sample_period=1234000 sample_type=87 -read_format=12 +read_format=28 inherit=0 freq=0
@@ -19,7 +19,7 @@ group_fd=1 config=0|1 sample_period=6789000 sample_type=87 -read_format=12 +read_format=28 disabled=0 inherit=0 mmap=0
Signature · 1 line
2.28.0
Quoted 25 lines · James Clark
Since
PERF_FORMAT_LOSTwas added, the default read format has that bit set, so add it to the tests. When running on an older kernel the tests will still fail because Perf will not set that bit.This fixes the following failure:
expected read_format=0|4, got 20
FAILED './tests/attr/test-record-C0' - match failureFixes 85b425f31c88 ("perf record: Set PERF_FORMAT_LOST by default")Signed-off-by James Clark <[email protected]>--- tools/perf/tests/attr/base-record | 2 +- tools/perf/tests/attr/system-wide-dummy | 2 +- tools/perf/tests/attr/test-record-group | 4 ++-- tools/perf/tests/attr/test-record-group-sampling | 6 +++--- tools/perf/tests/attr/test-record-group1 | 4 ++-- tools/perf/tests/attr/test-record-group2 | 4 ++-- 6 files changed, 11 insertions(+), 11 deletions(-)tools/perf/tests/attr/base-record +0
-0
tools/perf/tests/attr/base-record size=128 · line 12
Quoted 5 lines
tools/perf/tests/attr/base-record +1
-1@@ -9,7 +9,7 @@ size=128 config=0 sample_period=* sample_type=263 -read_format=0|4 +read_format=0|20
Hi Namhyung,
Did you manage to take a look at this review? Are you ok with it being 0|20 or should I change it to 0|4|20?
Thanks
James
Quoted 105 lines
tools/perf/tests/attr/base-record +0
-0disabled=1 inherit=1 pinned=0tools/perf/tests/attr/system-wide-dummy +1
-1@@ -11,7 +11,7 @@ size=128 config=9 sample_period=4000 sample_type=455 -read_format=4 +read_format=20 # Event will be enabled right away. disabled=0 inherit=1tools/perf/tests/attr/test-record-group +2
-2@@ -7,14 +7,14 @@ ret = 1 fd=1 group_fd=-1 sample_type=327 -read_format=4 +read_format=20 [event-2:base-record] fd=2 group_fd=1 config=1 sample_type=327 -read_format=4 +read_format=20 mmap=0 comm=0 task=0tools/perf/tests/attr/test-record-group-sampling +3
-3@@ -7,7 +7,7 @@ ret = 1 fd=1 group_fd=-1 sample_type=343 -read_format=12 +read_format=28 inherit=0 [event-2:base-record]@@ -21,8 +21,8 @@ config=3 # default | PERF_SAMPLE_READ sample_type=343 -# PERF_FORMAT_ID | PERF_FORMAT_GROUP -read_format=12 +# PERF_FORMAT_ID | PERF_FORMAT_GROUP | PERF_FORMAT_LOST +read_format=28 task=0 mmap=0 comm=0tools/perf/tests/attr/test-record-group1 +2
-2@@ -7,7 +7,7 @@ ret = 1 fd=1 group_fd=-1 sample_type=327 -read_format=4 +read_format=20 [event-2:base-record] fd=2@@ -15,7 +15,7 @@ group_fd=1 type=0 config=1 sample_type=327 -read_format=4 +read_format=20 mmap=0 comm=0 task=0tools/perf/tests/attr/test-record-group2 +2
-2@@ -9,7 +9,7 @@ group_fd=-1 config=0|1 sample_period=1234000 sample_type=87 -read_format=12 +read_format=28 inherit=0 freq=0@@ -19,7 +19,7 @@ group_fd=1 config=0|1 sample_period=6789000 sample_type=87 -read_format=12 +read_format=28 disabled=0 inherit=0 mmap=0
Namhyung Kim
maintainerHi James,
Quoted 37 lines · James Clark
Quoted 25 lines · James Clark
Since
PERF_FORMAT_LOSTwas added, the default read format has that bit set, so add it to the tests. When running on an older kernel the tests will still fail because Perf will not set that bit.This fixes the following failure:
expected read_format=0|4, got 20
FAILED './tests/attr/test-record-C0' - match failureFixes 85b425f31c88 ("perf record: Set PERF_FORMAT_LOST by default")Signed-off-by James Clark <[email protected]>--- tools/perf/tests/attr/base-record | 2 +- tools/perf/tests/attr/system-wide-dummy | 2 +- tools/perf/tests/attr/test-record-group | 4 ++-- tools/perf/tests/attr/test-record-group-sampling | 6 +++--- tools/perf/tests/attr/test-record-group1 | 4 ++-- tools/perf/tests/attr/test-record-group2 | 4 ++-- 6 files changed, 11 insertions(+), 11 deletions(-)tools/perf/tests/attr/base-record +0
-0tools/perf/tests/attr/base-record size=128 · line 12
Quoted 5 lines
tools/perf/tests/attr/base-record +1
-1@@ -9,7 +9,7 @@ size=128 config=0 sample_period=* sample_type=263 -read_format=0|4 +read_format=0|20Hi Namhyung,
Quoted 2 lines
Did you manage to take a look at this review? Are you ok with it being 0|20 or should I change it to 0|4|20?
I'm sorry I missed this. It'd be nice if it can succeed on old kernels too. Please go with 0|4|20 and the like.
Thanks,
Namhyung
Quoted 106 lines
Quoted 106 lines
tools/perf/tests/attr/base-record +0
-0disabled=1 inherit=1 pinned=0tools/perf/tests/attr/system-wide-dummy +1
-1@@ -11,7 +11,7 @@ size=128 config=9 sample_period=4000 sample_type=455 -read_format=4 +read_format=20 # Event will be enabled right away. disabled=0 inherit=1tools/perf/tests/attr/test-record-group +2
-2@@ -7,14 +7,14 @@ ret = 1 fd=1 group_fd=-1 sample_type=327 -read_format=4 +read_format=20 [event-2:base-record] fd=2 group_fd=1 config=1 sample_type=327 -read_format=4 +read_format=20 mmap=0 comm=0 task=0tools/perf/tests/attr/test-record-group-sampling +3
-3@@ -7,7 +7,7 @@ ret = 1 fd=1 group_fd=-1 sample_type=343 -read_format=12 +read_format=28 inherit=0 [event-2:base-record]@@ -21,8 +21,8 @@ config=3 # default | PERF_SAMPLE_READ sample_type=343 -# PERF_FORMAT_ID | PERF_FORMAT_GROUP -read_format=12 +# PERF_FORMAT_ID | PERF_FORMAT_GROUP | PERF_FORMAT_LOST +read_format=28 task=0 mmap=0 comm=0tools/perf/tests/attr/test-record-group1 +2
-2@@ -7,7 +7,7 @@ ret = 1 fd=1 group_fd=-1 sample_type=327 -read_format=4 +read_format=20 [event-2:base-record] fd=2@@ -15,7 +15,7 @@ group_fd=1 type=0 config=1 sample_type=327 -read_format=4 +read_format=20 mmap=0 comm=0 task=0tools/perf/tests/attr/test-record-group2 +2
-2@@ -9,7 +9,7 @@ group_fd=-1 config=0|1 sample_period=1234000 sample_type=87 -read_format=12 +read_format=28 inherit=0 freq=0@@ -19,7 +19,7 @@ group_fd=1 config=0|1 sample_period=6789000 sample_type=87 -read_format=12 +read_format=28 disabled=0 inherit=0 mmap=0