diff options
| author |   Mickaël Salaün <mic@digikod.net> | 2017-02-10 00:21:38 +0100 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2017-02-10 15:56:06 -0500 |
| commit | 2ee89fb9a942e250b5adb5535de4acca14bb7fa2 (patch) | |
| tree | a2a05ae382318bb1a863aa8afee37055409e521c /tools/testing/selftests/bpf/bpf_sys.h | |
| parent | bpf: Always test unprivileged programs (diff) | |
| download | linux-dev-2ee89fb9a942e250b5adb5535de4acca14bb7fa2.tar.xz linux-dev-2ee89fb9a942e250b5adb5535de4acca14bb7fa2.zip | |
bpf: Use bpf_load_program() from the library
Replace bpf_prog_load() with bpf_load_program() 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/bpf_sys.h')
| -rw-r--r-- | tools/testing/selftests/bpf/bpf_sys.h | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/tools/testing/selftests/bpf/bpf_sys.h b/tools/testing/selftests/bpf/bpf_sys.h index 6b4565f2a3f2..e7bbe3e5402e 100644 --- a/tools/testing/selftests/bpf/bpf_sys.h +++ b/tools/testing/selftests/bpf/bpf_sys.h @@ -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__ */ |