Skip to content

Commit

Permalink
selftests/bpf: Convert test_global_funcs test to test_loader framework
Browse files Browse the repository at this point in the history
Convert 17 test_global_funcs subtests into test_loader framework for
easier maintenance and more declarative way to define expected
failures/successes.

Signed-off-by: Andrii Nakryiko <[email protected]>
Signed-off-by: Daniel Borkmann <[email protected]>
Acked-by: Stanislav Fomichev <[email protected]>
Link: https://lore.kernel.org/bpf/[email protected]
  • Loading branch information
anakryiko authored and borkmann committed Feb 17, 2023
1 parent d384dce commit 95ebb37
Show file tree
Hide file tree
Showing 18 changed files with 174 additions and 123 deletions.
131 changes: 34 additions & 97 deletions tools/testing/selftests/bpf/prog_tests/test_global_funcs.c
Original file line number Diff line number Diff line change
@@ -1,104 +1,41 @@
// SPDX-License-Identifier: GPL-2.0
/* Copyright (c) 2020 Facebook */
#include <test_progs.h>

const char *err_str;
bool found;

static int libbpf_debug_print(enum libbpf_print_level level,
const char *format, va_list args)
{
char *log_buf;

if (level != LIBBPF_WARN ||
strcmp(format, "libbpf: \n%s\n")) {
vprintf(format, args);
return 0;
}

log_buf = va_arg(args, char *);
if (!log_buf)
goto out;
if (err_str && strstr(log_buf, err_str) == 0)
found = true;
out:
printf(format, log_buf);
return 0;
}

extern int extra_prog_load_log_flags;

static int check_load(const char *file)
{
struct bpf_object *obj = NULL;
struct bpf_program *prog;
int err;

found = false;

obj = bpf_object__open_file(file, NULL);
err = libbpf_get_error(obj);
if (err)
return err;

prog = bpf_object__next_program(obj, NULL);
if (!prog) {
err = -ENOENT;
goto err_out;
}

bpf_program__set_flags(prog, BPF_F_TEST_RND_HI32);
bpf_program__set_log_level(prog, extra_prog_load_log_flags);

err = bpf_object__load(obj);

err_out:
bpf_object__close(obj);
return err;
}

struct test_def {
const char *file;
const char *err_str;
};
#include "test_global_func1.skel.h"
#include "test_global_func2.skel.h"
#include "test_global_func3.skel.h"
#include "test_global_func4.skel.h"
#include "test_global_func5.skel.h"
#include "test_global_func6.skel.h"
#include "test_global_func7.skel.h"
#include "test_global_func8.skel.h"
#include "test_global_func9.skel.h"
#include "test_global_func10.skel.h"
#include "test_global_func11.skel.h"
#include "test_global_func12.skel.h"
#include "test_global_func13.skel.h"
#include "test_global_func14.skel.h"
#include "test_global_func15.skel.h"
#include "test_global_func16.skel.h"
#include "test_global_func17.skel.h"

void test_test_global_funcs(void)
{
struct test_def tests[] = {
{ "test_global_func1.bpf.o", "combined stack size of 4 calls is 544" },
{ "test_global_func2.bpf.o" },
{ "test_global_func3.bpf.o", "the call stack of 8 frames" },
{ "test_global_func4.bpf.o" },
{ "test_global_func5.bpf.o", "expected pointer to ctx, but got PTR" },
{ "test_global_func6.bpf.o", "modified ctx ptr R2" },
{ "test_global_func7.bpf.o", "foo() doesn't return scalar" },
{ "test_global_func8.bpf.o" },
{ "test_global_func9.bpf.o" },
{ "test_global_func10.bpf.o", "invalid indirect read from stack" },
{ "test_global_func11.bpf.o", "Caller passes invalid args into func#1" },
{ "test_global_func12.bpf.o", "invalid mem access 'mem_or_null'" },
{ "test_global_func13.bpf.o", "Caller passes invalid args into func#1" },
{ "test_global_func14.bpf.o", "reference type('FWD S') size cannot be determined" },
{ "test_global_func15.bpf.o", "At program exit the register R0 has value" },
{ "test_global_func16.bpf.o", "invalid indirect read from stack" },
{ "test_global_func17.bpf.o", "Caller passes invalid args into func#1" },
};
libbpf_print_fn_t old_print_fn = NULL;
int err, i, duration = 0;

old_print_fn = libbpf_set_print(libbpf_debug_print);

for (i = 0; i < ARRAY_SIZE(tests); i++) {
const struct test_def *test = &tests[i];

if (!test__start_subtest(test->file))
continue;

err_str = test->err_str;
err = check_load(test->file);
CHECK_FAIL(!!err ^ !!err_str);
if (err_str)
CHECK(found, "", "expected string '%s'", err_str);
}
libbpf_set_print(old_print_fn);
RUN_TESTS(test_global_func1);
RUN_TESTS(test_global_func2);
RUN_TESTS(test_global_func3);
RUN_TESTS(test_global_func4);
RUN_TESTS(test_global_func5);
RUN_TESTS(test_global_func6);
RUN_TESTS(test_global_func7);
RUN_TESTS(test_global_func8);
RUN_TESTS(test_global_func9);
RUN_TESTS(test_global_func10);
RUN_TESTS(test_global_func11);
RUN_TESTS(test_global_func12);
RUN_TESTS(test_global_func13);
RUN_TESTS(test_global_func14);
RUN_TESTS(test_global_func15);
RUN_TESTS(test_global_func16);
RUN_TESTS(test_global_func17);
}
6 changes: 3 additions & 3 deletions tools/testing/selftests/bpf/progs/test_global_func1.c
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,9 @@
#include <stddef.h>
#include <linux/bpf.h>
#include <bpf/bpf_helpers.h>
#include "bpf_misc.h"

#ifndef MAX_STACK
#define MAX_STACK (512 - 3 * 32 + 8)
#endif

static __attribute__ ((noinline))
int f0(int var, struct __sk_buff *skb)
Expand Down Expand Up @@ -39,7 +38,8 @@ int f3(int val, struct __sk_buff *skb, int var)
}

SEC("tc")
int test_cls(struct __sk_buff *skb)
__failure __msg("combined stack size of 4 calls is 544")
int global_func1(struct __sk_buff *skb)
{
return f0(1, skb) + f1(skb) + f2(2, skb) + f3(3, skb, 4);
}
4 changes: 3 additions & 1 deletion tools/testing/selftests/bpf/progs/test_global_func10.c
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
#include <stddef.h>
#include <linux/bpf.h>
#include <bpf/bpf_helpers.h>
#include "bpf_misc.h"

struct Small {
int x;
Expand All @@ -21,7 +22,8 @@ __noinline int foo(const struct Big *big)
}

SEC("cgroup_skb/ingress")
int test_cls(struct __sk_buff *skb)
__failure __msg("invalid indirect read from stack")
int global_func10(struct __sk_buff *skb)
{
const struct Small small = {.x = skb->len };

Expand Down
4 changes: 3 additions & 1 deletion tools/testing/selftests/bpf/progs/test_global_func11.c
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
#include <stddef.h>
#include <linux/bpf.h>
#include <bpf/bpf_helpers.h>
#include "bpf_misc.h"

struct S {
int x;
Expand All @@ -13,7 +14,8 @@ __noinline int foo(const struct S *s)
}

SEC("cgroup_skb/ingress")
int test_cls(struct __sk_buff *skb)
__failure __msg("Caller passes invalid args into func#1")
int global_func11(struct __sk_buff *skb)
{
return foo((const void *)skb);
}
4 changes: 3 additions & 1 deletion tools/testing/selftests/bpf/progs/test_global_func12.c
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
#include <stddef.h>
#include <linux/bpf.h>
#include <bpf/bpf_helpers.h>
#include "bpf_misc.h"

struct S {
int x;
Expand All @@ -13,7 +14,8 @@ __noinline int foo(const struct S *s)
}

SEC("cgroup_skb/ingress")
int test_cls(struct __sk_buff *skb)
__failure __msg("invalid mem access 'mem_or_null'")
int global_func12(struct __sk_buff *skb)
{
const struct S s = {.x = skb->len };

Expand Down
4 changes: 3 additions & 1 deletion tools/testing/selftests/bpf/progs/test_global_func13.c
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
#include <stddef.h>
#include <linux/bpf.h>
#include <bpf/bpf_helpers.h>
#include "bpf_misc.h"

struct S {
int x;
Expand All @@ -16,7 +17,8 @@ __noinline int foo(const struct S *s)
}

SEC("cgroup_skb/ingress")
int test_cls(struct __sk_buff *skb)
__failure __msg("Caller passes invalid args into func#1")
int global_func13(struct __sk_buff *skb)
{
const struct S *s = (const struct S *)(0xbedabeda);

Expand Down
4 changes: 3 additions & 1 deletion tools/testing/selftests/bpf/progs/test_global_func14.c
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
#include <stddef.h>
#include <linux/bpf.h>
#include <bpf/bpf_helpers.h>
#include "bpf_misc.h"

struct S;

Expand All @@ -14,7 +15,8 @@ __noinline int foo(const struct S *s)
}

SEC("cgroup_skb/ingress")
int test_cls(struct __sk_buff *skb)
__failure __msg("reference type('FWD S') size cannot be determined")
int global_func14(struct __sk_buff *skb)
{

return foo(NULL);
Expand Down
4 changes: 3 additions & 1 deletion tools/testing/selftests/bpf/progs/test_global_func15.c
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
#include <stddef.h>
#include <linux/bpf.h>
#include <bpf/bpf_helpers.h>
#include "bpf_misc.h"

__noinline int foo(unsigned int *v)
{
Expand All @@ -12,7 +13,8 @@ __noinline int foo(unsigned int *v)
}

SEC("cgroup_skb/ingress")
int test_cls(struct __sk_buff *skb)
__failure __msg("At program exit the register R0 has value")
int global_func15(struct __sk_buff *skb)
{
unsigned int v = 1;

Expand Down
4 changes: 3 additions & 1 deletion tools/testing/selftests/bpf/progs/test_global_func16.c
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
#include <stddef.h>
#include <linux/bpf.h>
#include <bpf/bpf_helpers.h>
#include "bpf_misc.h"

__noinline int foo(int (*arr)[10])
{
Expand All @@ -12,7 +13,8 @@ __noinline int foo(int (*arr)[10])
}

SEC("cgroup_skb/ingress")
int test_cls(struct __sk_buff *skb)
__failure __msg("invalid indirect read from stack")
int global_func16(struct __sk_buff *skb)
{
int array[10];

Expand Down
4 changes: 3 additions & 1 deletion tools/testing/selftests/bpf/progs/test_global_func17.c
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
// SPDX-License-Identifier: GPL-2.0-only
#include <vmlinux.h>
#include <bpf/bpf_helpers.h>
#include "bpf_misc.h"

__noinline int foo(int *p)
{
Expand All @@ -10,7 +11,8 @@ __noinline int foo(int *p)
const volatile int i;

SEC("tc")
int test_cls(struct __sk_buff *skb)
__failure __msg("Caller passes invalid args into func#1")
int global_func17(struct __sk_buff *skb)
{
return foo((int *)&i);
}
43 changes: 42 additions & 1 deletion tools/testing/selftests/bpf/progs/test_global_func2.c
Original file line number Diff line number Diff line change
@@ -1,4 +1,45 @@
// SPDX-License-Identifier: GPL-2.0-only
/* Copyright (c) 2020 Facebook */
#include <stddef.h>
#include <linux/bpf.h>
#include <bpf/bpf_helpers.h>
#include "bpf_misc.h"

#define MAX_STACK (512 - 3 * 32)
#include "test_global_func1.c"

static __attribute__ ((noinline))
int f0(int var, struct __sk_buff *skb)
{
return skb->len;
}

__attribute__ ((noinline))
int f1(struct __sk_buff *skb)
{
volatile char buf[MAX_STACK] = {};

return f0(0, skb) + skb->len;
}

int f3(int, struct __sk_buff *skb, int);

__attribute__ ((noinline))
int f2(int val, struct __sk_buff *skb)
{
return f1(skb) + f3(val, skb, 1);
}

__attribute__ ((noinline))
int f3(int val, struct __sk_buff *skb, int var)
{
volatile char buf[MAX_STACK] = {};

return skb->ifindex * val * var;
}

SEC("tc")
__success
int global_func2(struct __sk_buff *skb)
{
return f0(1, skb) + f1(skb) + f2(2, skb) + f3(3, skb, 4);
}
10 changes: 3 additions & 7 deletions tools/testing/selftests/bpf/progs/test_global_func3.c
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
#include <stddef.h>
#include <linux/bpf.h>
#include <bpf/bpf_helpers.h>
#include "bpf_misc.h"

__attribute__ ((noinline))
int f1(struct __sk_buff *skb)
Expand Down Expand Up @@ -46,20 +47,15 @@ int f7(struct __sk_buff *skb)
return f6(skb);
}

#ifndef NO_FN8
__attribute__ ((noinline))
int f8(struct __sk_buff *skb)
{
return f7(skb);
}
#endif

SEC("tc")
int test_cls(struct __sk_buff *skb)
__failure __msg("the call stack of 8 frames")
int global_func3(struct __sk_buff *skb)
{
#ifndef NO_FN8
return f8(skb);
#else
return f7(skb);
#endif
}
Loading

0 comments on commit 95ebb37

Please sign in to comment.