libbpf: Making bpf_prog_load() ignore name if kernel doesn't support

[platform/kernel/linux-rpi.git] / tools / lib / bpf / libbpf.c

diff --git a/tools/lib/bpf/libbpf.c b/tools/lib/bpf/libbpf.c
index 3f01f5c..aa05a99 100644 (file)
--- a/tools/lib/bpf/libbpf.c
+++ b/tools/lib/bpf/libbpf.c
@@ -4415,14 +4415,23 @@ static int probe_fd(int fd)
 
 static int probe_kern_prog_name(void)
 {
+       const size_t attr_sz = offsetofend(union bpf_attr, prog_name);
        struct bpf_insn insns[] = {
                BPF_MOV64_IMM(BPF_REG_0, 0),
                BPF_EXIT_INSN(),
        };
-       int ret, insn_cnt = ARRAY_SIZE(insns);
+       union bpf_attr attr;
+       int ret;
+
+       memset(&attr, 0, attr_sz);
+       attr.prog_type = BPF_PROG_TYPE_SOCKET_FILTER;
+       attr.license = ptr_to_u64("GPL");
+       attr.insns = ptr_to_u64(insns);
+       attr.insn_cnt = (__u32)ARRAY_SIZE(insns);
+       libbpf_strlcpy(attr.prog_name, "libbpf_nametest", sizeof(attr.prog_name));
 
        /* make sure loading with name works */
-       ret = bpf_prog_load(BPF_PROG_TYPE_SOCKET_FILTER, "test", "GPL", insns, insn_cnt, NULL);
+       ret = sys_bpf_prog_load(&attr, attr_sz, PROG_LOAD_ATTEMPTS);
        return probe_fd(ret);
 }