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

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

bpf: Use bpf_map_delete_elem() from the library 



Replace bpf_map_delete() with bpf_map_delete_elem() 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 e5ff7c40

tools/lib/bpf/bpf.c

+1 −1
Original line number Diff line number Diff line
@@ -124,7 +124,7 @@ int bpf_map_lookup_elem(int fd, const void *key, void *value) 
	return sys_bpf(BPF_MAP_LOOKUP_ELEM, &attr, sizeof(attr));

}



int bpf_map_delete_elem(int fd, void *key)

int bpf_map_delete_elem(int fd, const void *key)

{

	union bpf_attr attr;

tools/lib/bpf/bpf.h

+1 −1
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ int bpf_map_update_elem(int fd, const void *key, const void *value, 
			__u64 flags);



int bpf_map_lookup_elem(int fd, const void *key, void *value);

int bpf_map_delete_elem(int fd, void *key);

int bpf_map_delete_elem(int fd, const 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);

tools/testing/selftests/bpf/bpf_sys.h

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

}



static inline int bpf_map_delete(int fd, const void *key)

{

	union bpf_attr attr = {};



	attr.map_fd = fd;

	attr.key = bpf_ptr_to_u64(key);



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

}



static inline int bpf_map_next_key(int fd, const void *key, void *next_key)

{

	union bpf_attr attr = {};

tools/testing/selftests/bpf/test_lru_map.c

+3 −3
Original line number Diff line number Diff line
@@ -324,7 +324,7 @@ static void test_lru_sanity2(int map_type, int map_flags, unsigned int tgt_free) 
	if (map_type == BPF_MAP_TYPE_LRU_PERCPU_HASH) {

		assert(!bpf_map_update_elem(lru_map_fd, &key, value,

					    BPF_NOEXIST));

		assert(!bpf_map_delete(lru_map_fd, &key));

		assert(!bpf_map_delete_elem(lru_map_fd, &key));

	} else {

		assert(bpf_map_update_elem(lru_map_fd, &key, value,

					   BPF_EXIST));
@@ -483,8 +483,8 @@ static void test_lru_sanity4(int map_type, int map_flags, unsigned int tgt_free) 
	}



	for (; key <= 2 * tgt_free; key++) {

		assert(!bpf_map_delete(lru_map_fd, &key));

		assert(bpf_map_delete(lru_map_fd, &key));

		assert(!bpf_map_delete_elem(lru_map_fd, &key));

		assert(bpf_map_delete_elem(lru_map_fd, &key));

	}



	end_key = key + 2 * tgt_free;

tools/testing/selftests/bpf/test_maps.c

+11 −11
Original line number Diff line number Diff line
@@ -86,7 +86,7 @@ static void test_hashmap(int task, void *data) 


	/* Check that key = 0 doesn't exist. */

	key = 0;

	assert(bpf_map_delete(fd, &key) == -1 && errno == ENOENT);

	assert(bpf_map_delete_elem(fd, &key) == -1 && errno == ENOENT);



	/* Iterate over two elements. */

	assert(bpf_map_next_key(fd, &key, &next_key) == 0 &&
@@ -98,10 +98,10 @@ static void test_hashmap(int task, void *data) 


	/* Delete both elements. */

	key = 1;

	assert(bpf_map_delete(fd, &key) == 0);

	assert(bpf_map_delete_elem(fd, &key) == 0);

	key = 2;

	assert(bpf_map_delete(fd, &key) == 0);

	assert(bpf_map_delete(fd, &key) == -1 && errno == ENOENT);

	assert(bpf_map_delete_elem(fd, &key) == 0);

	assert(bpf_map_delete_elem(fd, &key) == -1 && errno == ENOENT);



	key = 0;

	/* Check that map is empty. */
@@ -172,7 +172,7 @@ static void test_hashmap_percpu(int task, void *data) 
	       errno == E2BIG);



	/* Check that key = 0 doesn't exist. */

	assert(bpf_map_delete(fd, &key) == -1 && errno == ENOENT);

	assert(bpf_map_delete_elem(fd, &key) == -1 && errno == ENOENT);



	/* Iterate over two elements. */

	while (!bpf_map_next_key(fd, &key, &next_key)) {
@@ -194,10 +194,10 @@ static void test_hashmap_percpu(int task, void *data) 


	/* Delete both elements. */

	key = 1;

	assert(bpf_map_delete(fd, &key) == 0);

	assert(bpf_map_delete_elem(fd, &key) == 0);

	key = 2;

	assert(bpf_map_delete(fd, &key) == 0);

	assert(bpf_map_delete(fd, &key) == -1 && errno == ENOENT);

	assert(bpf_map_delete_elem(fd, &key) == 0);

	assert(bpf_map_delete_elem(fd, &key) == -1 && errno == ENOENT);



	key = 0;

	/* Check that map is empty. */
@@ -255,7 +255,7 @@ static void test_arraymap(int task, void *data) 


	/* Delete shouldn't succeed. */

	key = 1;

	assert(bpf_map_delete(fd, &key) == -1 && errno == EINVAL);

	assert(bpf_map_delete_elem(fd, &key) == -1 && errno == EINVAL);



	close(fd);

}
@@ -310,7 +310,7 @@ static void test_arraymap_percpu(int task, void *data) 


	/* Delete shouldn't succeed. */

	key = 1;

	assert(bpf_map_delete(fd, &key) == -1 && errno == EINVAL);

	assert(bpf_map_delete_elem(fd, &key) == -1 && errno == EINVAL);



	close(fd);

}
@@ -445,7 +445,7 @@ static void do_work(int fn, void *data) 
			assert(bpf_map_update_elem(fd, &key, &value,

						   BPF_EXIST) == 0);

		} else {

			assert(bpf_map_delete(fd, &key) == 0);

			assert(bpf_map_delete_elem(fd, &key) == 0);

		}

	}

}