tools/bpf: add new fields for program load in lib/bpf

The new fields are added for program load in lib/bpf so
application uses api bpf_load_program_xattr() is able
to load program with btf and func_info data.

This functionality will be used in next patch
by bpf selftest test_btf.

Signed-off-by: Yonghong Song <yhs@fb.com>
Signed-off-by: Martin KaFai Lau <kafai@fb.com>
Signed-off-by: Alexei Starovoitov <ast@kernel.org>

2 files changed, 8 insertions, 0 deletions

diff --git a/tools/lib/bpf/bpf.c b/tools/lib/bpf/bpf.c
index 961e1b9fc592..9b5cf22c4e64 100644
--- a/tools/lib/bpf/bpf.c
+++ b/tools/lib/bpf/bpf.c
@@ -205,6 +205,10 @@ int bpf_load_program_xattr(const struct bpf_load_program_attr *load_attr,
         attr.log_level = 0;
         attr.kern_version = load_attr->kern_version;
         attr.prog_ifindex = load_attr->prog_ifindex;
+        attr.prog_btf_fd = load_attr->prog_btf_fd;
+        attr.func_info_rec_size = load_attr->func_info_rec_size;
+        attr.func_info_cnt = load_attr->func_info_cnt;
+        attr.func_info = ptr_to_u64(load_attr->func_info);
         memcpy(attr.prog_name, load_attr->name,
                min(name_len, BPF_OBJ_NAME_LEN - 1));
 
diff --git a/tools/lib/bpf/bpf.h b/tools/lib/bpf/bpf.h
index 26a51538213c..8bdfd806253a 100644
--- a/tools/lib/bpf/bpf.h
+++ b/tools/lib/bpf/bpf.h
@@ -74,6 +74,10 @@ struct bpf_load_program_attr {
         const char *license;
         __u32 kern_version;
         __u32 prog_ifindex;
+        __u32 prog_btf_fd;
+        __u32 func_info_rec_size;
+        const void *func_info;
+        __u32 func_info_cnt;
 };
 
 /* Flags to direct loading requirements */