lkml.org 
[lkml]   [2022]   [May]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
From
Date
SubjectRe: [PATCH 2/7] perf test: Use skip in vmlinux kallsyms
Hi Ian,

On Thu, May 12, 2022 at 9:05 PM Ian Rogers <irogers@google.com> wrote:
>
> 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");

For consistency, you might want to use pr_info() here.

Thanks,
Namhyung


> + 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
>

\
 
 \ /
  Last update: 2022-05-17 05:22    [W:0.107 / U:0.188 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site