Skip to contentSkip to conversation

tools/perf/tests: Fix Basic BPF llvm compile to check for libbpf support

PATCH In review Athira Rajeev 2 participants 2 messages Jul 4, 2023 – Jul 5, 2023 perf events

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 tools/perf/tests: Fix Basic BPF llvm compile to check for libbpf support

Basic BPF llvm compile fails in systems with libbpf that doesn't support BTF. Log shows below information.

libbpf: BTF is required, but is missing or corrupted. Failed to parse test case 'Basic BPF llvm compile' test child finished with -2
---- end ----

Here BPF llvm compile fails due to missing BTF support. Fix the llvm test to skip the test incase BTF support is missing.

---
 tools/perf/tests/llvm.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)
tools/perf/tests/llvm.c +6 -1
index 0bc25a56cfef..4c73c9eab0bb 100644
@@ -4,6 +4,7 @@
 #include <string.h>
 #include "tests.h"
 #include "debug.h"
+#include <errno.h>
 
 #ifdef HAVE_LIBBPF_SUPPORT
 #include <bpf/libbpf.h>
@@ -14,8 +15,12 @@ static int test__bpf_parsing(void *obj_buf, size_t obj_buf_sz)
 	struct bpf_object *obj;
 
 	obj = bpf_object__open_mem(obj_buf, obj_buf_sz, NULL);
-	if (libbpf_get_error(obj))
+	if (libbpf_get_error(obj)) {
+		/* Skip if there is no BTF support */
+		if (errno == ENOENT)
+			return TEST_SKIP;
 		return TEST_FAIL;
+	}
 	bpf_object__close(obj);
 	return TEST_OK;
 }
Signature · 1 line
2.27.0
maintainer
#1 lore raw

Hello,

Quoted 31 lines · Athira Rajeev

Basic BPF llvm compile fails in systems with libbpf that doesn't support BTF. Log shows below information.

libbpf: BTF is required, but is missing or corrupted. Failed to parse test case 'Basic BPF llvm compile' test child finished with -2
---- end ----

Here BPF llvm compile fails due to missing BTF support. Fix the llvm test to skip the test incase BTF support is missing.

---
 tools/perf/tests/llvm.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)
tools/perf/tests/llvm.c +1 -0
index 0bc25a56cfef..4c73c9eab0bb 100644
@@ -4,6 +4,7 @@
 #include <string.h>
 #include "tests.h"
 #include "debug.h"
+#include <errno.h>
 
 #ifdef HAVE_LIBBPF_SUPPORT
 #include <bpf/libbpf.h>

tools/perf/tests/llvm.c static int test__bpf_parsing(void *obj_buf, size_t obj_buf_sz) · line 20

Quoted 7 lines
tools/perf/tests/llvm.c +3 -1
@@ -14,8 +15,12 @@ static int test__bpf_parsing(void *obj_buf, size_t obj_buf_sz)
        struct bpf_object *obj;
 
        obj = bpf_object__open_mem(obj_buf, obj_buf_sz, NULL);
-       if (libbpf_get_error(obj))
+       if (libbpf_get_error(obj)) {
+               /* Skip if there is no BTF support */
+               if (errno == ENOENT)

Can we use the return value of libbpf_get_error() instead of using the errno?

Also I'm curious why it requires BTF even if the BPF program doesn't use it. Is there an option or something for that?

Thanks,
Namhyung

Quoted 9 lines
tools/perf/tests/llvm.c +2 -1
+                       return TEST_SKIP;
                return TEST_FAIL;
+       }
        bpf_object__close(obj);
        return TEST_OK;
 }
--

2.27.0