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

Commit f4874d01 authored by Mickaël Salaün's avatar Mickaël Salaün Committed by David S. Miller
Browse files

bpf: Use bpf_create_map() from the library 



Replace bpf_map_create() with bpf_create_map() calls.

Signed-off-by: default avatarMickaël Salaün <mic@digikod.net>
Cc: Alexei Starovoitov <ast@fb.com>
Cc: Daniel Borkmann <daniel@iogearbox.net>
Cc: Shuah Khan <shuah@kernel.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 5f155c25

tools/testing/selftests/bpf/bpf_sys.h

+0 −15
Original line number Diff line number Diff line
@@ -24,19 +24,4 @@ static inline int bpf(int cmd, union bpf_attr *attr, unsigned int size) 
#endif

}



static inline int bpf_map_create(enum bpf_map_type type, uint32_t size_key,

				 uint32_t size_value, uint32_t max_elem,

				 uint32_t flags)

{

	union bpf_attr attr = {};



	attr.map_type = type;

	attr.key_size = size_key;

	attr.value_size = size_value;

	attr.max_entries = max_elem;

	attr.map_flags = flags;



	return bpf(BPF_MAP_CREATE, &attr, sizeof(attr));

}



#endif /* __BPF_SYS__ */

tools/testing/selftests/bpf/test_lpm_map.c

+3 −3
Original line number Diff line number Diff line
@@ -183,7 +183,7 @@ static void test_lpm_map(int keysize) 
	key = alloca(sizeof(*key) + keysize);

	memset(key, 0, sizeof(*key) + keysize);



	map = bpf_map_create(BPF_MAP_TYPE_LPM_TRIE,

	map = bpf_create_map(BPF_MAP_TYPE_LPM_TRIE,

			     sizeof(*key) + keysize,

			     keysize + 1,

			     4096,
@@ -253,12 +253,12 @@ static void test_lpm_ipaddr(void) 
	key_ipv4 = alloca(key_size_ipv4);

	key_ipv6 = alloca(key_size_ipv6);



	map_fd_ipv4 = bpf_map_create(BPF_MAP_TYPE_LPM_TRIE,

	map_fd_ipv4 = bpf_create_map(BPF_MAP_TYPE_LPM_TRIE,

				     key_size_ipv4, sizeof(value),

				     100, BPF_F_NO_PREALLOC);

	assert(map_fd_ipv4 >= 0);



	map_fd_ipv6 = bpf_map_create(BPF_MAP_TYPE_LPM_TRIE,

	map_fd_ipv6 = bpf_create_map(BPF_MAP_TYPE_LPM_TRIE,

				     key_size_ipv6, sizeof(value),

				     100, BPF_F_NO_PREALLOC);

	assert(map_fd_ipv6 >= 0);

tools/testing/selftests/bpf/test_lru_map.c

+2 −2
Original line number Diff line number Diff line
@@ -31,11 +31,11 @@ static int create_map(int map_type, int map_flags, unsigned int size) 
{

	int map_fd;



	map_fd = bpf_map_create(map_type, sizeof(unsigned long long),

	map_fd = bpf_create_map(map_type, sizeof(unsigned long long),

				sizeof(unsigned long long), size, map_flags);



	if (map_fd == -1)

		perror("bpf_map_create");

		perror("bpf_create_map");



	return map_fd;

}

tools/testing/selftests/bpf/test_maps.c

+7 −7
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ static void test_hashmap(int task, void *data) 
	long long key, next_key, value;

	int fd;



	fd = bpf_map_create(BPF_MAP_TYPE_HASH, sizeof(key), sizeof(value),

	fd = bpf_create_map(BPF_MAP_TYPE_HASH, sizeof(key), sizeof(value),

			    2, map_flags);

	if (fd < 0) {

		printf("Failed to create hashmap '%s'!\n", strerror(errno));
@@ -119,7 +119,7 @@ static void test_hashmap_percpu(int task, void *data) 
	int expected_key_mask = 0;

	int fd, i;



	fd = bpf_map_create(BPF_MAP_TYPE_PERCPU_HASH, sizeof(key),

	fd = bpf_create_map(BPF_MAP_TYPE_PERCPU_HASH, sizeof(key),

			    sizeof(value[0]), 2, map_flags);

	if (fd < 0) {

		printf("Failed to create hashmap '%s'!\n", strerror(errno));
@@ -212,7 +212,7 @@ static void test_arraymap(int task, void *data) 
	int key, next_key, fd;

	long long value;



	fd = bpf_map_create(BPF_MAP_TYPE_ARRAY, sizeof(key), sizeof(value),

	fd = bpf_create_map(BPF_MAP_TYPE_ARRAY, sizeof(key), sizeof(value),

			    2, 0);

	if (fd < 0) {

		printf("Failed to create arraymap '%s'!\n", strerror(errno));
@@ -266,7 +266,7 @@ static void test_arraymap_percpu(int task, void *data) 
	int key, next_key, fd, i;

	long values[nr_cpus];



	fd = bpf_map_create(BPF_MAP_TYPE_PERCPU_ARRAY, sizeof(key),

	fd = bpf_create_map(BPF_MAP_TYPE_PERCPU_ARRAY, sizeof(key),

			    sizeof(values[0]), 2, 0);

	if (fd < 0) {

		printf("Failed to create arraymap '%s'!\n", strerror(errno));
@@ -322,7 +322,7 @@ static void test_arraymap_percpu_many_keys(void) 
	long values[nr_cpus];

	int key, fd, i;



	fd = bpf_map_create(BPF_MAP_TYPE_PERCPU_ARRAY, sizeof(key),

	fd = bpf_create_map(BPF_MAP_TYPE_PERCPU_ARRAY, sizeof(key),

			    sizeof(values[0]), nr_keys, 0);

	if (fd < 0) {

		printf("Failed to create per-cpu arraymap '%s'!\n",
@@ -360,7 +360,7 @@ static void test_map_large(void) 
	} key;

	int fd, i, value;



	fd = bpf_map_create(BPF_MAP_TYPE_HASH, sizeof(key), sizeof(value),

	fd = bpf_create_map(BPF_MAP_TYPE_HASH, sizeof(key), sizeof(value),

			    MAP_SIZE, map_flags);

	if (fd < 0) {

		printf("Failed to create large map '%s'!\n", strerror(errno));
@@ -455,7 +455,7 @@ static void test_map_parallel(void) 
	int i, fd, key = 0, value = 0;

	int data[2];



	fd = bpf_map_create(BPF_MAP_TYPE_HASH, sizeof(key), sizeof(value),

	fd = bpf_create_map(BPF_MAP_TYPE_HASH, sizeof(key), sizeof(value),

			    MAP_SIZE, map_flags);

	if (fd < 0) {

		printf("Failed to create map for parallel test '%s'!\n",

tools/testing/selftests/bpf/test_tag.c

+1 −1
Original line number Diff line number Diff line
@@ -189,7 +189,7 @@ int main(void) 
	int i, fd_map;



	setrlimit(RLIMIT_MEMLOCK, &rinf);

	fd_map = bpf_map_create(BPF_MAP_TYPE_HASH, sizeof(int),

	fd_map = bpf_create_map(BPF_MAP_TYPE_HASH, sizeof(int),

				sizeof(int), 1, BPF_F_NO_PREALLOC);

	assert(fd_map > 0);