Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5dc880de authored by Joe Stringer's avatar Joe Stringer Committed by Arnaldo Carvalho de Melo
Browse files

tools lib bpf: Add bpf_prog_{attach,detach} 



Commit d8c5b17f ("samples: bpf: add userspace example for attaching
eBPF programs to cgroups") added these functions to samples/libbpf, but
during this merge all of the samples libbpf functionality is shifting to
tools/lib/bpf. Shift these functions there.

Committer notes:

Use bzero + attr.FIELD = value instead of 'attr = { .FIELD = value, just
like the other wrapper calls to sys_bpf with bpf_attr to make this build
in older toolchais, such as the ones in CentOS 5 and 6.

Signed-off-by: default avatarJoe Stringer <joe@ovn.org>
Cc: Alexei Starovoitov <ast@fb.com>
Cc: Daniel Borkmann <daniel@iogearbox.net>
Cc: Wang Nan <wangnan0@huawei.com>
Link: http://lkml.kernel.org/n/tip-au2zvtsh55vqeo3v3uw7jr4c@git.kernel.org
Link: https://github.com/joestringer/linux/commit/353e6f298c3d0a92fa8bfa61ff898c5050261a12.patch


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 43371c83

samples/bpf/libbpf.c

+0 −21
Original line number Diff line number Diff line
@@ -11,27 +11,6 @@ 
#include <arpa/inet.h>

#include "libbpf.h"



int bpf_prog_attach(int prog_fd, int target_fd, enum bpf_attach_type type)

{

	union bpf_attr attr = {

		.target_fd = target_fd,

		.attach_bpf_fd = prog_fd,

		.attach_type = type,

	};



	return syscall(__NR_bpf, BPF_PROG_ATTACH, &attr, sizeof(attr));

}



int bpf_prog_detach(int target_fd, enum bpf_attach_type type)

{

	union bpf_attr attr = {

		.target_fd = target_fd,

		.attach_type = type,

	};



	return syscall(__NR_bpf, BPF_PROG_DETACH, &attr, sizeof(attr));

}



int open_raw_sock(const char *name)

{

	struct sockaddr_ll sll;

samples/bpf/libbpf.h

+0 −3
Original line number Diff line number Diff line
@@ -6,9 +6,6 @@ 


struct bpf_insn;



int bpf_prog_attach(int prog_fd, int attachable_fd, enum bpf_attach_type type);

int bpf_prog_detach(int attachable_fd, enum bpf_attach_type type);



/* ALU ops on registers, bpf_add|sub|...: dst_reg += src_reg */



#define BPF_ALU64_REG(OP, DST, SRC)				\

tools/lib/bpf/bpf.c

+23 −0
Original line number Diff line number Diff line
@@ -167,3 +167,26 @@ int bpf_obj_get(const char *pathname) 


	return sys_bpf(BPF_OBJ_GET, &attr, sizeof(attr));

}



int bpf_prog_attach(int prog_fd, int target_fd, enum bpf_attach_type type)

{

	union bpf_attr attr;



	bzero(&attr, sizeof(attr));

	attr.target_fd	   = target_fd;

	attr.attach_bpf_fd = prog_fd;

	attr.attach_type   = type;



	return sys_bpf(BPF_PROG_ATTACH, &attr, sizeof(attr));

}



int bpf_prog_detach(int target_fd, enum bpf_attach_type type)

{

	union bpf_attr attr;



	bzero(&attr, sizeof(attr));

	attr.target_fd	 = target_fd;

	attr.attach_type = type;



	return sys_bpf(BPF_PROG_DETACH, &attr, sizeof(attr));

}

tools/lib/bpf/bpf.h

+3 −0
Original line number Diff line number Diff line
@@ -41,5 +41,8 @@ int bpf_map_delete_elem(int fd, void *key); 
int bpf_map_get_next_key(int fd, void *key, void *next_key);

int bpf_obj_pin(int fd, const char *pathname);

int bpf_obj_get(const char *pathname);

int bpf_prog_attach(int prog_fd, int attachable_fd, enum bpf_attach_type type);

int bpf_prog_detach(int attachable_fd, enum bpf_attach_type type);





#endif