selftests/bpf: fix goto cleanup label not defined
authorHangbin Liu <liuhangbin@gmail.com>
Fri, 15 May 2020 03:38:05 +0000 (11:38 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 20 May 2020 06:20:07 +0000 (08:20 +0200)
kernel test robot found a warning when build bpf selftest for 5.4.y stable
tree:

prog_tests/stacktrace_build_id_nmi.c:55:3: error: label ‘cleanup’ used but not defined
   goto cleanup;
   ^~~~

This is because we are lacking upstream commit dde53c1b763b
("selftests/bpf: Convert few more selftest to skeletons"). But this
commit is too large and need more backports. To fix it, the
easiest way is just use the current goto label 'close_prog'.

Reported-by: kernel test robot <rong.a.chen@intel.com>
Fixes: da43712a7262 ("selftests/bpf: Skip perf hw events test if the setup disabled it")
Signed-off-by: Hangbin Liu <liuhangbin@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
tools/testing/selftests/bpf/prog_tests/stacktrace_build_id_nmi.c

index 1735faf..437cb93 100644 (file)
@@ -52,7 +52,7 @@ retry:
        if (pmu_fd < 0 && errno == ENOENT) {
                printf("%s:SKIP:no PERF_COUNT_HW_CPU_CYCLES\n", __func__);
                test__skip();
-               goto cleanup;
+               goto close_prog;
        }
        if (CHECK(pmu_fd < 0, "perf_event_open", "err %d errno %d\n",
                  pmu_fd, errno))