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

Commit 95b9afd3 authored by Martin KaFai Lau's avatar Martin KaFai Lau Committed by David S. Miller
Browse files

bpf: Test for bpf ID 



Add test to exercise the bpf_prog/map id generation,
bpf_(prog|map)_get_next_id(), bpf_(prog|map)_get_fd_by_id() and
bpf_get_obj_info_by_fd().

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

tools/include/uapi/linux/bpf.h

+41 −0
Original line number Diff line number Diff line
@@ -82,6 +82,11 @@ enum bpf_cmd { 
	BPF_PROG_ATTACH,

	BPF_PROG_DETACH,

	BPF_PROG_TEST_RUN,

	BPF_PROG_GET_NEXT_ID,

	BPF_MAP_GET_NEXT_ID,

	BPF_PROG_GET_FD_BY_ID,

	BPF_MAP_GET_FD_BY_ID,

	BPF_OBJ_GET_INFO_BY_FD,

};



enum bpf_map_type {
@@ -209,6 +214,21 @@ union bpf_attr { 
		__u32		repeat;

		__u32		duration;

	} test;



	struct { /* anonymous struct used by BPF_*_GET_*_ID */

		union {

			__u32		start_id;

			__u32		prog_id;

			__u32		map_id;

		};

		__u32		next_id;

	};



	struct { /* anonymous struct used by BPF_OBJ_GET_INFO_BY_FD */

		__u32		bpf_fd;

		__u32		info_len;

		__aligned_u64	info;

	} info;

} __attribute__((aligned(8)));



/* BPF helper function descriptions:
@@ -673,4 +693,25 @@ struct xdp_md { 
	__u32 data_end;

};



#define BPF_TAG_SIZE	8



struct bpf_prog_info {

	__u32 type;

	__u32 id;

	__u8  tag[BPF_TAG_SIZE];

	__u32 jited_prog_len;

	__u32 xlated_prog_len;

	__aligned_u64 jited_prog_insns;

	__aligned_u64 xlated_prog_insns;

} __attribute__((aligned(8)));



struct bpf_map_info {

	__u32 type;

	__u32 id;

	__u32 key_size;

	__u32 value_size;

	__u32 max_entries;

	__u32 map_flags;

} __attribute__((aligned(8)));



#endif /* _UAPI__LINUX_BPF_H__ */

tools/lib/bpf/bpf.c

+68 −0
Original line number Diff line number Diff line
@@ -257,3 +257,71 @@ int bpf_prog_test_run(int prog_fd, int repeat, void *data, __u32 size, 
		*duration = attr.test.duration;

	return ret;

}



int bpf_prog_get_next_id(__u32 start_id, __u32 *next_id)

{

	union bpf_attr attr;

	int err;



	bzero(&attr, sizeof(attr));

	attr.start_id = start_id;



	err = sys_bpf(BPF_PROG_GET_NEXT_ID, &attr, sizeof(attr));

	if (!err)

		*next_id = attr.next_id;



	return err;

}



int bpf_map_get_next_id(__u32 start_id, __u32 *next_id)

{

	union bpf_attr attr;

	int err;



	bzero(&attr, sizeof(attr));

	attr.start_id = start_id;



	err = sys_bpf(BPF_MAP_GET_NEXT_ID, &attr, sizeof(attr));

	if (!err)

		*next_id = attr.next_id;



	return err;

}



int bpf_prog_get_fd_by_id(__u32 id)

{

	union bpf_attr attr;



	bzero(&attr, sizeof(attr));

	attr.prog_id = id;



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

}



int bpf_map_get_fd_by_id(__u32 id)

{

	union bpf_attr attr;



	bzero(&attr, sizeof(attr));

	attr.map_id = id;



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

}



int bpf_obj_get_info_by_fd(int prog_fd, void *info, __u32 *info_len)

{

	union bpf_attr attr;

	int err;



	bzero(&attr, sizeof(attr));

	bzero(info, *info_len);

	attr.info.bpf_fd = prog_fd;

	attr.info.info_len = *info_len;

	attr.info.info = ptr_to_u64(info);



	err = sys_bpf(BPF_OBJ_GET_INFO_BY_FD, &attr, sizeof(attr));

	if (!err)

		*info_len = attr.info.info_len;



	return err;

}

tools/lib/bpf/bpf.h

+5 −0
Original line number Diff line number Diff line
@@ -54,5 +54,10 @@ 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);

int bpf_prog_get_next_id(__u32 start_id, __u32 *next_id);

int bpf_map_get_next_id(__u32 start_id, __u32 *next_id);

int bpf_prog_get_fd_by_id(__u32 id);

int bpf_map_get_fd_by_id(__u32 id);

int bpf_obj_get_info_by_fd(int prog_fd, void *info, __u32 *info_len);



#endif

tools/testing/selftests/bpf/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ LDLIBS += -lcap -lelf 
TEST_GEN_PROGS = test_verifier test_tag test_maps test_lru_map test_lpm_map test_progs \

	test_align



TEST_GEN_FILES = test_pkt_access.o test_xdp.o test_l4lb.o test_tcp_estats.o

TEST_GEN_FILES = test_pkt_access.o test_xdp.o test_l4lb.o test_tcp_estats.o test_obj_id.o



TEST_PROGS := test_kmod.sh

tools/testing/selftests/bpf/test_obj_id.c

0 → 100644
+35 −0
Original line number Diff line number Diff line 
/* Copyright (c) 2017 Facebook

 *

 * This program is free software; you can redistribute it and/or

 * modify it under the terms of version 2 of the GNU General Public

 * License as published by the Free Software Foundation.

 */

#include <stddef.h>

#include <linux/bpf.h>

#include <linux/pkt_cls.h>

#include "bpf_helpers.h"



/* It is a dumb bpf program such that it must have no

 * issue to be loaded since testing the verifier is

 * not the focus here.

 */



int _version SEC("version") = 1;



struct bpf_map_def SEC("maps") test_map_id = {

	.type = BPF_MAP_TYPE_ARRAY,

	.key_size = sizeof(__u32),

	.value_size = sizeof(__u64),

	.max_entries = 1,

};



SEC("test_prog_id")

int test_prog_id(struct __sk_buff *skb)

{

	__u32 key = 0;

	__u64 *value;



	value = bpf_map_lookup_elem(&test_map_id, &key);



	return TC_ACT_OK;

}