libbpf: Support loading individual progs

joestringer · borkmann · commit 29cd77f41620 · 2018-10-03T02:53:48.000+02:00
Allow the individual program load to be invoked. This will help with
testing, where a single ELF may contain several sections, some of which
denote subprograms that are expected to fail verification, along with
some which are expected to pass verification. By allowing programs to be
iterated and individually loaded, each program can be independently
checked against its expected verification result.

Signed-off-by: Joe Stringer &lt;joe@wand.net.nz&gt;
Acked-by: Alexei Starovoitov &lt;ast@kernel.org&gt;
Signed-off-by: Daniel Borkmann &lt;daniel@iogearbox.net&gt;
diff --git a/tools/lib/bpf/libbpf.c b/tools/lib/bpf/libbpf.c
@@ -228,7 +228,7 @@ struct bpf_object {
 };
 #define obj_elf_valid(o)	((o)->efile.elf)
 
-static void bpf_program__unload(struct bpf_program *prog)
+void bpf_program__unload(struct bpf_program *prog)
 {
 	int i;
 
@@ -1375,7 +1375,7 @@ load_program(enum bpf_prog_type type, enum bpf_attach_type expected_attach_type,
 	return ret;
 }
 
-static int
+int
 bpf_program__load(struct bpf_program *prog,
 		  char *license, u32 kern_version)
 {
diff --git a/tools/lib/bpf/libbpf.h b/tools/lib/bpf/libbpf.h
@@ -128,10 +128,13 @@ void bpf_program__set_ifindex(struct bpf_program *prog, __u32 ifindex);
 
 const char *bpf_program__title(struct bpf_program *prog, bool needs_copy);
 
+int bpf_program__load(struct bpf_program *prog, char *license,
+		      u32 kern_version);
 int bpf_program__fd(struct bpf_program *prog);
 int bpf_program__pin_instance(struct bpf_program *prog, const char *path,
 			      int instance);
 int bpf_program__pin(struct bpf_program *prog, const char *path);
+void bpf_program__unload(struct bpf_program *prog);
 
 struct bpf_insn;
 

Original file line number	Diff line number	Diff line change
`@@ -228,7 +228,7 @@ struct bpf_object {`
`228`	`228`	`};`
`229`	`229`	`#define obj_elf_valid(o) ((o)->efile.elf)`
`230`	`230`
`231`		`-static void bpf_program__unload(struct bpf_program *prog)`
	`231`	`+void bpf_program__unload(struct bpf_program *prog)`
`232`	`232`	`{`
`233`	`233`	`int i;`
`234`	`234`
`@@ -1375,7 +1375,7 @@ load_program(enum bpf_prog_type type, enum bpf_attach_type expected_attach_type,`
`1375`	`1375`	`return ret;`
`1376`	`1376`	`}`
`1377`	`1377`
`1378`		`-static int`
	`1378`	`+int`
`1379`	`1379`	`bpf_program__load(struct bpf_program *prog,`
`1380`	`1380`	`char *license, u32 kern_version)`
`1381`	`1381`	`{`