Commit 79b20392 authored by Alexei Starovoitov's avatar Alexei Starovoitov Committed by Daniel Borkmann
Browse files

bpf: Convert bpf preload to light skeleton. 



Convert bpffs preload iterators to light skeleton.

Signed-off-by: default avatarAlexei Starovoitov <ast@kernel.org>
Signed-off-by: default avatarDaniel Borkmann <daniel@iogearbox.net>
Acked-by: default avatarMartin KaFai Lau <kafai@fb.com>
Link: https://lore.kernel.org/bpf/20220131220528.98088-6-alexei.starovoitov@gmail.com
parent 1ddbddd7

kernel/bpf/preload/iterators/Makefile

+3 −3
Original line number Diff line number Diff line
@@ -35,15 +35,15 @@ endif 


.PHONY: all clean



all: iterators.skel.h

all: iterators.lskel.h



clean:

	$(call msg,CLEAN)

	$(Q)rm -rf $(OUTPUT) iterators



iterators.skel.h: $(OUTPUT)/iterators.bpf.o | $(BPFTOOL)

iterators.lskel.h: $(OUTPUT)/iterators.bpf.o | $(BPFTOOL)

	$(call msg,GEN-SKEL,$@)

	$(Q)$(BPFTOOL) gen skeleton $< > $@

	$(Q)$(BPFTOOL) gen skeleton -L $< > $@





$(OUTPUT)/iterators.bpf.o: iterators.bpf.c $(BPFOBJ) | $(OUTPUT)

kernel/bpf/preload/iterators/iterators.c

+5 −5
Original line number Diff line number Diff line
@@ -10,20 +10,20 @@ 
#include <bpf/libbpf.h>

#include <bpf/bpf.h>

#include <sys/mount.h>

#include "iterators.skel.h"

#include "iterators.lskel.h"

#include "bpf_preload_common.h"



int to_kernel = -1;

int from_kernel = 0;



static int send_link_to_kernel(struct bpf_link *link, const char *link_name)

static int send_link_to_kernel(int link_fd, const char *link_name)

{

	struct bpf_preload_info obj = {};

	struct bpf_link_info info = {};

	__u32 info_len = sizeof(info);

	int err;



	err = bpf_obj_get_info_by_fd(bpf_link__fd(link), &info, &info_len);

	err = bpf_obj_get_info_by_fd(link_fd, &info, &info_len);

	if (err)

		return err;

	obj.link_id = info.id;
@@ -70,10 +70,10 @@ int main(int argc, char **argv) 
		goto cleanup;



	/* send two bpf_link IDs with names to the kernel */

	err = send_link_to_kernel(skel->links.dump_bpf_map, "maps.debug");

	err = send_link_to_kernel(skel->links.dump_bpf_map_fd, "maps.debug");

	if (err)

		goto cleanup;

	err = send_link_to_kernel(skel->links.dump_bpf_prog, "progs.debug");

	err = send_link_to_kernel(skel->links.dump_bpf_prog_fd, "progs.debug");

	if (err)

		goto cleanup;

kernel/bpf/preload/iterators/iterators.lskel.h

0 → 100644
+428 −0

File added.

Preview size limit exceeded, changes collapsed.

kernel/bpf/preload/iterators/iterators.skel.h

deleted100644 → 0
+0 −412

File deleted.

Preview size limit exceeded, changes collapsed.