perf test pmu: Set uninitialized PMU alias to null
PATCH 1/1 perf test pmu: Set uninitialized PMU alias to null
From: Veronika Molnarova <[email protected]>
Commit 3e0bf9 ("perf pmu: Restore full PMU name wildcard support") adds a test case "PMU cmdline match" that covers PMU name wildcard support provided by function perf_pmu__match(). The test works with a wide range of supported combinations of PMU name matching but omits the case that if the perf_pmu__match() cannot match the PMU name to the wildcard, it tries to match its alias. However, this variable is not set up, causing the test case to fail when run with subprocesses or to segfault if run as a single process.
./perf test -vv 9
9: Sysfs PMU tests : 9.1: Parsing with PMU format directory : Ok 9.2: Parsing with PMU event : Ok 9.3: PMU event names : Ok 9.4: PMU name combining : Ok 9.5: PMU name comparison : Ok 9.6: PMU cmdline match : FAILED!
./perf test -F 9
9.1: Parsing with PMU format directory : Ok 9.2: Parsing with PMU event : Ok 9.3: PMU event names : Ok 9.4: PMU name combining : Ok 9.5: PMU name comparison : Ok
Segmentation fault (core dumped)
Initialize the PMU alias to null for all tests of perf_pmu__match() as this functionality is not being tested and the alias matching works exactly the same as the matching of the PMU name.
./perf test -F 9
9.1: Parsing with PMU format directory : Ok 9.2: Parsing with PMU event : Ok 9.3: PMU event names : Ok 9.4: PMU name combining : Ok 9.5: PMU name comparison : Ok 9.6: PMU cmdline match : Ok
--- tools/perf/tests/pmu.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
tools/perf/tests/pmu.c +3 -1
@@ -453,11 +453,13 @@ static int test__name_cmp(struct test_suite *test __maybe_unused, int subtest __/** * Test perf_pmu__match() that's used to search for a PMU given a name passed * on the command line. The name that's passed may also be a filename type glob -* match. +* match. If the name does not match, perf_pmu__match() attempts to match the +* alias of the PMU, if provided. */ static int test__pmu_match (struct test_suite *test__maybe_unused ,int subtest__maybe_unused ) {struct perf_pmu test_pmu; + test_pmu.alias_name =NULL ; test_pmu.name ="pmuname" ;TEST_ASSERT_EQUAL ("Exact match" ,perf_pmu__match (&test_pmu,"pmuname" ), true);
Signature · 1 line
2.43.0
Arnaldo Carvalho de Melo
maintainerQuoted 52 lines · On Thu, Aug 08, 2024 at 12:37:49PM +0200, [email protected] wrote:
From: Veronika Molnarova <[email protected]>
Commit 3e0bf9 ("perf pmu: Restore full PMU name wildcard support") adds a test case "PMU cmdline match" that covers PMU name wildcard support provided by function
perf_pmu__match(). The test works with a wide range of supported combinations of PMU name matching but omits the case that if theperf_pmu__match()cannot match the PMU name to the wildcard, it tries to match its alias. However, this variable is not set up, causing the test case to fail when run with subprocesses or to segfault if run as a single process../perf test -vv 9
9: Sysfs PMU tests : 9.1: Parsing with PMU format directory : Ok 9.2: Parsing with PMU event : Ok 9.3: PMU event names : Ok 9.4: PMU name combining : Ok 9.5: PMU name comparison : Ok 9.6: PMU cmdline match : FAILED!./perf test -F 9
9.1: Parsing with PMU format directory : Ok 9.2: Parsing with PMU event : Ok 9.3: PMU event names : Ok 9.4: PMU name combining : Ok 9.5: PMU name comparison : OkSegmentation fault (core dumped)
Initialize the PMU alias to null for all tests of
perf_pmu__match()as this functionality is not being tested and the alias matching works exactly the same as the matching of the PMU name../perf test -F 9
9.1: Parsing with PMU format directory : Ok 9.2: Parsing with PMU event : Ok 9.3: PMU event names : Ok 9.4: PMU name combining : Ok 9.5: PMU name comparison : Ok 9.6: PMU cmdline match : OkFixes 3e0bf9 ("perf pmu: Restore full PMU name wildcard support")Signed-off-by Veronika Molnarova <[email protected]>--- tools/perf/tests/pmu.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)tools/perf/tests/pmu.c +0
-0@@ -453,11 +453,13 @@ static int test__name_cmp(struct test_suite *test __maybe_unused, int subtest __/**
tools/perf/tests/pmu.c static int test__name_cmp(struct test_suite *test __maybe_unused, int subtest __ · line 462
Quoted 10 lines
tools/perf/tests/pmu.c +3
-1* Test perf_pmu__match() that's used to search for a PMU given a name passed * on the command line. The name that's passed may also be a filename type glob -* match. +* match. If the name does not match, perf_pmu__match() attempts to match the +* alias of the PMU, if provided. */ static int test__pmu_match (struct test_suite *test__maybe_unused ,int subtest__maybe_unused ) {struct perf_pmu test_pmu; + test_pmu.alias_name =NULL ;
We can do a bit more future proofing by instead doing:
struct perf_pmu test_pmu = {
.name = "pmuname",
};So that all the other fields are initialized to zero, ok? I'll do this change and make a note in the commit, lemme know if you disagree.
- Arnaldo
Quoted 5 lines
tools/perf/tests/pmu.c +0
-0test_pmu.name ="pmuname" ;TEST_ASSERT_EQUAL ("Exact match" ,perf_pmu__match (&test_pmu,"pmuname" ), true);Signature · 1 line
2.43.0
Arnaldo Carvalho de Melo
maintainerQuoted 66 lines · Arnaldo Carvalho de Melo
Quoted 52 lines · On Thu, Aug 08, 2024 at 12:37:49PM +0200, [email protected] wrote:
From: Veronika Molnarova <[email protected]>
Commit 3e0bf9 ("perf pmu: Restore full PMU name wildcard support") adds a test case "PMU cmdline match" that covers PMU name wildcard support provided by function
perf_pmu__match(). The test works with a wide range of supported combinations of PMU name matching but omits the case that if theperf_pmu__match()cannot match the PMU name to the wildcard, it tries to match its alias. However, this variable is not set up, causing the test case to fail when run with subprocesses or to segfault if run as a single process../perf test -vv 9
9: Sysfs PMU tests : 9.1: Parsing with PMU format directory : Ok 9.2: Parsing with PMU event : Ok 9.3: PMU event names : Ok 9.4: PMU name combining : Ok 9.5: PMU name comparison : Ok 9.6: PMU cmdline match : FAILED!./perf test -F 9
9.1: Parsing with PMU format directory : Ok 9.2: Parsing with PMU event : Ok 9.3: PMU event names : Ok 9.4: PMU name combining : Ok 9.5: PMU name comparison : OkSegmentation fault (core dumped)
Initialize the PMU alias to null for all tests of
perf_pmu__match()as this functionality is not being tested and the alias matching works exactly the same as the matching of the PMU name../perf test -F 9
9.1: Parsing with PMU format directory : Ok 9.2: Parsing with PMU event : Ok 9.3: PMU event names : Ok 9.4: PMU name combining : Ok 9.5: PMU name comparison : Ok 9.6: PMU cmdline match : OkFixes 3e0bf9 ("perf pmu: Restore full PMU name wildcard support")Signed-off-by Veronika Molnarova <[email protected]>--- tools/perf/tests/pmu.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)tools/perf/tests/pmu.c +0
-0@@ -453,11 +453,13 @@ static int test__name_cmp(struct test_suite *test __maybe_unused, int subtest __/** tools/perf/tests/pmu.c static int test__name_cmp(struct test_suite *test __maybe_unused, int subtest __ · line 462
Quoted 10 lines
tools/perf/tests/pmu.c +3
-1* Test perf_pmu__match() that's used to search for a PMU given a name passed * on the command line. The name that's passed may also be a filename type glob -* match. +* match. If the name does not match, perf_pmu__match() attempts to match the +* alias of the PMU, if provided. */ static int test__pmu_match (struct test_suite *test__maybe_unused ,int subtest__maybe_unused ) {struct perf_pmu test_pmu; + test_pmu.alias_name =NULL ;We can do a bit more future proofing by instead doing:
Quoted 6 lines
struct perf_pmu test_pmu = { .name = "pmuname", };So that all the other fields are initialized to zero, ok? I'll do this change and make a note in the commit, lemme know if you disagree.
Nah, tried with:
tools/perf/tests/pmu.c +4 -4
@@ -457,11 +457,11 @@ static int test__name_cmp(struct test_suite *test __maybe_unused, int subtest __* alias of the PMU, if provided. */ static int test__pmu_match (struct test_suite *test__maybe_unused ,int subtest__maybe_unused ) -{ -struct perf_pmu test_pmu; - test_pmu.alias_name =NULL ; - test_pmu.name ="pmuname" ; + struct perf_pmu test_pmu = { + .name ="pmuname" , + }; +TEST_ASSERT_EQUAL ("Exact match" ,perf_pmu__match (&test_pmu,"pmuname" ), true);TEST_ASSERT_EQUAL ("Longer token" ,perf_pmu__match (&test_pmu,"longertoken" ), false);TEST_ASSERT_EQUAL ("Shorter token" ,perf_pmu__match (&test_pmu,"pmu" ), false);
But those macros are not liking it:
tests/pmu.c: In function ‘test__pmu_match’:tests/pmu.c:461:16: error: parameter ‘test_pmu’ is initialized
461 | struct perf_pmu test_pmu = {
| ^~~~~~~~
In file included from tests/pmu.c:7:
tests/tests.h:22:1: error: expected declaration specifiers before ‘do’
22 | do { \
| ^~
tests/pmu.c:465:9: note: in expansion of macro ‘TEST_ASSERT_EQUAL’
465 | TEST_ASSERT_EQUAL("Exact match", perf_pmu__match(&test_pmu, "pmuname"), true);
| ^~~~~~~~~~~~~~~~~
tests/tests.h:28:3: error: expected declaration specifiers before ‘while’
28 | } while (0)
| ^~~~~So I'll not spend more time here, I'm keeping your patch as-is.
Thanks and sorry for the noise :-)
- Arnaldo
Quoted 87 lines · Arnaldo Carvalho de Melo
Quoted 66 lines · Arnaldo Carvalho de Melo
Quoted 52 lines · On Thu, Aug 08, 2024 at 12:37:49PM +0200, [email protected] wrote:
From: Veronika Molnarova <[email protected]>
Commit 3e0bf9 ("perf pmu: Restore full PMU name wildcard support") adds a test case "PMU cmdline match" that covers PMU name wildcard support provided by function
perf_pmu__match(). The test works with a wide range of supported combinations of PMU name matching but omits the case that if theperf_pmu__match()cannot match the PMU name to the wildcard, it tries to match its alias. However, this variable is not set up, causing the test case to fail when run with subprocesses or to segfault if run as a single process../perf test -vv 9
9: Sysfs PMU tests : 9.1: Parsing with PMU format directory : Ok 9.2: Parsing with PMU event : Ok 9.3: PMU event names : Ok 9.4: PMU name combining : Ok 9.5: PMU name comparison : Ok 9.6: PMU cmdline match : FAILED!./perf test -F 9
9.1: Parsing with PMU format directory : Ok 9.2: Parsing with PMU event : Ok 9.3: PMU event names : Ok 9.4: PMU name combining : Ok 9.5: PMU name comparison : OkSegmentation fault (core dumped)
Initialize the PMU alias to null for all tests of
perf_pmu__match()as this functionality is not being tested and the alias matching works exactly the same as the matching of the PMU name../perf test -F 9
9.1: Parsing with PMU format directory : Ok 9.2: Parsing with PMU event : Ok 9.3: PMU event names : Ok 9.4: PMU name combining : Ok 9.5: PMU name comparison : Ok 9.6: PMU cmdline match : OkFixes 3e0bf9 ("perf pmu: Restore full PMU name wildcard support")Signed-off-by Veronika Molnarova <[email protected]>--- tools/perf/tests/pmu.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)tools/perf/tests/pmu.c +0
-0@@ -453,11 +453,13 @@ static int test__name_cmp(struct test_suite *test __maybe_unused, int subtest __/** tools/perf/tests/pmu.c static int test__name_cmp(struct test_suite *test __maybe_unused, int subtest __ · line 462
Quoted 10 lines
tools/perf/tests/pmu.c +3
-1* Test perf_pmu__match() that's used to search for a PMU given a name passed * on the command line. The name that's passed may also be a filename type glob -* match. +* match. If the name does not match, perf_pmu__match() attempts to match the +* alias of the PMU, if provided. */ static int test__pmu_match (struct test_suite *test__maybe_unused ,int subtest__maybe_unused ) {struct perf_pmu test_pmu; + test_pmu.alias_name =NULL ;We can do a bit more future proofing by instead doing:
Quoted 6 lines
struct perf_pmu test_pmu = { .name = "pmuname", };So that all the other fields are initialized to zero, ok? I'll do this change and make a note in the commit, lemme know if you disagree.
Nah, tried with:
tools/perf/tests/pmu.c +0
-2@@ -457,11 +457,11 @@ static int test__name_cmp(struct test_suite *test __maybe_unused, int subtest __* alias of the PMU, if provided. */ static int test__pmu_match (struct test_suite *test__maybe_unused ,int subtest__maybe_unused ) -{ -struct perf_pmu test_pmu;
tools/perf/tests/pmu.c static int test__name_cmp(struct test_suite *test __maybe_unused, int subtest __ · line 467
Quoted 10 lines
tools/perf/tests/pmu.c +4
-2- test_pmu.alias_name =NULL ; - test_pmu.name ="pmuname" ; +struct perf_pmu test_pmu = { + .name ="pmuname" , + }; +TEST_ASSERT_EQUAL ("Exact match" ,perf_pmu__match (&test_pmu,"pmuname" ), true);TEST_ASSERT_EQUAL ("Longer token" ,perf_pmu__match (&test_pmu,"longertoken" ), false);TEST_ASSERT_EQUAL ("Shorter token" ,perf_pmu__match (&test_pmu,"pmu" ), false);
Isn't the error caused by a missing curly bracket at the start of the function? Tried it and works just fine for me.
tools/perf/tests/pmu.c +3 -3
@@ -458,10 +458,10 @@ static int test__name_cmp(struct test_suite *test __maybe_unused, int subtest __*/ static int test__pmu_match (struct test_suite *test__maybe_unused ,int subtest__maybe_unused ) { -struct perf_pmu test_pmu; - test_pmu.alias_name =NULL ; +struct perf_pmu test_pmu = { + .name ="pmuname" , + }; - test_pmu.name ="pmuname" ;TEST_ASSERT_EQUAL ("Exact match" ,perf_pmu__match (&test_pmu,"pmuname" ), true);TEST_ASSERT_EQUAL ("Longer token" ,perf_pmu__match (&test_pmu,"longertoken" ), false);TEST_ASSERT_EQUAL ("Shorter token" ,perf_pmu__match (&test_pmu,"pmu" ), false);
./perf test -F 9
9.1: Parsing with PMU format directory : Ok 9.2: Parsing with PMU event : Ok 9.3: PMU event names : Ok 9.4: PMU name combining : Ok 9.5: PMU name comparison : Ok 9.6: PMU cmdline match : Ok
Quoted 23 lines
But those macros are not liking it:
tests/pmu.c: In function ‘test__pmu_match’:tests/pmu.c:461:16: error: parameter ‘test_pmu’ is initialized461 | struct perf_pmu test_pmu = { | ^~~~~~~~ In file included from tests/pmu.c:7: tests/tests.h:22:1: error: expected declaration specifiers before ‘do’ 22 | do { \ | ^~ tests/pmu.c:465:9: note: in expansion of macro ‘TEST_ASSERT_EQUAL’ 465 | TEST_ASSERT_EQUAL("Exact match", perf_pmu__match(&test_pmu, "pmuname"), true); | ^~~~~~~~~~~~~~~~~ tests/tests.h:28:3: error: expected declaration specifiers before ‘while’ 28 | } while (0) | ^~~~~So I'll not spend more time here, I'm keeping your patch as-is.
Thanks and sorry for the noise :-)
- Arnaldo
Arnaldo Carvalho de Melo
maintainerQuoted 89 lines · Veronika Molnarova
Quoted 88 lines · Arnaldo Carvalho de Melo
Quoted 66 lines · Arnaldo Carvalho de Melo
Quoted 52 lines · On Thu, Aug 08, 2024 at 12:37:49PM +0200, [email protected] wrote:
From: Veronika Molnarova <[email protected]>
Commit 3e0bf9 ("perf pmu: Restore full PMU name wildcard support") adds a test case "PMU cmdline match" that covers PMU name wildcard support provided by function
perf_pmu__match(). The test works with a wide range of supported combinations of PMU name matching but omits the case that if theperf_pmu__match()cannot match the PMU name to the wildcard, it tries to match its alias. However, this variable is not set up, causing the test case to fail when run with subprocesses or to segfault if run as a single process../perf test -vv 9
9: Sysfs PMU tests : 9.1: Parsing with PMU format directory : Ok 9.2: Parsing with PMU event : Ok 9.3: PMU event names : Ok 9.4: PMU name combining : Ok 9.5: PMU name comparison : Ok 9.6: PMU cmdline match : FAILED!./perf test -F 9
9.1: Parsing with PMU format directory : Ok 9.2: Parsing with PMU event : Ok 9.3: PMU event names : Ok 9.4: PMU name combining : Ok 9.5: PMU name comparison : OkSegmentation fault (core dumped)
Initialize the PMU alias to null for all tests of
perf_pmu__match()as this functionality is not being tested and the alias matching works exactly the same as the matching of the PMU name../perf test -F 9
9.1: Parsing with PMU format directory : Ok 9.2: Parsing with PMU event : Ok 9.3: PMU event names : Ok 9.4: PMU name combining : Ok 9.5: PMU name comparison : Ok 9.6: PMU cmdline match : OkFixes 3e0bf9 ("perf pmu: Restore full PMU name wildcard support")Signed-off-by Veronika Molnarova <[email protected]>--- tools/perf/tests/pmu.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)tools/perf/tests/pmu.c +0
-0@@ -453,11 +453,13 @@ static int test__name_cmp(struct test_suite *test __maybe_unused, int subtest __/** tools/perf/tests/pmu.c static int test__name_cmp(struct test_suite *test __maybe_unused, int subtest __ · line 462
Quoted 10 lines
tools/perf/tests/pmu.c +3
-1* Test perf_pmu__match() that's used to search for a PMU given a name passed * on the command line. The name that's passed may also be a filename type glob -* match. +* match. If the name does not match, perf_pmu__match() attempts to match the +* alias of the PMU, if provided. */ static int test__pmu_match (struct test_suite *test__maybe_unused ,int subtest__maybe_unused ) {struct perf_pmu test_pmu; + test_pmu.alias_name =NULL ;We can do a bit more future proofing by instead doing:
Quoted 6 lines
struct perf_pmu test_pmu = { .name = "pmuname", };So that all the other fields are initialized to zero, ok? I'll do this change and make a note in the commit, lemme know if you disagree.
Nah, tried with:
tools/perf/tests/pmu.c +0
-3@@ -457,11 +457,11 @@ static int test__name_cmp(struct test_suite *test __maybe_unused, int subtest __* alias of the PMU, if provided. */ static int test__pmu_match (struct test_suite *test__maybe_unused ,int subtest__maybe_unused ) -{ -struct perf_pmu test_pmu; - test_pmu.alias_name =NULL ;
Quoted 11 lines
tools/perf/tests/pmu.c static int test__name_cmp(struct test_suite *test __maybe_unused, int subtest __ · line 467
Quoted 9 lines
tools/perf/tests/pmu.c +4
-1- test_pmu.name ="pmuname" ; +struct perf_pmu test_pmu = { + .name ="pmuname" , + }; +TEST_ASSERT_EQUAL ("Exact match" ,perf_pmu__match (&test_pmu,"pmuname" ), true);TEST_ASSERT_EQUAL ("Longer token" ,perf_pmu__match (&test_pmu,"longertoken" ), false);TEST_ASSERT_EQUAL ("Shorter token" ,perf_pmu__match (&test_pmu,"pmu" ), false);Isn't the error caused by a missing curly bracket at the start of the function? Tried it and works just fine for me.
Right, well spotted! My bad :-\
Anyway, it is already in perf-tools-next, so I can't change it anymore, so I'll add a patch on top of it doing this more future-proof approach.
Thanks for finding my mistake!
- Arnaldo
Quoted 51 lines
tools/perf/tests/pmu.c +3
-3@@ -458,10 +458,10 @@ static int test__name_cmp(struct test_suite *test __maybe_unused, int subtest __*/ static int test__pmu_match (struct test_suite *test__maybe_unused ,int subtest__maybe_unused ) { -struct perf_pmu test_pmu; - test_pmu.alias_name =NULL ; +struct perf_pmu test_pmu = { + .name ="pmuname" , + }; - test_pmu.name ="pmuname" ;TEST_ASSERT_EQUAL ("Exact match" ,perf_pmu__match (&test_pmu,"pmuname" ), true);TEST_ASSERT_EQUAL ("Longer token" ,perf_pmu__match (&test_pmu,"longertoken" ), false);TEST_ASSERT_EQUAL ("Shorter token" ,perf_pmu__match (&test_pmu,"pmu" ), false);./perf test -F 9
9.1: Parsing with PMU format directory : Ok 9.2: Parsing with PMU event : Ok 9.3: PMU event names : Ok 9.4: PMU name combining : Ok 9.5: PMU name comparison : Ok 9.6: PMU cmdline match : OkQuoted 23 lines
But those macros are not liking it:
tests/pmu.c: In function ‘test__pmu_match’:tests/pmu.c:461:16: error: parameter ‘test_pmu’ is initialized461 | struct perf_pmu test_pmu = { | ^~~~~~~~ In file included from tests/pmu.c:7: tests/tests.h:22:1: error: expected declaration specifiers before ‘do’ 22 | do { \ | ^~ tests/pmu.c:465:9: note: in expansion of macro ‘TEST_ASSERT_EQUAL’ 465 | TEST_ASSERT_EQUAL("Exact match", perf_pmu__match(&test_pmu, "pmuname"), true); | ^~~~~~~~~~~~~~~~~ tests/tests.h:28:3: error: expected declaration specifiers before ‘while’ 28 | } while (0) | ^~~~~So I'll not spend more time here, I'm keeping your patch as-is.
Thanks and sorry for the noise :-)
- Arnaldo