Improve BPF selftests and use the library (net-next tree)
Subsystems (6)
v3 cover Improve BPF selftests and use the library (net-next tree)
This series brings some fixes to selftests, add the ability to test unprivileged BPF programs as root and replace bpf_sys.h with calls to the BPF library.
This is intended for the net-next tree and apply on 76e0e70e6452 ("liquidio: do not dereference pointer if it's NULL").
Changes since v2:
* use the patches from two previous series (unprivileged tests and bpf_sys.h replacement)
* include one more stdint.h
* rebase on net-next
* add this cover letter
Changes since v1:
* exclude patches not intended for the net-next tree
Regards,
Mickaël Salaün (11):
tools: Sync {,tools/}include/uapi/linux/bpf.h
bpf: Change the include directory for selftest
bpf: Always test unprivileged programs
bpf: Use bpf_load_program() from the library
bpf: Use bpf_map_update_elem() from the library
bpf: Use bpf_map_lookup_elem() from the library
bpf: Use bpf_map_delete_elem() from the library
bpf: Use bpf_map_get_next_key() from the library
bpf: Use bpf_create_map() from the library
bpf: Remove bpf_sys.h from selftests
bpf: Add test_tag to .gitignore
tools/include/uapi/linux/bpf.h | 23 +++- tools/lib/bpf/bpf.c | 35 +++--- tools/lib/bpf/bpf.h | 12 +-- tools/testing/selftests/bpf/.gitignore | 1 + tools/testing/selftests/bpf/Makefile | 4 +- tools/testing/selftests/bpf/bpf_sys.h | 108 ------------------- tools/testing/selftests/bpf/test_lpm_map.c | 38 +++---- tools/testing/selftests/bpf/test_lru_map.c | 106 +++++++++---------- tools/testing/selftests/bpf/test_maps.c | 158 ++++++++++++++-------------- tools/testing/selftests/bpf/test_tag.c | 11 +- tools/testing/selftests/bpf/test_verifier.c | 84 ++++++++++++--- 11 files changed, 279 insertions(+), 301 deletions(-) delete mode 100644 tools/testing/selftests/bpf/bpf_sys.h
Signature · 1 line
2.11.0
PATCH v3 1/11 tools: Sync {,tools/}include/uapi/linux/bpf.h
The tools version of this header is out of date; update it to the latest version from kernel header.
Synchronize with the following commits:
* b95a5c4db09b ("bpf: add a longest prefix match trie map implementation")
* a5e8c07059d0 ("bpf: add bpf_probe_read_str helper")
* d1b662adcdb8 ("bpf: allow option for setting bpf_l4_csum_replace from scratch")
--- tools/include/uapi/linux/bpf.h | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-)
tools/include/uapi/linux/bpf.h +22 -1
@@ -63,6 +63,12 @@ struct bpf_insn {__s32 imm;/* signed immediate constant */ }; +/* Key of an a BPF_MAP_TYPE_LPM_TRIE entry */ +struct bpf_lpm_trie_key { +__u32 prefixlen;/* up to 32 for AF_INET, 128 for AF_INET6 */ +__u8 data[0 ];/* Arbitrary size */ +}; +/* BPF syscall commands, see bpf(2) man-page for details. */ enum bpf_cmd {BPF_MAP_CREATE ,
@@ -89,6 +95,7 @@ enum bpf_map_type {BPF_MAP_TYPE_CGROUP_ARRAY ,BPF_MAP_TYPE_LRU_HASH ,BPF_MAP_TYPE_LRU_PERCPU_HASH , + BPF_MAP_TYPE_LPM_TRIE, }; enum bpf_prog_type {
@@ -430,6 +437,18 @@ union bpf_attr {* @xdp_md: pointer to xdp_md * @delta: An positive/negative integer to be added to xdp_md.data * Return: 0 on success or negative on error +* +* int bpf_probe_read_str(void *dst, int size, const void *unsafe_ptr) +* Copy a NUL terminated string from unsafe address. In case the string +* length is smaller than size, the target is not padded with further NUL +* bytes. In case the string length is larger than size, just count-1 +* bytes are copied and the last byte is set to NUL. +* @dst: destination address +* @size: maximum number of bytes to copy, including the trailing NUL +* @unsafe_ptr: unsafe address +* Return: +* > 0 length of the string including the trailing NUL on success +* < 0 error */ #define __BPF_FUNC_MAPPER (FN ) \ FN(unspec), \
@@ -476,7 +495,8 @@ union bpf_attr {FN (set_hash_invalid), \FN (get_numa_node_id), \FN (skb_change_head), \ -FN (xdp_adjust_head), +FN (xdp_adjust_head), \ +FN (probe_read_str),/* integer value in 'imm' field of BPF_CALL instruction selects which helper * function eBPF program intends to call
@@ -502,6 +522,7 @@ enum bpf_func_id {/* BPF_FUNC_l4_csum_replace flags. */ #define BPF_F_PSEUDO_HDR (1ULL << 4)#define BPF_F_MARK_MANGLED_0 (1ULL << 5) +#define BPF_F_MARK_ENFORCE (1ULL << 6)/* BPF_FUNC_clone_redirect and BPF_FUNC_redirect flags. */ #define BPF_F_INGRESS (1ULL << 0)
Signature · 1 line
2.11.0
PATCH v3 2/11 bpf: Change the include directory for selftest
In reply to Mickaël SalaünUse the tools include directory instead of the installed one to allow builds from other kernels.
--- tools/testing/selftests/bpf/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/testing/selftests/bpf/Makefile +1 -1
@@ -1,4 +1,4 @@ -CFLAGS += -Wall -O2 -I../../../../usr/include +CFLAGS += -Wall -O2 -I../../../include/uapi test_objs = test_verifier test_tag test_maps test_lru_map test_lpm_map
Signature · 1 line
2.11.0
PATCH v3 3/11 bpf: Always test unprivileged programs
In reply to Mickaël SalaünIf selftests are run as root, then execute the unprivileged checks as well. This switch from 243 to 368 tests.
The test numbers are suffixed with "/u" when executed as unprivileged or with "/p" when executed as privileged.
The geteuid() check is replaced with a capability check.
Handling capabilities requires the libcap dependency.
--- tools/testing/selftests/bpf/Makefile | 2 +- tools/testing/selftests/bpf/test_verifier.c | 68 ++++++++++++++++++++++++++--- 2 files changed, 64 insertions(+), 6 deletions(-)
tools/testing/selftests/bpf/Makefile +1 -1
@@ -1,4 +1,4 @@ -CFLAGS += -Wall -O2 -I../../../include/uapi +CFLAGS += -Wall -O2 -lcap -I../../../include/uapi test_objs = test_verifier test_tag test_maps test_lru_map test_lpm_map
tools/testing/selftests/bpf/test_verifier.c +63 -5
93 lines not on this page · raw message
Signature · 1 line
2.11.0
PATCH v3 4/11 bpf: Use bpf_load_program() from the library
In reply to Mickaël SalaünReplace bpf_prog_load() with bpf_load_program() calls.
--- tools/lib/bpf/bpf.c | 9 ++++----- tools/lib/bpf/bpf.h | 4 ++-- tools/testing/selftests/bpf/Makefile | 4 +++- tools/testing/selftests/bpf/bpf_sys.h | 21 --------------------- tools/testing/selftests/bpf/test_tag.c | 6 ++++-- tools/testing/selftests/bpf/test_verifier.c | 8 +++++--- 6 files changed, 18 insertions(+), 34 deletions(-)
tools/lib/bpf/bpf.c +4 -5
@@ -42,7 +42,7 @@# endif #endif -static __u64 ptr_to_u64 (void *ptr) +static __u64 ptr_to_u64 (const void *ptr) {return (__u64 ) (unsigned long ) ptr; }
@@ -69,14 +69,13 @@ int bpf_create_map(enum bpf_map_type map_type, int key_size,return sys_bpf (BPF_MAP_CREATE , &attr,sizeof (attr)); } -int bpf_load_program (enum bpf_prog_type type,struct bpf_insn *insns, -size_t insns_cnt,char *license, +int bpf_load_program (enum bpf_prog_type type,const struct bpf_insn *insns, +size_t insns_cnt,const char *license,__u32 kern_version,char *log_buf,size_t log_buf_sz) {int fd; -union bpf_attr attr; +union bpf_attr attr = {}; -bzero (&attr,sizeof (attr)); attr.prog_type = type; attr.insn_cnt = (__u32 )insns_cnt; attr.insns =ptr_to_u64 (insns);
tools/lib/bpf/bpf.h +2 -2
@@ -28,8 +28,8 @@ int bpf_create_map(enum bpf_map_type map_type, int key_size, int value_size,/* Recommend log buffer size */ #define BPF_LOG_BUF_SIZE 65536 -int bpf_load_program (enum bpf_prog_type type,struct bpf_insn *insns, -size_t insns_cnt,char *license, +int bpf_load_program (enum bpf_prog_type type,const struct bpf_insn *insns, +size_t insns_cnt,const char *license,__u32 kern_version,char *log_buf,size_t log_buf_sz);
tools/testing/selftests/bpf/Makefile +3 -1
@@ -1,4 +1,4 @@ -CFLAGS += -Wall -O2 -lcap -I../../../include/uapi +CFLAGS += -Wall -O2 -lcap -I../../../include/uapi -I../../../lib test_objs = test_verifier test_tag test_maps test_lru_map test_lpm_map
@@ -7,6 +7,8 @@ TEST_FILES := $(test_objs) all: $(test_objs) +$(test_objs): ../../../lib/bpf/bpf.o + include ../lib.mk clean:
tools/testing/selftests/bpf/bpf_sys.h +0 -21
@@ -84,25 +84,4 @@ static inline int bpf_map_create(enum bpf_map_type type, uint32_t size_key, return bpf(BPF_MAP_CREATE, &attr, sizeof(attr)); } -static inline int bpf_prog_load (enum bpf_prog_type type, -const struct bpf_insn *insns,size_t size_insns, -const char *license,char *log,size_t size_log) -{ -union bpf_attr attr = {}; - - attr.prog_type = type; - attr.insns =bpf_ptr_to_u64 (insns); - attr.insn_cnt = size_insns /sizeof (struct bpf_insn ); - attr.license =bpf_ptr_to_u64 (license); - -if (size_log >0 ) { - attr.log_buf =bpf_ptr_to_u64 (log); - attr.log_size = size_log; - attr.log_level =1 ; - log[0 ] =0 ; - } - -return bpf (BPF_PROG_LOAD , &attr,sizeof (attr)); -} -#endif /* __BPF_SYS__ */
tools/testing/selftests/bpf/test_tag.c +4 -2
@@ -16,6 +16,8 @@#include <linux/bpf.h> #include <linux/if_alg.h> +#include <bpf/bpf.h> +#include "../../../include/linux/filter.h" #include "bpf_sys.h"
@@ -55,8 +57,8 @@ static int bpf_try_load_prog(int insns, int fd_map,int fd_prog;bpf_filler (insns, fd_map); - fd_prog =bpf_prog_load (BPF_PROG_TYPE_SCHED_CLS , prog, insns * -sizeof (struct bpf_insn ),"" ,NULL ,0 ); + fd_prog =bpf_load_program (BPF_PROG_TYPE_SCHED_CLS , prog, insns,"" ,0 , +NULL ,0 );assert (fd_prog >0 );if (fd_map >0 )bpf_filler (insns,0 );
tools/testing/selftests/bpf/test_verifier.c +5 -3
@@ -24,6 +24,8 @@#include <linux/bpf_perf_event.h> #include <linux/bpf.h> +#include <bpf/bpf.h> +#include "../../../include/linux/filter.h" #include "bpf_sys.h"
@@ -4535,9 +4537,9 @@ static void do_test_single(struct bpf_test *test, bool unpriv,do_test_fixup (test, prog, &fd_f1, &fd_f2, &fd_f3); - fd_prog =bpf_prog_load (prog_type ? :BPF_PROG_TYPE_SOCKET_FILTER , - prog, prog_len *sizeof (struct bpf_insn ), -"GPL" , bpf_vlog,sizeof (bpf_vlog)); + fd_prog =bpf_load_program (prog_type ? :BPF_PROG_TYPE_SOCKET_FILTER , + prog, prog_len,"GPL" ,0 , bpf_vlog, +sizeof (bpf_vlog)); expected_ret = unpriv && test->result_unpriv !=UNDEF ? test->result_unpriv : test->result;
Signature · 1 line
2.11.0
Re: [PATCH net-next v3 04/11] bpf: Use bpf_load_program() from the library
tools/lib/bpf/bpf.c int bpf_create_map(enum bpf_map_type map_type, int key_size, · line 79
Quoted 4 lines · Mickaël Salaün
tools/lib/bpf/bpf.c +1
-2-union bpf_attr attr; +union bpf_attr attr = {}; -bzero (&attr,sizeof (attr));
I think somebody mentioned that there are compilers out there that don't do it correctly, hence it was done with explicit bzero. Arnaldo, Wang, do you remember the details?
Re: [PATCH net-next v3 04/11] bpf: Use bpf_load_program() from the library
Em Tue, Feb 07, 2017 at 03:17:43PM -0800, Alexei Starovoitov escreveu:
Quoted 9 lines · Mickaël Salaün
tools/lib/bpf/bpf.c int bpf_create_map(enum bpf_map_type map_type, int key_size, · line 79
Quoted 4 lines
tools/lib/bpf/bpf.c +1
-2-union bpf_attr attr; +union bpf_attr attr = {}; -bzero (&attr,sizeof (attr));I think somebody mentioned that there are compilers out there that don't do it correctly, hence it was done with explicit bzero. Arnaldo, Wang, do you remember the details?
Yeah, lemme dig it...
- Arnaldo
Re: [PATCH net-next v3 04/11] bpf: Use bpf_load_program() from the library
In reply to Alexei StarovoitovEm Tue, Feb 07, 2017 at 03:17:43PM -0800, Alexei Starovoitov escreveu:
Quoted 9 lines · Mickaël Salaün
tools/lib/bpf/bpf.c int bpf_create_map(enum bpf_map_type map_type, int key_size, · line 79
Quoted 4 lines
tools/lib/bpf/bpf.c +1
-2-union bpf_attr attr; +union bpf_attr attr = {}; -bzero (&attr,sizeof (attr));I think somebody mentioned that there are compilers out there that don't do it correctly, hence it was done with explicit bzero. Arnaldo, Wang, do you remember the details?
https://www.spinics.net/lists/netdev/msg411144.html
But this was when some named initializers are used in a union with unnamed members like 'union bpf_attr', unsure if this would break with the above case where no named initializers are being used.
Having that said, the above is gratuitous, the code that is being replaced is not related to the patch at hand, and conceptually the end result should be the same.
So, please, just leave it as is, i.e. using bzero() and make your patch a bit smaller, remember, small is good, smaller is even better ;-)
- Arnaldo
Re: [PATCH net-next v3 04/11] bpf: Use bpf_load_program() from the library
Quoted 17 lines · Arnaldo Carvalho de Melo
Em Tue, Feb 07, 2017 at 03:17:43PM -0800, Alexei Starovoitov escreveu:
Quoted 9 lines · Mickaël Salaün
tools/lib/bpf/bpf.c int bpf_create_map(enum bpf_map_type map_type, int key_size, · line 79
Quoted 4 lines
tools/lib/bpf/bpf.c +1
-2-union bpf_attr attr; +union bpf_attr attr = {}; -bzero (&attr,sizeof (attr));I think somebody mentioned that there are compilers out there that don't do it correctly, hence it was done with explicit bzero. Arnaldo, Wang, do you remember the details?
https://www.spinics.net/lists/netdev/msg411144.html
But this was when some named initializers are used in a union with unnamed members like 'union
bpf_attr', unsure if this would break with the above case where no named initializers are being used.
Quoted 9 lines
Having that said, the above is gratuitous, the code that is being replaced is not related to the patch at hand, and conceptually the end result should be the same.
So, please, just leave it as is, i.e. using
bzero()and make your patch a bit smaller, remember, small is good, smaller is even better ;-)- Arnaldo
Right, I'll do it.
Thanks
PATCH v3 5/11 bpf: Use bpf_map_update_elem() from the library
In reply to Mickaël SalaünReplace bpf_map_update() with bpf_map_update_elem() calls.
--- tools/lib/bpf/bpf.c | 5 +-- tools/lib/bpf/bpf.h | 2 +- tools/testing/selftests/bpf/bpf_sys.h | 13 ------ tools/testing/selftests/bpf/test_lpm_map.c | 15 +++---- tools/testing/selftests/bpf/test_lru_map.c | 65 +++++++++++++++--------------- tools/testing/selftests/bpf/test_maps.c | 57 +++++++++++++------------- 6 files changed, 73 insertions(+), 84 deletions(-)
tools/lib/bpf/bpf.c +2 -3
@@ -97,12 +97,11 @@ int bpf_load_program(enum bpf_prog_type type, const struct bpf_insn *insns,return sys_bpf (BPF_PROG_LOAD , &attr,sizeof (attr)); } -int bpf_map_update_elem (int fd,void *key,void *value, +int bpf_map_update_elem (int fd,const void *key,const void *value,__u64 flags) { -union bpf_attr attr; +union bpf_attr attr = {}; -bzero (&attr,sizeof (attr)); attr.map_fd = fd; attr.key =ptr_to_u64 (key); attr.value =ptr_to_u64 (value);
tools/lib/bpf/bpf.h +1 -1
@@ -33,7 +33,7 @@ int bpf_load_program(enum bpf_prog_type type, const struct bpf_insn *insns, __u32 kern_version, char *log_buf, size_t log_buf_sz); -int bpf_map_update_elem (int fd,void *key,void *value, +int bpf_map_update_elem (int fd,const void *key,const void *value,__u64 flags);int bpf_map_lookup_elem (int fd,void *key,void *value);
tools/testing/selftests/bpf/bpf_sys.h +0 -13
@@ -35,19 +35,6 @@ static inline int bpf_map_lookup(int fd, const void *key, void *value)return bpf (BPF_MAP_LOOKUP_ELEM , &attr,sizeof (attr)); } -static inline int bpf_map_update (int fd,const void *key,const void *value, -uint64_t flags) -{ -union bpf_attr attr = {}; - - attr.map_fd = fd; - attr.key =bpf_ptr_to_u64 (key); - attr.value =bpf_ptr_to_u64 (value); - attr.flags = flags; - -return bpf (BPF_MAP_UPDATE_ELEM , &attr,sizeof (attr)); -} -static inline int bpf_map_delete (int fd,const void *key) {union bpf_attr attr = {};
tools/testing/selftests/bpf/test_lpm_map.c +8 -7
@@ -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 ;
tools/testing/selftests/bpf/test_lru_map.c +33 -32
193 lines not on this page · raw message
tools/testing/selftests/bpf/test_maps.c +29 -28
188 lines not on this page · raw message
Signature · 1 line
2.11.0
PATCH v3 6/11 bpf: Use bpf_map_lookup_elem() from the library
In reply to Mickaël SalaünReplace bpf_map_lookup() with bpf_map_lookup_elem() calls.
--- tools/lib/bpf/bpf.c | 5 ++--- tools/lib/bpf/bpf.h | 2 +- tools/testing/selftests/bpf/bpf_sys.h | 11 ----------- tools/testing/selftests/bpf/test_lpm_map.c | 16 ++++++++-------- tools/testing/selftests/bpf/test_lru_map.c | 28 ++++++++++++++-------------- tools/testing/selftests/bpf/test_maps.c | 30 +++++++++++++++--------------- 6 files changed, 40 insertions(+), 52 deletions(-)
tools/lib/bpf/bpf.c +2 -3
@@ -110,11 +110,10 @@ int bpf_map_update_elem(int fd, const void *key, const void *value,return sys_bpf (BPF_MAP_UPDATE_ELEM , &attr,sizeof (attr)); } -int bpf_map_lookup_elem (int fd,void *key,void *value) +int bpf_map_lookup_elem (int fd,const void *key,void *value) { -union bpf_attr attr; +union bpf_attr attr = {}; -bzero (&attr,sizeof (attr)); attr.map_fd = fd; attr.key =ptr_to_u64 (key); attr.value =ptr_to_u64 (value);
tools/lib/bpf/bpf.h +1 -1
@@ -36,7 +36,7 @@ int bpf_load_program(enum bpf_prog_type type, const struct bpf_insn *insns,int bpf_map_update_elem (int fd,const void *key,const void *value,__u64 flags); -int bpf_map_lookup_elem (int fd,void *key,void *value); +int bpf_map_lookup_elem (int fd,const void *key,void *value);int bpf_map_delete_elem (int fd,void *key);int bpf_map_get_next_key (int fd,void *key,void *next_key);int bpf_obj_pin (int fd,const char *pathname);
tools/testing/selftests/bpf/bpf_sys.h +0 -11
@@ -24,17 +24,6 @@ static inline int bpf(int cmd, union bpf_attr *attr, unsigned int size)#endif } -static inline int bpf_map_lookup (int fd,const void *key,void *value) -{ -union bpf_attr attr = {}; - - attr.map_fd = fd; - attr.key =bpf_ptr_to_u64 (key); - attr.value =bpf_ptr_to_u64 (value); - -return bpf (BPF_MAP_LOOKUP_ELEM , &attr,sizeof (attr)); -} -static inline int bpf_map_delete (int fd,const void *key) {union bpf_attr attr = {};
tools/testing/selftests/bpf/test_lpm_map.c +8 -8
@@ -211,7 +211,7 @@ static void test_lpm_map(int keysize) key->prefixlen =8 * keysize;memcpy (key->data, data, keysize); - r =bpf_map_lookup (map, key, value); + r =bpf_map_lookup_elem (map, key, value);assert (!r || errno ==ENOENT );assert (!t == !!r);
@@ -300,32 +300,32 @@ static void test_lpm_ipaddr(void)/* Test some lookups that should come back with a value */ inet_pton (AF_INET ,"192.168.128.23" , key_ipv4->data); -assert (bpf_map_lookup (map_fd_ipv4, key_ipv4, &value) ==0 ); +assert (bpf_map_lookup_elem (map_fd_ipv4, key_ipv4, &value) ==0 );assert (value ==3 );inet_pton (AF_INET ,"192.168.0.1" , key_ipv4->data); -assert (bpf_map_lookup (map_fd_ipv4, key_ipv4, &value) ==0 ); +assert (bpf_map_lookup_elem (map_fd_ipv4, key_ipv4, &value) ==0 );assert (value ==2 );inet_pton (AF_INET6 ,"2a00:1450:4001:814::" , key_ipv6->data); -assert (bpf_map_lookup (map_fd_ipv6, key_ipv6, &value) ==0 ); +assert (bpf_map_lookup_elem (map_fd_ipv6, key_ipv6, &value) ==0 );assert (value ==0xdeadbeef );inet_pton (AF_INET6 ,"2a00:1450:4001:814::1" , key_ipv6->data); -assert (bpf_map_lookup (map_fd_ipv6, key_ipv6, &value) ==0 ); +assert (bpf_map_lookup_elem (map_fd_ipv6, key_ipv6, &value) ==0 );assert (value ==0xdeadbeef );/* Test some lookups that should not match any entry */ inet_pton (AF_INET ,"10.0.0.1" , key_ipv4->data); -assert (bpf_map_lookup (map_fd_ipv4, key_ipv4, &value) ==-1 && +assert (bpf_map_lookup_elem (map_fd_ipv4, key_ipv4, &value) ==-1 && errno ==ENOENT );inet_pton (AF_INET ,"11.11.11.11" , key_ipv4->data); -assert (bpf_map_lookup (map_fd_ipv4, key_ipv4, &value) ==-1 && +assert (bpf_map_lookup_elem (map_fd_ipv4, key_ipv4, &value) ==-1 && errno ==ENOENT );inet_pton (AF_INET6 ,"2a00:ffff::" , key_ipv6->data); -assert (bpf_map_lookup (map_fd_ipv6, key_ipv6, &value) ==-1 && +assert (bpf_map_lookup_elem (map_fd_ipv6, key_ipv6, &value) ==-1 && errno ==ENOENT );close (map_fd_ipv4);
tools/testing/selftests/bpf/test_lru_map.c +14 -14
@@ -47,8 +47,8 @@ static int map_subset(int map0, int map1)int ret;while (!bpf_map_next_key (map1, &next_key, &next_key)) { -assert (!bpf_map_lookup (map1, &next_key, value1)); - ret =bpf_map_lookup (map0, &next_key, value0); +assert (!bpf_map_lookup_elem (map1, &next_key, value1)); + ret =bpf_map_lookup_elem (map0, &next_key, value0);if (ret) {printf ("key:%llu not found from map. %s(%d)\n" , next_key,strerror (errno), errno);
@@ -135,7 +135,7 @@ static void test_lru_sanity0(int map_type, int map_flags)/* check that key=2 is not found */ key =2 ; -assert (bpf_map_lookup (lru_map_fd, &key, value) ==-1 && +assert (bpf_map_lookup_elem (lru_map_fd, &key, value) ==-1 && errno ==ENOENT );/* BPF_EXIST means: update existing element */
@@ -149,14 +149,14 @@ static void test_lru_sanity0(int map_type, int map_flags)/* check that key=3 is not found */ key =3 ; -assert (bpf_map_lookup (lru_map_fd, &key, value) ==-1 && +assert (bpf_map_lookup_elem (lru_map_fd, &key, value) ==-1 && errno ==ENOENT );/* check that key=1 can be found and mark the ref bit to * stop LRU from removing key=1 */ key =1 ; -assert (!bpf_map_lookup (lru_map_fd, &key, value)); +assert (!bpf_map_lookup_elem (lru_map_fd, &key, value));assert (value[0 ] ==1234 ); key =3 ;
@@ -165,7 +165,7 @@ static void test_lru_sanity0(int map_type, int map_flags)/* key=2 has been removed from the LRU */ key =2 ; -assert (bpf_map_lookup (lru_map_fd, &key, value) ==-1 ); +assert (bpf_map_lookup_elem (lru_map_fd, &key, value) ==-1 );assert (map_equal (lru_map_fd, expected_map_fd));
@@ -223,7 +223,7 @@ static void test_lru_sanity1(int map_type, int map_flags, unsigned int tgt_free)/* Lookup 1 to tgt_free/2 */ end_key =1 + batch_size;for (key =1 ; key < end_key; key++) { -assert (!bpf_map_lookup (lru_map_fd, &key, value)); +assert (!bpf_map_lookup_elem (lru_map_fd, &key, value));assert (!bpf_map_update_elem (expected_map_fd, &key, value,BPF_NOEXIST )); }
@@ -329,9 +329,9 @@ static void test_lru_sanity2(int map_type, int map_flags, unsigned int tgt_free) end_key =1 + batch_size; value[0 ] =4321 ;for (key =1 ; key < end_key; key++) { -assert (bpf_map_lookup (lru_map_fd, &key, value)); +assert (bpf_map_lookup_elem (lru_map_fd, &key, value));assert (!bpf_map_update_elem (lru_map_fd, &key, value,BPF_NOEXIST )); -assert (!bpf_map_lookup (lru_map_fd, &key, value)); +assert (!bpf_map_lookup_elem (lru_map_fd, &key, value));assert (value[0 ] ==4321 );assert (!bpf_map_update_elem (expected_map_fd, &key, value,BPF_NOEXIST ));
@@ -407,7 +407,7 @@ static void test_lru_sanity3(int map_type, int map_flags, unsigned int tgt_free)/* Lookup key 1 to tgt_free*3/2 */ end_key = tgt_free + batch_size;for (key =1 ; key < end_key; key++) { -assert (!bpf_map_lookup (lru_map_fd, &key, value)); +assert (!bpf_map_lookup_elem (lru_map_fd, &key, value));assert (!bpf_map_update_elem (expected_map_fd, &key, value,BPF_NOEXIST )); }
@@ -464,7 +464,7 @@ static void test_lru_sanity4(int map_type, int map_flags, unsigned int tgt_free)assert (bpf_map_update_elem (lru_map_fd, &key, value,BPF_NOEXIST ));for (key =1 ; key <= tgt_free; key++) { -assert (!bpf_map_lookup (lru_map_fd, &key, value)); +assert (!bpf_map_lookup_elem (lru_map_fd, &key, value));assert (!bpf_map_update_elem (expected_map_fd, &key, value,BPF_NOEXIST )); }
@@ -494,16 +494,16 @@ static void do_test_lru_sanity5(unsigned long long last_key, int map_fd)unsigned long long key, value[nr_cpus];/* Ensure the last key inserted by previous CPU can be found */ -assert (!bpf_map_lookup (map_fd, &last_key, value)); +assert (!bpf_map_lookup_elem (map_fd, &last_key, value)); value[0 ] =1234 ; key = last_key +1 ;assert (!bpf_map_update_elem (map_fd, &key, value,BPF_NOEXIST )); -assert (!bpf_map_lookup (map_fd, &key, value)); +assert (!bpf_map_lookup_elem (map_fd, &key, value));/* Cannot find the last key because it was removed by LRU */ -assert (bpf_map_lookup (map_fd, &last_key, value)); +assert (bpf_map_lookup_elem (map_fd, &last_key, value)); }/* Test map with only one element */
tools/testing/selftests/bpf/test_maps.c +15 -15
@@ -54,11 +54,11 @@ static void test_hashmap(int task, void *data)assert (bpf_map_update_elem (fd, &key, &value,-1 ) ==-1 && errno ==EINVAL );/* Check that key=1 can be found. */ -assert (bpf_map_lookup (fd, &key, &value) ==0 && value ==1234 ); +assert (bpf_map_lookup_elem (fd, &key, &value) ==0 && value ==1234 ); key =2 ;/* Check that key=2 is not found. */ -assert (bpf_map_lookup (fd, &key, &value) ==-1 && errno ==ENOENT ); +assert (bpf_map_lookup_elem (fd, &key, &value) ==-1 && errno ==ENOENT );/* BPF_EXIST means update existing element. */ assert(bpf_map_update_elem(fd, &key, &value, BPF_EXIST) == -1 &&
@@ -146,11 +146,11 @@ static void test_hashmap_percpu(int task, void *data)* was run from a different CPU. */ value[0 ] =1 ; -assert (bpf_map_lookup (fd, &key, value) ==0 && value[0 ] ==100 ); +assert (bpf_map_lookup_elem (fd, &key, value) ==0 && value[0 ] ==100 ); key =2 ;/* Check that key=2 is not found. */ -assert (bpf_map_lookup (fd, &key, value) ==-1 && errno ==ENOENT ); +assert (bpf_map_lookup_elem (fd, &key, value) ==-1 && errno ==ENOENT );/* BPF_EXIST means update existing element. */ assert(bpf_map_update_elem(fd, &key, value, BPF_EXIST) == -1 &&
@@ -177,7 +177,7 @@ static void test_hashmap_percpu(int task, void *data)assert ((expected_key_mask & next_key) == next_key); expected_key_mask &= ~next_key; -assert (bpf_map_lookup (fd, &next_key, value) ==0 ); +assert (bpf_map_lookup_elem (fd, &next_key, value) ==0 );for (i =0 ; i < nr_cpus; i++)assert (value[i] == i +100 );
@@ -227,11 +227,11 @@ static void test_arraymap(int task, void *data) errno == EEXIST);/* Check that key=1 can be found. */ -assert (bpf_map_lookup (fd, &key, &value) ==0 && value ==1234 ); +assert (bpf_map_lookup_elem (fd, &key, &value) ==0 && value ==1234 ); key =0 ;/* Check that key=0 is also found and zero initialized. */ -assert (bpf_map_lookup (fd, &key, &value) ==0 && value ==0 ); +assert (bpf_map_lookup_elem (fd, &key, &value) ==0 && value ==0 );/* key=0 and key=1 were inserted, check that key=2 cannot be inserted * due to max_entries limit.
@@ -241,7 +241,7 @@ static void test_arraymap(int task, void *data) errno == E2BIG);/* Check that key = 2 doesn't exist. */ -assert (bpf_map_lookup (fd, &key, &value) ==-1 && errno ==ENOENT ); +assert (bpf_map_lookup_elem (fd, &key, &value) ==-1 && errno ==ENOENT );/* Iterate over two elements. */ assert(bpf_map_next_key(fd, &key, &next_key) == 0 &&
@@ -283,11 +283,11 @@ static void test_arraymap_percpu(int task, void *data) errno == EEXIST);/* Check that key=1 can be found. */ -assert (bpf_map_lookup (fd, &key, values) ==0 && values[0 ] ==100 ); +assert (bpf_map_lookup_elem (fd, &key, values) ==0 && values[0 ] ==100 ); key =0 ;/* Check that key=0 is also found and zero initialized. */ -assert (bpf_map_lookup (fd, &key, values) ==0 && +assert (bpf_map_lookup_elem (fd, &key, values) ==0 && values[0 ] ==0 && values[nr_cpus -1 ] ==0 );/* Check that key=2 cannot be inserted due to max_entries limit. */
@@ -296,7 +296,7 @@ static void test_arraymap_percpu(int task, void *data) errno == E2BIG);/* Check that key = 2 doesn't exist. */ -assert (bpf_map_lookup (fd, &key, values) ==-1 && errno ==ENOENT ); +assert (bpf_map_lookup_elem (fd, &key, values) ==-1 && errno ==ENOENT );/* Iterate over two elements. */ assert(bpf_map_next_key(fd, &key, &next_key) == 0 &&
@@ -338,7 +338,7 @@ static void test_arraymap_percpu_many_keys(void)for (i =0 ; i < nr_cpus; i++) values[i] =0 ; -assert (bpf_map_lookup (fd, &key, values) ==0 ); +assert (bpf_map_lookup_elem (fd, &key, values) ==0 );for (i =0 ; i < nr_cpus; i++)assert (values[i] == i +10 );
@@ -382,9 +382,9 @@ static void test_map_large(void)assert (bpf_map_next_key (fd, &key, &key) ==-1 && errno ==ENOENT ); key.c =0 ; -assert (bpf_map_lookup (fd, &key, &value) ==0 && value ==0 ); +assert (bpf_map_lookup_elem (fd, &key, &value) ==0 && value ==0 ); key.a =1 ; -assert (bpf_map_lookup (fd, &key, &value) ==-1 && errno ==ENOENT ); +assert (bpf_map_lookup_elem (fd, &key, &value) ==-1 && errno ==ENOENT );close (fd); }
@@ -482,7 +482,7 @@ static void test_map_parallel(void)for (i =0 ; i <MAP_SIZE ; i++) { key =MAP_SIZE - i -1 ; -assert (bpf_map_lookup (fd, &key, &value) ==0 && +assert (bpf_map_lookup_elem (fd, &key, &value) ==0 && value == key); }
Signature · 1 line
2.11.0
PATCH v3 7/11 bpf: Use bpf_map_delete_elem() from the library
In reply to Mickaël SalaünReplace bpf_map_delete() with bpf_map_delete_elem() calls.
--- tools/lib/bpf/bpf.c | 5 ++--- tools/lib/bpf/bpf.h | 2 +- tools/testing/selftests/bpf/bpf_sys.h | 10 ---------- tools/testing/selftests/bpf/test_lru_map.c | 6 +++--- tools/testing/selftests/bpf/test_maps.c | 22 +++++++++++----------- 5 files changed, 17 insertions(+), 28 deletions(-)
tools/lib/bpf/bpf.c +2 -3
@@ -121,11 +121,10 @@ 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; +union bpf_attr attr = {}; -bzero (&attr,sizeof (attr)); attr.map_fd = fd; attr.key =ptr_to_u64 (key);
tools/lib/bpf/bpf.h +1 -1
@@ -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
@@ -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
@@ -318,7 +318,7 @@ static void test_lru_sanity2(int map_type, int map_flags, unsigned int tgt_free) key =1 ;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 )); }
@@ -470,8 +470,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
@@ -85,7 +85,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 &&
@@ -97,10 +97,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. */
@@ -170,7 +170,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)) {
@@ -192,10 +192,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. */
@@ -253,7 +253,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); }
@@ -308,7 +308,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); }
@@ -441,7 +441,7 @@ static void do_work(int fn, void *data)assert (bpf_map_update_elem (fd, &key, &value,BPF_NOEXIST ) ==0 );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 ); } } }
Signature · 1 line
2.11.0
PATCH v3 8/11 bpf: Use bpf_map_get_next_key() from the library
In reply to Mickaël SalaünReplace bpf_map_next_key() with bpf_map_get_next_key() calls.
--- tools/lib/bpf/bpf.c | 5 ++--- tools/lib/bpf/bpf.h | 2 +- tools/testing/selftests/bpf/bpf_sys.h | 11 ---------- tools/testing/selftests/bpf/test_lru_map.c | 2 +- tools/testing/selftests/bpf/test_maps.c | 34 +++++++++++++++--------------- 5 files changed, 21 insertions(+), 33 deletions(-)
tools/lib/bpf/bpf.c +2 -3
@@ -131,11 +131,10 @@ int bpf_map_delete_elem(int fd, const void *key)return sys_bpf (BPF_MAP_DELETE_ELEM , &attr,sizeof (attr)); } -int bpf_map_get_next_key (int fd,void *key,void *next_key) +int bpf_map_get_next_key (int fd,const void *key,void *next_key) { -union bpf_attr attr; +union bpf_attr attr = {}; -bzero (&attr,sizeof (attr)); attr.map_fd = fd; attr.key =ptr_to_u64 (key); attr.next_key =ptr_to_u64 (next_key);
tools/lib/bpf/bpf.h +1 -1
@@ -38,7 +38,7 @@ int bpf_map_update_elem(int fd, const void *key, const void *value,int bpf_map_lookup_elem (int fd,const void *key,void *value);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_map_get_next_key (int fd,const void *key,void *next_key);int bpf_obj_pin (int fd,const char *pathname);int bpf_obj_get (const char *pathname);int bpf_prog_attach (int prog_fd,int attachable_fd,enum bpf_attach_type type);
tools/testing/selftests/bpf/bpf_sys.h +0 -11
@@ -24,17 +24,6 @@ static inline int bpf(int cmd, union bpf_attr *attr, unsigned int size)#endif } -static inline int bpf_map_next_key (int fd,const void *key,void *next_key) -{ -union bpf_attr attr = {}; - - attr.map_fd = fd; - attr.key =bpf_ptr_to_u64 (key); - attr.next_key =bpf_ptr_to_u64 (next_key); - -return bpf (BPF_MAP_GET_NEXT_KEY , &attr,sizeof (attr)); -} -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)
tools/testing/selftests/bpf/test_lru_map.c +1 -1
@@ -46,7 +46,7 @@ static int map_subset(int map0, int map1)unsigned long long value0[nr_cpus], value1[nr_cpus];int ret; -while (!bpf_map_next_key (map1, &next_key, &next_key)) { +while (!bpf_map_get_next_key (map1, &next_key, &next_key)) {assert (!bpf_map_lookup_elem (map1, &next_key, value1)); ret =bpf_map_lookup_elem (map0, &next_key, value0);if (ret) {
tools/testing/selftests/bpf/test_maps.c +17 -17
@@ -88,11 +88,11 @@ static void test_hashmap(int task, void *data)assert (bpf_map_delete_elem (fd, &key) ==-1 && errno ==ENOENT );/* Iterate over two elements. */ -assert (bpf_map_next_key (fd, &key, &next_key) ==0 && +assert (bpf_map_get_next_key (fd, &key, &next_key) ==0 && (next_key ==1 || next_key ==2 )); -assert (bpf_map_next_key (fd, &next_key, &next_key) ==0 && +assert (bpf_map_get_next_key (fd, &next_key, &next_key) ==0 && (next_key ==1 || next_key ==2 )); -assert (bpf_map_next_key (fd, &next_key, &next_key) ==-1 && +assert (bpf_map_get_next_key (fd, &next_key, &next_key) ==-1 && errno ==ENOENT );/* Delete both elements. */
@@ -104,7 +104,7 @@ static void test_hashmap(int task, void *data) key =0 ;/* Check that map is empty. */ -assert (bpf_map_next_key (fd, &key, &next_key) ==-1 && +assert (bpf_map_get_next_key (fd, &key, &next_key) ==-1 && errno ==ENOENT );close (fd);
@@ -173,7 +173,7 @@ static void test_hashmap_percpu(int task, void *data)assert (bpf_map_delete_elem (fd, &key) ==-1 && errno ==ENOENT );/* Iterate over two elements. */ -while (!bpf_map_next_key (fd, &key, &next_key)) { +while (!bpf_map_get_next_key (fd, &key, &next_key)) {assert ((expected_key_mask & next_key) == next_key); expected_key_mask &= ~next_key;
@@ -199,7 +199,7 @@ static void test_hashmap_percpu(int task, void *data) key =0 ;/* Check that map is empty. */ -assert (bpf_map_next_key (fd, &key, &next_key) ==-1 && +assert (bpf_map_get_next_key (fd, &key, &next_key) ==-1 && errno ==ENOENT );close (fd);
@@ -244,11 +244,11 @@ static void test_arraymap(int task, void *data)assert (bpf_map_lookup_elem (fd, &key, &value) ==-1 && errno ==ENOENT );/* Iterate over two elements. */ -assert (bpf_map_next_key (fd, &key, &next_key) ==0 && +assert (bpf_map_get_next_key (fd, &key, &next_key) ==0 && next_key ==0 ); -assert (bpf_map_next_key (fd, &next_key, &next_key) ==0 && +assert (bpf_map_get_next_key (fd, &next_key, &next_key) ==0 && next_key ==1 ); -assert (bpf_map_next_key (fd, &next_key, &next_key) ==-1 && +assert (bpf_map_get_next_key (fd, &next_key, &next_key) ==-1 && errno ==ENOENT );/* Delete shouldn't succeed. */
@@ -299,11 +299,11 @@ static void test_arraymap_percpu(int task, void *data)assert (bpf_map_lookup_elem (fd, &key, values) ==-1 && errno ==ENOENT );/* Iterate over two elements. */ -assert (bpf_map_next_key (fd, &key, &next_key) ==0 && +assert (bpf_map_get_next_key (fd, &key, &next_key) ==0 && next_key ==0 ); -assert (bpf_map_next_key (fd, &next_key, &next_key) ==0 && +assert (bpf_map_get_next_key (fd, &next_key, &next_key) ==0 && next_key ==1 ); -assert (bpf_map_next_key (fd, &next_key, &next_key) ==-1 && +assert (bpf_map_get_next_key (fd, &next_key, &next_key) ==-1 && errno ==ENOENT );/* Delete shouldn't succeed. */
@@ -378,8 +378,8 @@ static void test_map_large(void)/* Iterate through all elements. */ for (i =0 ; i <MAP_SIZE ; i++) -assert (bpf_map_next_key (fd, &key, &key) ==0 ); -assert (bpf_map_next_key (fd, &key, &key) ==-1 && errno ==ENOENT ); +assert (bpf_map_get_next_key (fd, &key, &key) ==0 ); +assert (bpf_map_get_next_key (fd, &key, &key) ==-1 && errno ==ENOENT ); key.c =0 ;assert (bpf_map_lookup_elem (fd, &key, &value) ==0 && value ==0 );
@@ -475,8 +475,8 @@ static void test_map_parallel(void)/* Check that all elements were inserted. */ key =-1 ;for (i =0 ; i <MAP_SIZE ; i++) -assert (bpf_map_next_key (fd, &key, &key) ==0 ); -assert (bpf_map_next_key (fd, &key, &key) ==-1 && errno ==ENOENT ); +assert (bpf_map_get_next_key (fd, &key, &key) ==0 ); +assert (bpf_map_get_next_key (fd, &key, &key) ==-1 && errno ==ENOENT );/* Another check for all elements */ for (i =0 ; i <MAP_SIZE ; i++) {
@@ -492,7 +492,7 @@ static void test_map_parallel(void)/* Nothing should be left. */ key =-1 ; -assert (bpf_map_next_key (fd, &key, &key) ==-1 && errno ==ENOENT ); +assert (bpf_map_get_next_key (fd, &key, &key) ==-1 && errno ==ENOENT ); }static void run_all_tests (void )
Signature · 1 line
2.11.0
PATCH v3 9/11 bpf: Use bpf_create_map() from the library
In reply to Mickaël SalaünReplace bpf_map_create() with bpf_create_map() calls.
--- tools/testing/selftests/bpf/bpf_sys.h | 15 --------------- tools/testing/selftests/bpf/test_lpm_map.c | 6 +++--- tools/testing/selftests/bpf/test_lru_map.c | 4 ++-- tools/testing/selftests/bpf/test_maps.c | 14 +++++++------- tools/testing/selftests/bpf/test_tag.c | 2 +- tools/testing/selftests/bpf/test_verifier.c | 4 ++-- 6 files changed, 15 insertions(+), 30 deletions(-)
tools/testing/selftests/bpf/bpf_sys.h +0 -15
@@ -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
@@ -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
@@ -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
@@ -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));
@@ -118,7 +118,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));
@@ -210,7 +210,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));
@@ -264,7 +264,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));
@@ -320,7 +320,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",
@@ -358,7 +358,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));
@@ -451,7 +451,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
@@ -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 );
tools/testing/selftests/bpf/test_verifier.c +2 -2
@@ -4467,7 +4467,7 @@ static int create_map(uint32_t size_value, uint32_t max_elem) {int fd; - fd =bpf_map_create (BPF_MAP_TYPE_HASH ,sizeof (long long ), + fd =bpf_create_map (BPF_MAP_TYPE_HASH ,sizeof (long long ), size_value, max_elem,BPF_F_NO_PREALLOC );if (fd <0 )printf ("Failed to create hash map '%s'!\n" ,strerror (errno));
@@ -4479,7 +4479,7 @@ static int create_prog_array(void) {int fd; - fd =bpf_map_create (BPF_MAP_TYPE_PROG_ARRAY ,sizeof (int ), + fd =bpf_create_map (BPF_MAP_TYPE_PROG_ARRAY ,sizeof (int ),sizeof (int ),4 ,0 );if (fd <0 )printf ("Failed to create prog array '%s'!\n" ,strerror (errno));
Signature · 1 line
2.11.0
PATCH v3 10/11 bpf: Remove bpf_sys.h from selftests
In reply to Mickaël SalaünAdd require dependency headers.
--- tools/lib/bpf/bpf.c | 6 ++++++ tools/testing/selftests/bpf/bpf_sys.h | 27 --------------------------- tools/testing/selftests/bpf/test_lpm_map.c | 1 - tools/testing/selftests/bpf/test_lru_map.c | 1 - tools/testing/selftests/bpf/test_maps.c | 1 - tools/testing/selftests/bpf/test_tag.c | 3 +-- tools/testing/selftests/bpf/test_verifier.c | 4 ++-- 7 files changed, 9 insertions(+), 34 deletions(-) delete mode 100644 tools/testing/selftests/bpf/bpf_sys.h
tools/lib/bpf/bpf.c +6 -0
@@ -50,7 +50,13 @@ static __u64 ptr_to_u64(const void *ptr)static int sys_bpf (enum bpf_cmd cmd,union bpf_attr *attr,unsigned int size) { +#ifdef __NR_bpfreturn syscall (__NR_bpf, cmd, attr, size); +#else +fprintf (stderr,"No bpf syscall, kernel headers too old?\n" ); + errno =ENOSYS ; +return -1 ; +#endif } int bpf_create_map(enum bpf_map_type map_type, int key_size,
tools/testing/selftests/bpf/bpf_sys.h deleted +0 -27
@@ -1,27 +0,0 @@ -#ifndef __BPF_SYS__ -#define __BPF_SYS__ - -#include <stdint.h> -#include <stdlib.h> - -#include <sys/syscall.h> - -#include <linux/bpf.h> - -static inline __u64 bpf_ptr_to_u64 (const void *ptr) -{ -return (__u64 )(unsigned long ) ptr; -} - -static inline int bpf (int cmd,union bpf_attr *attr,unsigned int size) -{ -#ifdef __NR_bpf -return syscall (__NR_bpf, cmd, attr, size); -#else -fprintf (stderr,"No bpf syscall, kernel headers too old?\n" ); - errno =ENOSYS ; -return -1 ; -#endif -} - -#endif /* __BPF_SYS__ */
tools/testing/selftests/bpf/test_lpm_map.c +0 -1
@@ -23,7 +23,6 @@#include <sys/resource.h> #include <bpf/bpf.h> -#include "bpf_sys.h" #include "bpf_util.h" struct tlpm_node {
tools/testing/selftests/bpf/test_lru_map.c +0 -1
@@ -19,7 +19,6 @@#include <sys/resource.h> #include <bpf/bpf.h> -#include "bpf_sys.h" #include "bpf_util.h" #define LOCAL_FREE_TARGET (128)
tools/testing/selftests/bpf/test_maps.c +0 -1
@@ -22,7 +22,6 @@#include <linux/bpf.h> #include <bpf/bpf.h> -#include "bpf_sys.h" #include "bpf_util.h" static int map_flags;
tools/testing/selftests/bpf/test_tag.c +1 -2
@@ -1,3 +1,4 @@ +#include <stdint.h> #include <stdio.h> #include <stdlib.h> #include <ctype.h>
@@ -20,8 +21,6 @@#include "../../../include/linux/filter.h" -#include "bpf_sys.h" -static struct bpf_insn prog[BPF_MAXINSNS ];static void bpf_gen_imm_prog (unsigned int insns,int fd_map)
tools/testing/selftests/bpf/test_verifier.c +2 -2
@@ -8,7 +8,9 @@* License as published by the Free Software Foundation. */ +#include <stdint.h> #include <stdio.h> +#include <stdlib.h> #include <unistd.h> #include <errno.h> #include <string.h>
@@ -28,8 +30,6 @@#include "../../../include/linux/filter.h" -#include "bpf_sys.h" -#ifndef ARRAY_SIZE # define ARRAY_SIZE (x) (sizeof(x) / sizeof((x)[0]))#endif
Signature · 1 line
2.11.0
PATCH v3 11/11 bpf: Add test_tag to .gitignore
In reply to Mickaël Salaün--- tools/testing/selftests/bpf/.gitignore | 1 + 1 file changed, 1 insertion(+)
tools/testing/selftests/bpf/.gitignore +1 -0
@@ -2,3 +2,4 @@ test_verifier test_maps test_lru_map test_lpm_map +test_tag
Signature · 1 line
2.11.0
David Miller
maintainerFrom: Mickaël Salaün <[email protected]>
Date: Tue, 7 Feb 2017 22:44:49 +0100
Quoted 14 lines
This series brings some fixes to selftests, add the ability to test unprivileged BPF programs as root and replace
bpf_sys.hwith calls to the BPF library.This is intended for the net-next tree and apply on
76e0e70e6452("liquidio: do not dereference pointer if it's NULL").Changes since v2:
* use the patches from two previous series (unprivileged tests andbpf_sys.hreplacement)
* include one morestdint.h
* rebase on net-next
* add this cover letter
Quoted 2 lines
Changes since v1:
* exclude patches not intended for the net-next tree
I'm waiting for the feedback to be addressed on patch #4 (bzero vs. variable initializer) before applying this series.