aboutsummaryrefslogtreecommitdiffstats
path: root/tools/testing/selftests/bpf/test_lpm_map.c
diff options
context:
space:
mode:
authorMickaël Salaün <mic@digikod.net>2017-02-10 00:21:39 +0100
committerDavid S. Miller <davem@davemloft.net>2017-02-10 15:56:07 -0500
commit10ecc728fe12dbd206e2d4d8b6e96082632b969c (patch)
tree1bf0ee12402d6dcd7667e799d7518d565e683743 /tools/testing/selftests/bpf/test_lpm_map.c
parentbpf: Use bpf_load_program() from the library (diff)
downloadlinux-dev-10ecc728fe12dbd206e2d4d8b6e96082632b969c.tar.xz
linux-dev-10ecc728fe12dbd206e2d4d8b6e96082632b969c.zip
bpf: Use bpf_map_update_elem() from the library
Replace bpf_map_update() with bpf_map_update_elem() calls. Signed-off-by: Mickaë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: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'tools/testing/selftests/bpf/test_lpm_map.c')
-rw-r--r--tools/testing/selftests/bpf/test_lpm_map.c15
1 files changed, 8 insertions, 7 deletions
diff --git a/tools/testing/selftests/bpf/test_lpm_map.c b/tools/testing/selftests/bpf/test_lpm_map.c
index 26775c00273f..e29ffbcd2932 100644
--- a/tools/testing/selftests/bpf/test_lpm_map.c
+++ b/tools/testing/selftests/bpf/test_lpm_map.c
@@ -22,6 +22,7 @@
#include <sys/time.h>
#include <sys/resource.h>
+#include <bpf/bpf.h>
#include "bpf_sys.h"
#include "bpf_util.h"
@@ -198,7 +199,7 @@ static void test_lpm_map(int keysize)
key->prefixlen = value[keysize];
memcpy(key->data, value, keysize);
- r = bpf_map_update(map, key, value, 0);
+ r = bpf_map_update_elem(map, key, value, 0);
assert(!r);
}
@@ -266,32 +267,32 @@ static void test_lpm_ipaddr(void)
value = 1;
key_ipv4->prefixlen = 16;
inet_pton(AF_INET, "192.168.0.0", key_ipv4->data);
- assert(bpf_map_update(map_fd_ipv4, key_ipv4, &value, 0) == 0);
+ assert(bpf_map_update_elem(map_fd_ipv4, key_ipv4, &value, 0) == 0);
value = 2;
key_ipv4->prefixlen = 24;
inet_pton(AF_INET, "192.168.0.0", key_ipv4->data);
- assert(bpf_map_update(map_fd_ipv4, key_ipv4, &value, 0) == 0);
+ assert(bpf_map_update_elem(map_fd_ipv4, key_ipv4, &value, 0) == 0);
value = 3;
key_ipv4->prefixlen = 24;
inet_pton(AF_INET, "192.168.128.0", key_ipv4->data);
- assert(bpf_map_update(map_fd_ipv4, key_ipv4, &value, 0) == 0);
+ assert(bpf_map_update_elem(map_fd_ipv4, key_ipv4, &value, 0) == 0);
value = 5;
key_ipv4->prefixlen = 24;
inet_pton(AF_INET, "192.168.1.0", key_ipv4->data);
- assert(bpf_map_update(map_fd_ipv4, key_ipv4, &value, 0) == 0);
+ assert(bpf_map_update_elem(map_fd_ipv4, key_ipv4, &value, 0) == 0);
value = 4;
key_ipv4->prefixlen = 23;
inet_pton(AF_INET, "192.168.0.0", key_ipv4->data);
- assert(bpf_map_update(map_fd_ipv4, key_ipv4, &value, 0) == 0);
+ assert(bpf_map_update_elem(map_fd_ipv4, key_ipv4, &value, 0) == 0);
value = 0xdeadbeef;
key_ipv6->prefixlen = 64;
inet_pton(AF_INET6, "2a00:1450:4001:814::200e", key_ipv6->data);
- assert(bpf_map_update(map_fd_ipv6, key_ipv6, &value, 0) == 0);
+ assert(bpf_map_update_elem(map_fd_ipv6, key_ipv6, &value, 0) == 0);
/* Set tprefixlen to maximum for lookups */
key_ipv4->prefixlen = 32;