Skip to contentSkip to conversation

libbpf: make bpf_object__open default to UNSPEC

PATCH Applied Nikita V. Shirokov 2 participants 2 messages Nov 24, 2018

Subsystems (4)
Networking Network drivers BPF libbpf
lore
Share & tools
lore

Nikita V. Shirokov

author
#0 lore raw

PATCH v2 1/1 libbpf: make bpf_object__open default to UNSPEC

currently by default libbpf's bpf_object__open requires bpf's program to specify version in a code because of two things:
1) default prog type is set to KPROBE
2) KPROBE requires (in kernel/bpf/syscall.c) version to be specified

in this patch i'm changing default prog type to UNSPEC and also changing requirments for version's section to be present in object file. now it would reflect what we have today in kernel
(only KPROBE prog type requires for version to be explicitly set).

v1 -> v2:
- RFC tag has been dropped

Signed-off-by Nikita V. Shirokov <[email protected]>
---
 tools/lib/bpf/libbpf.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
tools/lib/bpf/libbpf.c +4 -4
index 0f14f7c074c2..ed4212a4c5f9 100644
@@ -333,7 +333,7 @@ bpf_program__init(void *data, size_t size, char *section_name, int idx,
 	prog->idx = idx;
 	prog->instances.fds = NULL;
 	prog->instances.nr = -1;
-	prog->type = BPF_PROG_TYPE_KPROBE;
+	prog->type = BPF_PROG_TYPE_UNSPEC;
 	prog->btf_fd = -1;
 
 	return 0;

@@ -1649,12 +1649,12 @@ static bool bpf_prog_type__needs_kver(enum bpf_prog_type type)
 	case BPF_PROG_TYPE_LIRC_MODE2:
 	case BPF_PROG_TYPE_SK_REUSEPORT:
 	case BPF_PROG_TYPE_FLOW_DISSECTOR:
-		return false;
 	case BPF_PROG_TYPE_UNSPEC:
-	case BPF_PROG_TYPE_KPROBE:
 	case BPF_PROG_TYPE_TRACEPOINT:
-	case BPF_PROG_TYPE_PERF_EVENT:
 	case BPF_PROG_TYPE_RAW_TRACEPOINT:
+	case BPF_PROG_TYPE_PERF_EVENT:
+		return false;
+	case BPF_PROG_TYPE_KPROBE:
 	default:
 		return true;
 	}
Signature · 1 line
2.15.1
maintainer Applied
#1 lore raw
Quoted 10 lines · Nikita V. Shirokov

currently by default libbpf's bpf_object__open requires bpf's program to specify version in a code because of two things:
1) default prog type is set to KPROBE
2) KPROBE requires (in kernel/bpf/syscall.c) version to be specified

in this patch i'm changing default prog type to UNSPEC and also changing requirments for version's section to be present in object file. now it would reflect what we have today in kernel
(only KPROBE prog type requires for version to be explicitly set).

Quoted 4 lines

v1 -> v2:
- RFC tag has been dropped

Signed-off-by Nikita V. Shirokov <[email protected]>

Applied, thanks!