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

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

tools/lib/bpf: add support for BPF_PROG_TEST_RUN command 



add support for BPF_PROG_TEST_RUN command to libbpf.a

Signed-off-by: default avatarAlexei Starovoitov <ast@kernel.org>
Acked-by: default avatarDaniel Borkmann <daniel@iogearbox.net>
Acked-by: default avatarMartin KaFai Lau <kafai@fb.com>
Acked-by: default avatarWang Nan <wangnan0@huawei.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 1cf1cae9

tools/include/uapi/linux/bpf.h

+24 −0
Original line number Diff line number Diff line
@@ -81,6 +81,7 @@ enum bpf_cmd { 
	BPF_OBJ_GET,

	BPF_PROG_ATTACH,

	BPF_PROG_DETACH,

	BPF_PROG_TEST_RUN,

};



enum bpf_map_type {
@@ -189,6 +190,17 @@ union bpf_attr { 
		__u32		attach_type;

		__u32		attach_flags;

	};



	struct { /* anonymous struct used by BPF_PROG_TEST_RUN command */

		__u32		prog_fd;

		__u32		retval;

		__u32		data_size_in;

		__u32		data_size_out;

		__aligned_u64	data_in;

		__aligned_u64	data_out;

		__u32		repeat;

		__u32		duration;

	} test;

} __attribute__((aligned(8)));



/* BPF helper function descriptions:
@@ -459,6 +471,18 @@ union bpf_attr { 
 *     Return:

 *       > 0 length of the string including the trailing NUL on success

 *       < 0 error

 *

 * u64 bpf_bpf_get_socket_cookie(skb)

 *     Get the cookie for the socket stored inside sk_buff.

 *     @skb: pointer to skb

 *     Return: 8 Bytes non-decreasing number on success or 0 if the socket

 *     field is missing inside sk_buff

 *

 * u32 bpf_get_socket_uid(skb)

 *     Get the owner uid of the socket stored inside sk_buff.

 *     @skb: pointer to skb

 *     Return: uid of the socket owner on success or 0 if the socket pointer

 *     inside sk_buff is NULL

 */

#define __BPF_FUNC_MAPPER(FN)		\

	FN(unspec),			\

tools/lib/bpf/bpf.c

+24 −0
Original line number Diff line number Diff line
@@ -209,3 +209,27 @@ int bpf_prog_detach(int target_fd, enum bpf_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)

{

	union bpf_attr attr;

	int ret;



	bzero(&attr, sizeof(attr));

	attr.test.prog_fd = prog_fd;

	attr.test.data_in = ptr_to_u64(data);

	attr.test.data_out = ptr_to_u64(data_out);

	attr.test.data_size_in = size;

	attr.test.repeat = repeat;



	ret = sys_bpf(BPF_PROG_TEST_RUN, &attr, sizeof(attr));

	if (size_out)

		*size_out = attr.test.data_size_out;

	if (retval)

		*retval = attr.test.retval;

	if (duration)

		*duration = attr.test.duration;

	return ret;

}

tools/lib/bpf/bpf.h

+3 −1
Original line number Diff line number Diff line
@@ -47,6 +47,8 @@ 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_test_run(int prog_fd, int repeat, void *data, __u32 size,

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

		      __u32 *duration);



#endif