From: Ian Rogers <irogers@google.com>
To: Peter Zijlstra <peterz@infradead.org>,
Ingo Molnar <mingo@redhat.com>,
Arnaldo Carvalho de Melo <acme@kernel.org>,
Mark Rutland <mark.rutland@arm.com>,
Alexander Shishkin <alexander.shishkin@linux.intel.com>,
Jiri Olsa <jolsa@kernel.org>, Namhyung Kim <namhyung@kernel.org>,
Riccardo Mancini <rickyman7@gmail.com>,
Sohaib Mohamed <sohaib.amhmd@gmail.com>,
Carsten Haitzler <carsten.haitzler@arm.com>,
Marco Elver <elver@google.com>,
John Garry <john.garry@huawei.com>,
Michael Petlan <mpetlan@redhat.com>,
linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org
Cc: Stephane Eranian <eranian@google.com>, Ian Rogers <irogers@google.com>
Subject: [PATCH 2/7] perf test: Use skip in vmlinux kallsyms
Date: Thu, 12 May 2022 21:05:14 -0700 [thread overview]
Message-ID: <20220513040519.1499333-3-irogers@google.com> (raw)
In-Reply-To: <20220513040519.1499333-1-irogers@google.com>
Currently failures in reading vmlinux or kallsyms result in a test
failure. However, the failure is typically permission related. Prefer to
flag these failures as skip.
Signed-off-by: Ian Rogers <irogers@google.com>
---
tools/perf/tests/vmlinux-kallsyms.c | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/tools/perf/tests/vmlinux-kallsyms.c b/tools/perf/tests/vmlinux-kallsyms.c
index 93dee542a177..983f32964749 100644
--- a/tools/perf/tests/vmlinux-kallsyms.c
+++ b/tools/perf/tests/vmlinux-kallsyms.c
@@ -114,7 +114,7 @@ static bool is_ignored_symbol(const char *name, char type)
static int test__vmlinux_matches_kallsyms(struct test_suite *test __maybe_unused,
int subtest __maybe_unused)
{
- int err = -1;
+ int err = TEST_FAIL;
struct rb_node *nd;
struct symbol *sym;
struct map *kallsyms_map, *vmlinux_map, *map;
@@ -142,7 +142,8 @@ static int test__vmlinux_matches_kallsyms(struct test_suite *test __maybe_unused
* and find the .ko files that match them in /lib/modules/`uname -r`/.
*/
if (machine__create_kernel_maps(&kallsyms) < 0) {
- pr_debug("machine__create_kernel_maps ");
+ pr_info("machine__create_kernel_maps failed");
+ err = TEST_SKIP;
goto out;
}
@@ -158,7 +159,8 @@ static int test__vmlinux_matches_kallsyms(struct test_suite *test __maybe_unused
* code and with the one got from /proc/modules from the "kallsyms" code.
*/
if (machine__load_kallsyms(&kallsyms, "/proc/kallsyms") <= 0) {
- pr_debug("dso__load_kallsyms ");
+ pr_debug("machine__load_kallsyms failed");
+ err = TEST_SKIP;
goto out;
}
@@ -178,7 +180,7 @@ static int test__vmlinux_matches_kallsyms(struct test_suite *test __maybe_unused
* Now repeat step 2, this time for the vmlinux file we'll auto-locate.
*/
if (machine__create_kernel_maps(&vmlinux) < 0) {
- pr_debug("machine__create_kernel_maps ");
+ pr_info("machine__create_kernel_maps failed");
goto out;
}
@@ -196,7 +198,7 @@ static int test__vmlinux_matches_kallsyms(struct test_suite *test __maybe_unused
* to fixup the symbols.
*/
if (machine__load_vmlinux_path(&vmlinux) <= 0) {
- pr_debug("Couldn't find a vmlinux that matches the kernel running on this machine, skipping test\n");
+ pr_info("Couldn't find a vmlinux that matches the kernel running on this machine, skipping test\n");
err = TEST_SKIP;
goto out;
}
--
2.36.0.550.gb090851708-goog
next prev parent reply other threads:[~2022-05-13 4:05 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-05-13 4:05 [PATCH 0/7] Make more tests skip rather than fail Ian Rogers
2022-05-13 4:05 ` [PATCH 1/7] perf test: Skip reason for suites with 1 test Ian Rogers
2022-05-13 15:29 ` John Garry
2022-05-13 15:42 ` Ian Rogers
2022-05-13 16:26 ` John Garry
2022-05-13 16:34 ` Ian Rogers
2022-05-13 16:46 ` John Garry
2022-05-17 3:53 ` Namhyung Kim
2022-05-13 4:05 ` Ian Rogers [this message]
2022-05-13 17:01 ` [PATCH 2/7] perf test: Use skip in vmlinux kallsyms John Garry
2022-05-13 17:05 ` Ian Rogers
2022-05-17 3:21 ` Namhyung Kim
2022-05-18 3:37 ` Ian Rogers
2022-05-13 4:05 ` [PATCH 3/7] perf test: Use skip in openat syscall Ian Rogers
2022-05-13 4:05 ` [PATCH 4/7] perf test: Basic mmap use skip Ian Rogers
2022-05-17 3:42 ` Namhyung Kim
2022-05-18 3:48 ` Ian Rogers
2022-05-13 4:05 ` [PATCH 5/7] perf test: Parse events tidy terms_test Ian Rogers
2022-05-13 4:05 ` [PATCH 6/7] perf test: Parse events tidy evlist_test Ian Rogers
2022-05-13 4:05 ` [PATCH 7/7] perf test: Parse events break apart tests Ian Rogers
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220513040519.1499333-3-irogers@google.com \
--to=irogers@google.com \
--cc=acme@kernel.org \
--cc=alexander.shishkin@linux.intel.com \
--cc=carsten.haitzler@arm.com \
--cc=elver@google.com \
--cc=eranian@google.com \
--cc=john.garry@huawei.com \
--cc=jolsa@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-perf-users@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=mingo@redhat.com \
--cc=mpetlan@redhat.com \
--cc=namhyung@kernel.org \
--cc=peterz@infradead.org \
--cc=rickyman7@gmail.com \
--cc=sohaib.amhmd@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).