| Message ID | 20250210135129.719119-3-mykyta.yatsenko5@gmail.com (mailing list archive) |
|---|---|
| State | Superseded |
| Delegated to: | BPF |
| Headers | show |
| Series | selftests/bpf: implement setting global variables in veristat | expand |
On Mon, 2025-02-10 at 13:51 +0000, Mykyta Yatsenko wrote: [...] > +void test_veristat_set_global_vars_succeeds(void) > +{ test_progs based tests are usually organized as a hierarchy of tests and sub-tests. E.g. take a look at tools/testing/selftests/bpf/prog_tests/ksyms_btf.c: - it defines an entry point test_ksyms_btf; - and a bunch of sub-tests declared as static void functions, called from entry point; - test__start_subtest() function is used to check if sub-test has to be executed. > + char command[512]; > + struct fixture *fix = init_fixture(); > + > + snprintf(command, sizeof(command), > + "./veristat set_global_vars.bpf.o"\ > + " -G \"var_s64 = 0xf000000000000001\" "\ > + " -G \"var_u64 = 0xfedcba9876543210\" "\ > + " -G \"var_s32 = -0x80000000\" "\ > + " -G \"var_u32 = 0x76543210\" "\ > + " -G \"var_s16 = -32768\" "\ > + " -G \"var_u16 = 60652\" "\ > + " -G \"var_s8 = -128\" "\ > + " -G \"var_u8 = 255\" "\ > + " -G \"var_ea = EA2\" "\ > + " -G \"var_eb = EB2\" "\ > + " -G \"var_ec = EC2\" "\ > + " -G \"var_b = 1\" "\ > + "-vl2 > %s", fix->tmpfile); > + if (!ASSERT_EQ(0, system(command), "command")) > + goto out; Nit: there is SYS macro in test_progs.h, it combines snprintf/system/ASSERT_OK/goto. > + > + read(fix->fd, fix->output, fix->sz); Nit: check error for read() call (same read()/write() in tests below). > + ASSERT_NEQ(NULL, strstr(fix->output, "_w=0xf000000000000001 "), > + "var_s64 = 0xf000000000000001"); Nit: I'd do these checks as below: #define __CHECK_STR(str, name) \ if (!ASSERT_HAS_SUBSTR(fix->output, (str), (str))) goto out __CHECK_STR("_w=0xf000000000000001 "); ... #undef __CHECK_STR this way fix->output would be printed if sub-string is not found. For other tests I suggest using ASSERT_HAS_SUBSTR as well, as it prints the string where sub-string was looked for. > + ASSERT_NEQ(NULL, strstr(fix->output, "_w=0xfedcba9876543210 "), > + "var_u64 = 0xfedcba9876543210"); > + ASSERT_NEQ(NULL, strstr(fix->output, "_w=0x80000000 "), "var_s32 = -0x80000000"); > + ASSERT_NEQ(NULL, strstr(fix->output, "_w=0x76543210 "), "var_u32 = 0x76543210"); > + ASSERT_NEQ(NULL, strstr(fix->output, "_w=0x8000 "), "var_s16 = -32768"); > + ASSERT_NEQ(NULL, strstr(fix->output, "_w=0xecec "), "var_u16 = 60652"); > + ASSERT_NEQ(NULL, strstr(fix->output, "_w=128 "), "var_s8 = -128"); > + ASSERT_NEQ(NULL, strstr(fix->output, "_w=255 "), "var_u8 = 255"); > + ASSERT_NEQ(NULL, strstr(fix->output, "_w=11 "), "var_ea = EA2"); > + ASSERT_NEQ(NULL, strstr(fix->output, "_w=12 "), "var_eb = EB2"); > + ASSERT_NEQ(NULL, strstr(fix->output, "_w=13 "), "var_ec = EC2"); > + ASSERT_NEQ(NULL, strstr(fix->output, "_w=1 "), "var_b = 1"); > + > +out: > + teardown_fixture(fix); > +} > + > +void test_veristat_set_global_vars_from_file_succeeds(void) > +{ > + struct fixture *fix = init_fixture(); > + char command[512]; > + char input_file[80]; > + const char *vars = "var_s16 = -32768\nvar_u16 = 60652"; > + int fd; > + > + snprintf(input_file, sizeof(input_file), "/tmp/veristat_input.XXXXXX"); > + fd = mkstemp(input_file); > + if (!ASSERT_GT(fd, 0, "valid fd")) Nit: ASSERT_GE. > + goto out; > + > + write(fd, vars, strlen(vars)); > + snprintf(command, sizeof(command), > + "./veristat set_global_vars.bpf.o -G \"@%s\" -vl2 > %s", > + input_file, fix->tmpfile); > + > + ASSERT_EQ(0, system(command), "command"); > + read(fix->fd, fix->output, fix->sz); > + ASSERT_NEQ(NULL, strstr(fix->output, "_w=0x8000 "), "var_s16 = -32768"); > + ASSERT_NEQ(NULL, strstr(fix->output, "_w=0xecec "), "var_u16 = 60652"); > + > +out: > + close(fd); > + remove(input_file); > + teardown_fixture(fix); > +} [...]
On 11/02/2025 03:01, Eduard Zingerman wrote: > On Mon, 2025-02-10 at 13:51 +0000, Mykyta Yatsenko wrote: > > [...] > >> +void test_veristat_set_global_vars_succeeds(void) >> +{ > test_progs based tests are usually organized as a hierarchy of tests and sub-tests. > E.g. take a look at tools/testing/selftests/bpf/prog_tests/ksyms_btf.c: > - it defines an entry point test_ksyms_btf; > - and a bunch of sub-tests declared as static void functions, > called from entry point; > - test__start_subtest() function is used to check if sub-test has to > be executed. > >> + char command[512]; >> + struct fixture *fix = init_fixture(); >> + >> + snprintf(command, sizeof(command), >> + "./veristat set_global_vars.bpf.o"\ >> + " -G \"var_s64 = 0xf000000000000001\" "\ >> + " -G \"var_u64 = 0xfedcba9876543210\" "\ >> + " -G \"var_s32 = -0x80000000\" "\ >> + " -G \"var_u32 = 0x76543210\" "\ >> + " -G \"var_s16 = -32768\" "\ >> + " -G \"var_u16 = 60652\" "\ >> + " -G \"var_s8 = -128\" "\ >> + " -G \"var_u8 = 255\" "\ >> + " -G \"var_ea = EA2\" "\ >> + " -G \"var_eb = EB2\" "\ >> + " -G \"var_ec = EC2\" "\ >> + " -G \"var_b = 1\" "\ >> + "-vl2 > %s", fix->tmpfile); >> + if (!ASSERT_EQ(0, system(command), "command")) >> + goto out; > Nit: there is SYS macro in test_progs.h, it combines > snprintf/system/ASSERT_OK/goto. > >> + >> + read(fix->fd, fix->output, fix->sz); > Nit: check error for read() call (same read()/write() in tests below). > >> + ASSERT_NEQ(NULL, strstr(fix->output, "_w=0xf000000000000001 "), >> + "var_s64 = 0xf000000000000001"); > Nit: I'd do these checks as below: > > #define __CHECK_STR(str, name) \ > if (!ASSERT_HAS_SUBSTR(fix->output, (str), (str))) goto out > __CHECK_STR("_w=0xf000000000000001 "); > ... > #undef __CHECK_STR > > this way fix->output would be printed if sub-string is not found. > For other tests I suggest using ASSERT_HAS_SUBSTR as well, > as it prints the string where sub-string was looked for. > >> + ASSERT_NEQ(NULL, strstr(fix->output, "_w=0xfedcba9876543210 "), >> + "var_u64 = 0xfedcba9876543210"); >> + ASSERT_NEQ(NULL, strstr(fix->output, "_w=0x80000000 "), "var_s32 = -0x80000000"); >> + ASSERT_NEQ(NULL, strstr(fix->output, "_w=0x76543210 "), "var_u32 = 0x76543210"); >> + ASSERT_NEQ(NULL, strstr(fix->output, "_w=0x8000 "), "var_s16 = -32768"); >> + ASSERT_NEQ(NULL, strstr(fix->output, "_w=0xecec "), "var_u16 = 60652"); >> + ASSERT_NEQ(NULL, strstr(fix->output, "_w=128 "), "var_s8 = -128"); >> + ASSERT_NEQ(NULL, strstr(fix->output, "_w=255 "), "var_u8 = 255"); >> + ASSERT_NEQ(NULL, strstr(fix->output, "_w=11 "), "var_ea = EA2"); >> + ASSERT_NEQ(NULL, strstr(fix->output, "_w=12 "), "var_eb = EB2"); >> + ASSERT_NEQ(NULL, strstr(fix->output, "_w=13 "), "var_ec = EC2"); >> + ASSERT_NEQ(NULL, strstr(fix->output, "_w=1 "), "var_b = 1"); >> + >> +out: >> + teardown_fixture(fix); >> +} >> + >> +void test_veristat_set_global_vars_from_file_succeeds(void) >> +{ >> + struct fixture *fix = init_fixture(); >> + char command[512]; >> + char input_file[80]; >> + const char *vars = "var_s16 = -32768\nvar_u16 = 60652"; >> + int fd; >> + >> + snprintf(input_file, sizeof(input_file), "/tmp/veristat_input.XXXXXX"); >> + fd = mkstemp(input_file); >> + if (!ASSERT_GT(fd, 0, "valid fd")) > Nit: ASSERT_GE. > >> + goto out; >> + >> + write(fd, vars, strlen(vars)); >> + snprintf(command, sizeof(command), >> + "./veristat set_global_vars.bpf.o -G \"@%s\" -vl2 > %s", >> + input_file, fix->tmpfile); >> + >> + ASSERT_EQ(0, system(command), "command"); >> + read(fix->fd, fix->output, fix->sz); >> + ASSERT_NEQ(NULL, strstr(fix->output, "_w=0x8000 "), "var_s16 = -32768"); >> + ASSERT_NEQ(NULL, strstr(fix->output, "_w=0xecec "), "var_u16 = 60652"); >> + >> +out: >> + close(fd); >> + remove(input_file); >> + teardown_fixture(fix); >> +} > [...] Thanks, will update this patch accordingly. >
diff --git a/tools/testing/selftests/bpf/Makefile b/tools/testing/selftests/bpf/Makefile index 87551628e112..c300190c59ae 100644 --- a/tools/testing/selftests/bpf/Makefile +++ b/tools/testing/selftests/bpf/Makefile @@ -684,6 +684,7 @@ $(OUTPUT)/$(TRUNNER_BINARY): $(TRUNNER_TEST_OBJS) \ $(TRUNNER_EXTRA_OBJS) $$(BPFOBJ) \ $(RESOLVE_BTFIDS) \ $(TRUNNER_BPFTOOL) \ + $(OUTPUT)/veristat \ | $(TRUNNER_BINARY)-extras $$(call msg,BINARY,,$$@) $(Q)$$(CC) $$(CFLAGS) $$(filter %.a %.o,$$^) $$(LDLIBS) $$(LDFLAGS) -o $$@ diff --git a/tools/testing/selftests/bpf/prog_tests/test_veristat.c b/tools/testing/selftests/bpf/prog_tests/test_veristat.c new file mode 100644 index 000000000000..df7d0f291c7e --- /dev/null +++ b/tools/testing/selftests/bpf/prog_tests/test_veristat.c @@ -0,0 +1,122 @@ +// SPDX-License-Identifier: GPL-2.0 +/* Copyright (c) 2025 Meta Platforms, Inc. and affiliates. */ +#include <test_progs.h> +#include <string.h> +#include <stdio.h> + +struct fixture { + char tmpfile[80]; + int fd; + char *output; + size_t sz; +}; + +static struct fixture *init_fixture(void) +{ + struct fixture *fix = malloc(sizeof(struct fixture)); + + snprintf(fix->tmpfile, sizeof(fix->tmpfile), "/tmp/test_veristat.XXXXXX"); + fix->fd = mkstemp(fix->tmpfile); + fix->sz = 1000000; + fix->output = malloc(fix->sz); + return fix; +} + +static void teardown_fixture(struct fixture *fix) +{ + free(fix->output); + close(fix->fd); + remove(fix->tmpfile); + free(fix); +} + +void test_veristat_set_global_vars_succeeds(void) +{ + char command[512]; + struct fixture *fix = init_fixture(); + + snprintf(command, sizeof(command), + "./veristat set_global_vars.bpf.o"\ + " -G \"var_s64 = 0xf000000000000001\" "\ + " -G \"var_u64 = 0xfedcba9876543210\" "\ + " -G \"var_s32 = -0x80000000\" "\ + " -G \"var_u32 = 0x76543210\" "\ + " -G \"var_s16 = -32768\" "\ + " -G \"var_u16 = 60652\" "\ + " -G \"var_s8 = -128\" "\ + " -G \"var_u8 = 255\" "\ + " -G \"var_ea = EA2\" "\ + " -G \"var_eb = EB2\" "\ + " -G \"var_ec = EC2\" "\ + " -G \"var_b = 1\" "\ + "-vl2 > %s", fix->tmpfile); + if (!ASSERT_EQ(0, system(command), "command")) + goto out; + + read(fix->fd, fix->output, fix->sz); + ASSERT_NEQ(NULL, strstr(fix->output, "_w=0xf000000000000001 "), + "var_s64 = 0xf000000000000001"); + ASSERT_NEQ(NULL, strstr(fix->output, "_w=0xfedcba9876543210 "), + "var_u64 = 0xfedcba9876543210"); + ASSERT_NEQ(NULL, strstr(fix->output, "_w=0x80000000 "), "var_s32 = -0x80000000"); + ASSERT_NEQ(NULL, strstr(fix->output, "_w=0x76543210 "), "var_u32 = 0x76543210"); + ASSERT_NEQ(NULL, strstr(fix->output, "_w=0x8000 "), "var_s16 = -32768"); + ASSERT_NEQ(NULL, strstr(fix->output, "_w=0xecec "), "var_u16 = 60652"); + ASSERT_NEQ(NULL, strstr(fix->output, "_w=128 "), "var_s8 = -128"); + ASSERT_NEQ(NULL, strstr(fix->output, "_w=255 "), "var_u8 = 255"); + ASSERT_NEQ(NULL, strstr(fix->output, "_w=11 "), "var_ea = EA2"); + ASSERT_NEQ(NULL, strstr(fix->output, "_w=12 "), "var_eb = EB2"); + ASSERT_NEQ(NULL, strstr(fix->output, "_w=13 "), "var_ec = EC2"); + ASSERT_NEQ(NULL, strstr(fix->output, "_w=1 "), "var_b = 1"); + +out: + teardown_fixture(fix); +} + +void test_veristat_set_global_vars_from_file_succeeds(void) +{ + struct fixture *fix = init_fixture(); + char command[512]; + char input_file[80]; + const char *vars = "var_s16 = -32768\nvar_u16 = 60652"; + int fd; + + snprintf(input_file, sizeof(input_file), "/tmp/veristat_input.XXXXXX"); + fd = mkstemp(input_file); + if (!ASSERT_GT(fd, 0, "valid fd")) + goto out; + + write(fd, vars, strlen(vars)); + snprintf(command, sizeof(command), + "./veristat set_global_vars.bpf.o -G \"@%s\" -vl2 > %s", + input_file, fix->tmpfile); + + ASSERT_EQ(0, system(command), "command"); + read(fix->fd, fix->output, fix->sz); + ASSERT_NEQ(NULL, strstr(fix->output, "_w=0x8000 "), "var_s16 = -32768"); + ASSERT_NEQ(NULL, strstr(fix->output, "_w=0xecec "), "var_u16 = 60652"); + +out: + close(fd); + remove(input_file); + teardown_fixture(fix); +} + +void test_veristat_set_global_vars_out_of_range(void) +{ + struct fixture *fix = init_fixture(); + char command[512]; + + snprintf(command, sizeof(command), + "./veristat set_global_vars.bpf.o -G \"var_s32 = 2147483648\" -vl2 2> %s", + fix->tmpfile); + + if (!ASSERT_NEQ(0, system(command), "command")) + goto out; + + read(fix->fd, fix->output, fix->sz); + ASSERT_NEQ(NULL, strstr(fix->output, "is out of range [-2147483648; 2147483647]"), + "out of range"); +out: + teardown_fixture(fix); +} diff --git a/tools/testing/selftests/bpf/progs/set_global_vars.c b/tools/testing/selftests/bpf/progs/set_global_vars.c new file mode 100644 index 000000000000..9adb5ba4cd4d --- /dev/null +++ b/tools/testing/selftests/bpf/progs/set_global_vars.c @@ -0,0 +1,47 @@ +// SPDX-License-Identifier: GPL-2.0 +/* Copyright (c) 2025 Meta Platforms, Inc. and affiliates. */ +#include "bpf_experimental.h" +#include <bpf/bpf_helpers.h> +#include "bpf_misc.h" +#include <stdbool.h> + +char _license[] SEC("license") = "GPL"; + +enum Enum { EA1 = 0, EA2 = 11 }; +enum Enumu64 {EB1 = 0llu, EB2 = 12llu }; +enum Enums64 { EC1 = 0ll, EC2 = 13ll }; + +const volatile __s64 var_s64 = -1; +const volatile __u64 var_u64 = 0; +const volatile __s32 var_s32 = -1; +const volatile __u32 var_u32 = 0; +const volatile __s16 var_s16 = -1; +const volatile __u16 var_u16 = 0; +const volatile __s8 var_s8 = -1; +const volatile __u8 var_u8 = 0; +const volatile enum Enum var_ea = EA1; +const volatile enum Enumu64 var_eb = EB1; +const volatile enum Enums64 var_ec = EC1; +const volatile bool var_b = false; + +char arr[4] = {0}; + +SEC("socket") +int test_set_globals(void *ctx) +{ + volatile __s8 a; + + a = var_s64; + a = var_u64; + a = var_s32; + a = var_u32; + a = var_s16; + a = var_u16; + a = var_s8; + a = var_u8; + a = var_ea; + a = var_eb; + a = var_ec; + a = var_b; + return a; +}