Commit 244d20ef authored by Alexei Starovoitov's avatar Alexei Starovoitov Committed by David S. Miller
Browse files

libbpf: introduce bpf_prog_detach2() 



introduce bpf_prog_detach2() that takes one more argument prog_fd
vs bpf_prog_detach() that takes only attach_fd and type.

Signed-off-by: default avatarAlexei Starovoitov <ast@kernel.org>
Acked-by: default avatarDaniel Borkmann <daniel@iogearbox.net>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 390ee7e2

tools/lib/bpf/bpf.c

+12 −0
Original line number Diff line number Diff line
@@ -291,6 +291,18 @@ int bpf_prog_detach(int target_fd, enum bpf_attach_type type) 
	return sys_bpf(BPF_PROG_DETACH, &attr, sizeof(attr));

}



int bpf_prog_detach2(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_DETACH, &attr, sizeof(attr));

}



int bpf_prog_test_run(int prog_fd, int repeat, void *data, __u32 size,

		      void *data_out, __u32 *size_out, __u32 *retval,

		      __u32 *duration)

tools/lib/bpf/bpf.h

+1 −0
Original line number Diff line number Diff line
@@ -66,6 +66,7 @@ int bpf_obj_get(const char *pathname); 
int bpf_prog_attach(int prog_fd, int attachable_fd, enum bpf_attach_type type,

		    unsigned int flags);

int bpf_prog_detach(int attachable_fd, enum bpf_attach_type type);

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

int bpf_prog_test_run(int prog_fd, int repeat, void *data, __u32 size,

		      void *data_out, __u32 *size_out, __u32 *retval,

		      __u32 *duration);