selftests/bpf: switch test_progs back to stdio
Subsystems (6)
v4 cover selftests/bpf: switch test_progs back to stdio
I was looking into converting test_sockops* to test_progs framework and that requires using cgroup_helpers.c which rely on stdio/stderr. Let's use open_memstream to override stdout into buffer during subtests instead of custom test_{v,}printf wrappers. That lets us continue to use stdio in the subtests and dump it on failure if required.
That would also fix bpf_find_map which currently uses printf to signal failure (missed during test_printf conversion).
Stanislav Fomichev (3):
selftests/bpf: test_progs: switch to open_memstream selftests/bpf: test_progs: test__printf -> printf selftests/bpf: test_progs: drop extra trailing tab
.../bpf/prog_tests/bpf_verif_scale.c | 4 +- .../selftests/bpf/prog_tests/l4lb_all.c | 2 +- .../selftests/bpf/prog_tests/map_lock.c | 10 +- .../selftests/bpf/prog_tests/send_signal.c | 4 +- .../selftests/bpf/prog_tests/spinlock.c | 2 +- .../bpf/prog_tests/stacktrace_build_id.c | 4 +- .../bpf/prog_tests/stacktrace_build_id_nmi.c | 4 +- .../selftests/bpf/prog_tests/xdp_noinline.c | 4 +- tools/testing/selftests/bpf/test_progs.c | 131 ++++++++---------- tools/testing/selftests/bpf/test_progs.h | 13 +- 10 files changed, 84 insertions(+), 94 deletions(-)
Signature · 1 line
2.22.0.770.g0f2c4a37fd-goog
PATCH v4 1/3 selftests/bpf: test_progs: switch to open_memstream
Use open_memstream to override stdout during test execution. The copy of the original stdout is held in env.stdout and used to print subtest info and dump failed log.
test_{v,}printf are now simple wrappers around stdout and will be removed in the next patch.
v4:
* one field per line for stdout/stderr (Andrii Nakryiko)
v3:
* don't do strlen over log_buf, log_cnt has it already (Andrii Nakryiko)
v2:
* add ifdef __GLIBC__ around open_memstream (maybe pointless since we already depend on glibc for argp_parse)
* hijack stderr as well (Andrii Nakryiko)
* don't hijack for every test, do it once (Andrii Nakryiko)
* log_cap -> log_size (Andrii Nakryiko)
* do fseeko in a proper place (Andrii Nakryiko)
* check open_memstream returned value (Andrii Nakryiko)
--- tools/testing/selftests/bpf/test_progs.c | 115 ++++++++++++----------- tools/testing/selftests/bpf/test_progs.h | 3 +- 2 files changed, 62 insertions(+), 56 deletions(-)
tools/testing/selftests/bpf/test_progs.c +60 -55
@@ -40,14 +40,20 @@ static bool should_run(struct test_selector *sel, int num, const char *name)static void dump_test_log (const struct prog_test_def *test,bool failed) { +if (stdout == env.stdout) +return ; + +fflush (stdout);/* exports env.log_buf & env.log_cnt */ +if (env.verbose || test->force_log || failed) {if (env.log_cnt) { -fprintf (stdout,"%s" , env.log_buf); +fprintf (env.stdout,"%s" , env.log_buf);if (env.log_buf[env.log_cnt -1 ] !='\n' ) -fprintf (stdout,"\n" ); +fprintf (env.stdout,"\n" ); } } - env.log_cnt =0 ; + +fseeko (stdout,0 ,SEEK_SET );/* rewind */ }void test__end_subtest ()
@@ -62,7 +68,7 @@ void test__end_subtest()dump_test_log (test, sub_error_cnt); -printf ("#%d/%d %s:%s\n" , +fprintf (env.stdout,"#%d/%d %s:%s\n" , test->test_num, test->subtest_num, test->subtest_name, sub_error_cnt ?"FAIL" :"OK" ); }
@@ -79,7 +85,8 @@ bool test__start_subtest(const char *name) test->subtest_num++;if (!name || !name[0 ]) { -fprintf (stderr,"Subtest #%d didn't provide sub-test name!\n" , +fprintf (env.stderr, +"Subtest #%d didn't provide sub-test name!\n" , test->subtest_num);return false; }
@@ -100,53 +107,7 @@ void test__force_log() {void test__vprintf (const char *fmt,va_list args) { -size_t rem_sz; -int ret =0 ; - -if (env.verbose || (env.test && env.test->force_log)) { -vfprintf (stderr, fmt, args); -return ; - } - -try_again: - rem_sz = env.log_cap - env.log_cnt; -if (rem_sz) { -va_list ap; - -va_copy (ap, args); -/* we reserved extra byte for \0 at the end */ - ret =vsnprintf (env.log_buf + env.log_cnt, rem_sz +1 , fmt, ap); -va_end (ap); - -if (ret <0 ) { - env.log_buf[env.log_cnt] ='\0' ; -fprintf (stderr,"failed to log w/ fmt '%s'\n" , fmt); -return ; - } - } - -if (!rem_sz || ret > rem_sz) { -size_t new_sz = env.log_cap *3 /2 ; -char *new_buf; - -if (new_sz <4096 ) - new_sz =4096 ; -if (new_sz < ret + env.log_cnt) - new_sz = ret + env.log_cnt; - -/* +1 for guaranteed space for terminating \0 */ - new_buf =realloc (env.log_buf, new_sz +1 ); -if (!new_buf) { -fprintf (stderr,"failed to realloc log buffer: %d\n" , - errno); -return ; - } - env.log_buf = new_buf; - env.log_cap = new_sz; - goto try_again; - } - - env.log_cnt += ret; +vprintf (fmt, args); }void test__printf (const char *fmt, ...)
@@ -477,6 +438,48 @@ static error_t parse_arg(int key, char *arg, struct argp_state *state)return 0 ; } +static void stdio_hijack (void ) +{ +#ifdef __GLIBC__ +if (env.verbose || (env.test && env.test->force_log)) { +/* nothing to do, output to stdout by default */ +return ; + } + +/* stdout and stderr -> buffer */ +fflush (stdout); + + env.stdout = stdout; + env.stderr = stderr; + + stdout =open_memstream (&env.log_buf, &env.log_cnt); +if (!stdout) { + stdout = env.stdout; +perror ("open_memstream" ); +return ; + } + + stderr = stdout; +#endif +} + +static void stdio_restore (void ) +{ +#ifdef __GLIBC__ +if (stdout == env.stdout) +return ; + +fclose (stdout); +free (env.log_buf); + + env.log_buf =NULL ; + env.log_cnt =0 ; + + stdout = env.stdout; + stderr = env.stderr; +#endif +} +int main (int argc,char **argv) {static const struct argp argp = {
@@ -496,6 +499,7 @@ int main(int argc, char **argv) env.jit_enabled =is_jit_enabled (); +stdio_hijack ();for (i =0 ; i < prog_test_cnt; i++) {struct prog_test_def *test = &prog_test_defs[i];int old_pass_cnt = pass_cnt;
@@ -523,13 +527,14 @@ int main(int argc, char **argv)dump_test_log (test, test->error_cnt); -printf ("#%d %s:%s\n" , test->test_num, test->test_name, - test->error_cnt ?"FAIL" :"OK" ); +fprintf (env.stdout,"#%d %s:%s\n" , + test->test_num, test->test_name, + test->error_cnt ?"FAIL" :"OK" ); } +stdio_restore ();printf ("Summary: %d/%d PASSED, %d FAILED\n" , env.succ_cnt, env.sub_succ_cnt, env.fail_cnt); -free (env.log_buf);free (env.test_selector.num_set);free (env.subtest_selector.num_set);
tools/testing/selftests/bpf/test_progs.h +2 -1
@@ -56,9 +56,10 @@ struct test_env {bool jit_enabled;struct prog_test_def *test; +FILE *stdout; +FILE *stderr;char *log_buf;size_t log_cnt; -size_t log_cap;int succ_cnt;/* successful tests */ int sub_succ_cnt;/* successful sub-tests */
Signature · 1 line
2.22.0.770.g0f2c4a37fd-goog
Re: [PATCH bpf-next v4 1/3] selftests/bpf: test_progs: switch to open_memstream
Quoted 134 lines · Stanislav Fomichev
Use
open_memstreamto override stdout during test execution. The copy of the original stdout is held in env.stdout and used to print subtest info and dump failed log.test_{v,}printf are now simple wrappers around stdout and will be removed in the next patch.
v4:
* one field per line for stdout/stderr (Andrii Nakryiko)v3:
* don't do strlen overlog_buf,log_cnthas it already (Andrii Nakryiko)v2:
* add ifdef__GLIBC__aroundopen_memstream(maybe pointless since we already depend on glibc forargp_parse)
* hijack stderr as well (Andrii Nakryiko)
* don't hijack for every test, do it once (Andrii Nakryiko)
*log_cap->log_size(Andrii Nakryiko)
* do fseeko in a proper place (Andrii Nakryiko)
* checkopen_memstreamreturned value (Andrii Nakryiko)Cc Andrii Nakryiko <[email protected]>Acked-by Andrii Nakryiko <[email protected]>Signed-off-by Stanislav Fomichev <[email protected]>--- tools/testing/selftests/bpf/test_progs.c | 115 ++++++++++++----------- tools/testing/selftests/bpf/test_progs.h | 3 +- 2 files changed, 62 insertions(+), 56 deletions(-)tools/testing/selftests/bpf/test_progs.c +13
-52@@ -40,14 +40,20 @@ static bool should_run(struct test_selector *sel, int num, const char *name)static void dump_test_log (const struct prog_test_def *test,bool failed) { +if (stdout == env.stdout) +return ; + +fflush (stdout);/* exports env.log_buf & env.log_cnt */ +if (env.verbose || test->force_log || failed) {if (env.log_cnt) { -fprintf (stdout,"%s" , env.log_buf); +fprintf (env.stdout,"%s" , env.log_buf);if (env.log_buf[env.log_cnt -1 ] !='\n' ) -fprintf (stdout,"\n" ); +fprintf (env.stdout,"\n" ); } } - env.log_cnt =0 ; + +fseeko (stdout,0 ,SEEK_SET );/* rewind */ }void test__end_subtest ()@@ -62,7 +68,7 @@ void test__end_subtest()dump_test_log (test, sub_error_cnt); -printf ("#%d/%d %s:%s\n" , +fprintf (env.stdout,"#%d/%d %s:%s\n" , test->test_num, test->subtest_num, test->subtest_name, sub_error_cnt ?"FAIL" :"OK" ); }@@ -79,7 +85,8 @@ bool test__start_subtest(const char *name) test->subtest_num++;if (!name || !name[0 ]) { -fprintf (stderr,"Subtest #%d didn't provide sub-test name!\n" , +fprintf (env.stderr, +"Subtest #%d didn't provide sub-test name!\n" , test->subtest_num);return false; }@@ -100,53 +107,7 @@ void test__force_log() {void test__vprintf (const char *fmt,va_list args) { -size_t rem_sz; -int ret =0 ; - -if (env.verbose || (env.test && env.test->force_log)) { -vfprintf (stderr, fmt, args); -return ; - } - -try_again: - rem_sz = env.log_cap - env.log_cnt; -if (rem_sz) { -va_list ap; - -va_copy (ap, args); -/* we reserved extra byte for \0 at the end */ - ret =vsnprintf (env.log_buf + env.log_cnt, rem_sz +1 , fmt, ap); -va_end (ap); - -if (ret <0 ) { - env.log_buf[env.log_cnt] ='\0' ; -fprintf (stderr,"failed to log w/ fmt '%s'\n" , fmt); -return ; - } - } - -if (!rem_sz || ret > rem_sz) { -size_t new_sz = env.log_cap *3 /2 ; -char *new_buf; - -if (new_sz <4096 ) - new_sz =4096 ; -if (new_sz < ret + env.log_cnt) - new_sz = ret + env.log_cnt; - -/* +1 for guaranteed space for terminating \0 */ - new_buf =realloc (env.log_buf, new_sz +1 ); -if (!new_buf) { -fprintf (stderr,"failed to realloc log buffer: %d\n" , - errno); -return ; - } - env.log_buf = new_buf; - env.log_cap = new_sz; - goto try_again; - } - - env.log_cnt += ret; +vprintf (fmt, args); }void test__printf (const char *fmt, ...)
tools/testing/selftests/bpf/test_progs.c static error_t parse_arg(int key, char *arg, struct argp_state *state) · line 444
Quoted 7 lines
tools/testing/selftests/bpf/test_progs.c +4
-0@@ -477,6 +438,48 @@ static error_t parse_arg(int key, char *arg, struct argp_state *state)return 0 ; } +static void stdio_hijack (void ) +{ +#ifdef __GLIBC__ +if (env.verbose || (env.test && env.test->force_log)) {
I just also realized that you don't need (env.test && env.test->force_log) test. We hijack stdout/stderr before env.test is even set, so this does nothing anyways. Plus, force_log can be set in the middle of test/sub-test, yet we hijack stdout just once (or even if per-test), so it's still going to be "racy". Let's buffer output (unless it's env.verbose, which is important to not buffer because some tests will have huge output, when failing, so this allows to bypass using tons of memory for those, when debugging) and dump at the end.
Quoted 86 lines
tools/testing/selftests/bpf/test_progs.c +43
-3+/* nothing to do, output to stdout by default */ + return; + } + +/* stdout and stderr -> buffer */ +fflush (stdout); + + env.stdout = stdout; + env.stderr = stderr; + + stdout =open_memstream (&env.log_buf, &env.log_cnt); +if (!stdout) { + stdout = env.stdout; +perror ("open_memstream" ); +return ; + } + + stderr = stdout; +#endif +} + +static void stdio_restore (void ) +{ +#ifdef __GLIBC__ +if (stdout == env.stdout) +return ; + +fclose (stdout); +free (env.log_buf); + + env.log_buf =NULL ; + env.log_cnt =0 ; + + stdout = env.stdout; + stderr = env.stderr; +#endif +} +int main (int argc,char **argv) {static const struct argp argp = {@@ -496,6 +499,7 @@ int main(int argc, char **argv) env.jit_enabled =is_jit_enabled (); +stdio_hijack ();for (i =0 ; i < prog_test_cnt; i++) {struct prog_test_def *test = &prog_test_defs[i];int old_pass_cnt = pass_cnt;@@ -523,13 +527,14 @@ int main(int argc, char **argv)dump_test_log (test, test->error_cnt); -printf ("#%d %s:%s\n" , test->test_num, test->test_name, - test->error_cnt ?"FAIL" :"OK" ); +fprintf (env.stdout,"#%d %s:%s\n" , + test->test_num, test->test_name, + test->error_cnt ?"FAIL" :"OK" ); } +stdio_restore ();printf ("Summary: %d/%d PASSED, %d FAILED\n" , env.succ_cnt, env.sub_succ_cnt, env.fail_cnt); -free (env.log_buf);free (env.test_selector.num_set);free (env.subtest_selector.num_set);tools/testing/selftests/bpf/test_progs.h +2
-2@@ -56,9 +56,10 @@ struct test_env {bool jit_enabled;struct prog_test_def *test; +FILE *stdout; +FILE *stderr;char *log_buf;size_t log_cnt; -size_t log_cap;int succ_cnt;/* successful tests */ int sub_succ_cnt;/* successful sub-tests */ --2.22.0.770.g0f2c4a37fd-goog
Stanislav Fomichev
reviewerRe: [PATCH bpf-next v4 1/3] selftests/bpf: test_progs: switch to open_memstream
Quoted 138 lines · Andrii Nakryiko
Quoted 137 lines · Stanislav Fomichev
Use
open_memstreamto override stdout during test execution. The copy of the original stdout is held in env.stdout and used to print subtest info and dump failed log.test_{v,}printf are now simple wrappers around stdout and will be removed in the next patch.
v4:
* one field per line for stdout/stderr (Andrii Nakryiko)v3:
* don't do strlen overlog_buf,log_cnthas it already (Andrii Nakryiko)v2:
* add ifdef__GLIBC__aroundopen_memstream(maybe pointless since we already depend on glibc forargp_parse)
* hijack stderr as well (Andrii Nakryiko)
* don't hijack for every test, do it once (Andrii Nakryiko)
*log_cap->log_size(Andrii Nakryiko)
* do fseeko in a proper place (Andrii Nakryiko)
* checkopen_memstreamreturned value (Andrii Nakryiko)Cc Andrii Nakryiko <[email protected]>Acked-by Andrii Nakryiko <[email protected]>Signed-off-by Stanislav Fomichev <[email protected]>--- tools/testing/selftests/bpf/test_progs.c | 115 ++++++++++++----------- tools/testing/selftests/bpf/test_progs.h | 3 +- 2 files changed, 62 insertions(+), 56 deletions(-)tools/testing/selftests/bpf/test_progs.c +13
-52@@ -40,14 +40,20 @@ static bool should_run(struct test_selector *sel, int num, const char *name)static void dump_test_log (const struct prog_test_def *test,bool failed) { +if (stdout == env.stdout) +return ; + +fflush (stdout);/* exports env.log_buf & env.log_cnt */ +if (env.verbose || test->force_log || failed) {if (env.log_cnt) { -fprintf (stdout,"%s" , env.log_buf); +fprintf (env.stdout,"%s" , env.log_buf);if (env.log_buf[env.log_cnt -1 ] !='\n' ) -fprintf (stdout,"\n" ); +fprintf (env.stdout,"\n" ); } } - env.log_cnt =0 ; + +fseeko (stdout,0 ,SEEK_SET );/* rewind */ }void test__end_subtest ()@@ -62,7 +68,7 @@ void test__end_subtest()dump_test_log (test, sub_error_cnt); -printf ("#%d/%d %s:%s\n" , +fprintf (env.stdout,"#%d/%d %s:%s\n" , test->test_num, test->subtest_num, test->subtest_name, sub_error_cnt ?"FAIL" :"OK" ); }@@ -79,7 +85,8 @@ bool test__start_subtest(const char *name) test->subtest_num++;if (!name || !name[0 ]) { -fprintf (stderr,"Subtest #%d didn't provide sub-test name!\n" , +fprintf (env.stderr, +"Subtest #%d didn't provide sub-test name!\n" , test->subtest_num);return false; }@@ -100,53 +107,7 @@ void test__force_log() {void test__vprintf (const char *fmt,va_list args) { -size_t rem_sz; -int ret =0 ; - -if (env.verbose || (env.test && env.test->force_log)) { -vfprintf (stderr, fmt, args); -return ; - } - -try_again: - rem_sz = env.log_cap - env.log_cnt; -if (rem_sz) { -va_list ap; - -va_copy (ap, args); -/* we reserved extra byte for \0 at the end */ - ret =vsnprintf (env.log_buf + env.log_cnt, rem_sz +1 , fmt, ap); -va_end (ap); - -if (ret <0 ) { - env.log_buf[env.log_cnt] ='\0' ; -fprintf (stderr,"failed to log w/ fmt '%s'\n" , fmt); -return ; - } - } - -if (!rem_sz || ret > rem_sz) { -size_t new_sz = env.log_cap *3 /2 ; -char *new_buf; - -if (new_sz <4096 ) - new_sz =4096 ; -if (new_sz < ret + env.log_cnt) - new_sz = ret + env.log_cnt; - -/* +1 for guaranteed space for terminating \0 */ - new_buf =realloc (env.log_buf, new_sz +1 ); -if (!new_buf) { -fprintf (stderr,"failed to realloc log buffer: %d\n" , - errno); -return ; - } - env.log_buf = new_buf; - env.log_cap = new_sz; - goto try_again; - } - - env.log_cnt += ret; +vprintf (fmt, args); }void test__printf (const char *fmt, ...)@@ -477,6 +438,48 @@ static error_t parse_arg(int key, char *arg, struct argp_state *state)return 0 ; }
Quoted 14 lines
tools/testing/selftests/bpf/test_progs.c static error_t parse_arg(int key, char *arg, struct argp_state *state) · line 444
Quoted 4 lines
tools/testing/selftests/bpf/test_progs.c +4
-0+static void stdio_hijack (void ) +{ +#ifdef __GLIBC__ +if (env.verbose || (env.test && env.test->force_log)) {I just also realized that you don't need
(env.test && env.test->force_log)test. We hijack stdout/stderr before env.test is even set, so this does nothing anyways. Plus,force_logcan be set in the middle of test/sub-test, yet we hijack stdout just once (or even if per-test), so it's still going to be "racy". Let's buffer output (unless it's env.verbose, which is important to not buffer because some tests will have huge output, when failing, so this allows to bypass using tons of memory for those, when debugging) and dump at the end.
Makes sense, will drop this test and resubmit along with a fix for '-v' that Alexei discovered. Thanks!
Quoted 86 lines
Quoted 86 lines
tools/testing/selftests/bpf/test_progs.c +43
-3+/* nothing to do, output to stdout by default */ + return; + } + +/* stdout and stderr -> buffer */ +fflush (stdout); + + env.stdout = stdout; + env.stderr = stderr; + + stdout =open_memstream (&env.log_buf, &env.log_cnt); +if (!stdout) { + stdout = env.stdout; +perror ("open_memstream" ); +return ; + } + + stderr = stdout; +#endif +} + +static void stdio_restore (void ) +{ +#ifdef __GLIBC__ +if (stdout == env.stdout) +return ; + +fclose (stdout); +free (env.log_buf); + + env.log_buf =NULL ; + env.log_cnt =0 ; + + stdout = env.stdout; + stderr = env.stderr; +#endif +} +int main (int argc,char **argv) {static const struct argp argp = {@@ -496,6 +499,7 @@ int main(int argc, char **argv) env.jit_enabled =is_jit_enabled (); +stdio_hijack ();for (i =0 ; i < prog_test_cnt; i++) {struct prog_test_def *test = &prog_test_defs[i];int old_pass_cnt = pass_cnt;@@ -523,13 +527,14 @@ int main(int argc, char **argv)dump_test_log (test, test->error_cnt); -printf ("#%d %s:%s\n" , test->test_num, test->test_name, - test->error_cnt ?"FAIL" :"OK" ); +fprintf (env.stdout,"#%d %s:%s\n" , + test->test_num, test->test_name, + test->error_cnt ?"FAIL" :"OK" ); } +stdio_restore ();printf ("Summary: %d/%d PASSED, %d FAILED\n" , env.succ_cnt, env.sub_succ_cnt, env.fail_cnt); -free (env.log_buf);free (env.test_selector.num_set);free (env.subtest_selector.num_set);tools/testing/selftests/bpf/test_progs.h +2
-2@@ -56,9 +56,10 @@ struct test_env {bool jit_enabled;struct prog_test_def *test; +FILE *stdout; +FILE *stderr;char *log_buf;size_t log_cnt; -size_t log_cap;int succ_cnt;/* successful tests */ int sub_succ_cnt;/* successful sub-tests */ --2.22.0.770.g0f2c4a37fd-goog
Re: [PATCH bpf-next v4 1/3] selftests/bpf: test_progs: switch to open_memstream
Quoted 34 lines · Stanislav Fomichev
Quoted 32 lines · Andrii Nakryiko
Quoted 31 lines · Stanislav Fomichev
Use
open_memstreamto override stdout during test execution. The copy of the original stdout is held in env.stdout and used to print subtest info and dump failed log.test_{v,}printf are now simple wrappers around stdout and will be removed in the next patch.
v4:
* one field per line for stdout/stderr (Andrii Nakryiko)v3:
* don't do strlen overlog_buf,log_cnthas it already (Andrii Nakryiko)v2:
* add ifdef__GLIBC__aroundopen_memstream(maybe pointless since we already depend on glibc forargp_parse)
* hijack stderr as well (Andrii Nakryiko)
* don't hijack for every test, do it once (Andrii Nakryiko)
*log_cap->log_size(Andrii Nakryiko)
* do fseeko in a proper place (Andrii Nakryiko)
* checkopen_memstreamreturned value (Andrii Nakryiko)Cc Andrii Nakryiko <[email protected]>Acked-by Andrii Nakryiko <[email protected]>Signed-off-by Stanislav Fomichev <[email protected]>--- tools/testing/selftests/bpf/test_progs.c | 115 ++++++++++++----------- tools/testing/selftests/bpf/test_progs.h | 3 +- 2 files changed, 62 insertions(+), 56 deletions(-)
[...]
Quoted 19 lines
Quoted 5 lines
Quoted 5 lines
void
test__printf(const char *fmt, ...)tools/testing/selftests/bpf/test_progs.c +0
-0@@ -477,6 +438,48 @@ static error_t parse_arg(int key, char *arg, struct argp_state *state)return 0 ; }Quoted 14 lines
tools/testing/selftests/bpf/test_progs.c static error_t parse_arg(int key, char *arg, struct argp_state *state) · line 444
Quoted 4 lines
tools/testing/selftests/bpf/test_progs.c +4
-0+static void stdio_hijack (void ) +{ +#ifdef __GLIBC__ +if (env.verbose || (env.test && env.test->force_log)) {I just also realized that you don't need
(env.test && env.test->force_log)test. We hijack stdout/stderr before env.test is even set, so this does nothing anyways. Plus,force_logcan be set in the middle of test/sub-test, yet we hijack stdout just once (or even if per-test), so it's still going to be "racy". Let's buffer output (unless it's env.verbose, which is important to not buffer because some tests will have huge output, when failing, so this allows to bypass using tons of memory for those, when debugging) and dump at the end.
Quoted 2 lines
Makes sense, will drop this test and resubmit along with a fix for '-v' that Alexei discovered. Thanks!
Oh, is it because env.stdout and env.stderr is not set in verbose mode? I'd always set env.stdout/env.stderr at the beginning, next to env.jit_enabled, to never care about "logging modes".
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
tools/testing/selftests/bpf/test_progs.c +4
-0+/* nothing to do, output to stdout by default */ +return ; + } +
[...]
Stanislav Fomichev
reviewerRe: [PATCH bpf-next v4 1/3] selftests/bpf: test_progs: switch to open_memstream
Quoted 57 lines · Andrii Nakryiko
Quoted 34 lines · Stanislav Fomichev
Quoted 32 lines · Andrii Nakryiko
Quoted 31 lines · Stanislav Fomichev
Use
open_memstreamto override stdout during test execution. The copy of the original stdout is held in env.stdout and used to print subtest info and dump failed log.test_{v,}printf are now simple wrappers around stdout and will be removed in the next patch.
v4:
* one field per line for stdout/stderr (Andrii Nakryiko)v3:
* don't do strlen overlog_buf,log_cnthas it already (Andrii Nakryiko)v2:
* add ifdef__GLIBC__aroundopen_memstream(maybe pointless since we already depend on glibc forargp_parse)
* hijack stderr as well (Andrii Nakryiko)
* don't hijack for every test, do it once (Andrii Nakryiko)
*log_cap->log_size(Andrii Nakryiko)
* do fseeko in a proper place (Andrii Nakryiko)
* checkopen_memstreamreturned value (Andrii Nakryiko)Cc Andrii Nakryiko <[email protected]>Acked-by Andrii Nakryiko <[email protected]>Signed-off-by Stanislav Fomichev <[email protected]>--- tools/testing/selftests/bpf/test_progs.c | 115 ++++++++++++----------- tools/testing/selftests/bpf/test_progs.h | 3 +- 2 files changed, 62 insertions(+), 56 deletions(-)[...]
Quoted 19 lines
Quoted 19 lines
tools/testing/selftests/bpf/test_progs.c static error_t parse_arg(int key, char *arg, struct argp_state *state) · line 444
Quoted 9 lines
void
test__printf(const char *fmt, ...)tools/testing/selftests/bpf/test_progs.c +4
-0@@ -477,6 +438,48 @@ static error_t parse_arg(int key, char *arg, struct argp_state *state)return 0 ; } +static void stdio_hijack (void ) +{ +#ifdef __GLIBC__ +if (env.verbose || (env.test && env.test->force_log)) {I just also realized that you don't need
(env.test && env.test->force_log)test. We hijack stdout/stderr before env.test is even set, so this does nothing anyways. Plus,force_logcan be set in the middle of test/sub-test, yet we hijack stdout just once (or even if per-test), so it's still going to be "racy". Let's buffer output (unless it's env.verbose, which is important to not buffer because some tests will have huge output, when failing, so this allows to bypass using tons of memory for those, when debugging) and dump at the end.
Quoted 6 lines
Quoted 2 lines
Makes sense, will drop this test and resubmit along with a fix for '-v' that Alexei discovered. Thanks!
Oh, is it because env.stdout and env.stderr is not set in verbose mode? I'd always set env.stdout/env.stderr at the beginning, next to env.jit_enabled, to never care about "logging modes".
Yeah, I moved it to the beginning of stdio_hijack() to mirror the 'undo' in stdio_restore(). Let me know if you feel strongly about it and want it to be near env.jit_enabled instead.
Quoted 6 lines
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
tools/testing/selftests/bpf/test_progs.c +4
-0+/* nothing to do, output to stdout by default */ +return ; + } +[...]
Re: [PATCH bpf-next v4 1/3] selftests/bpf: test_progs: switch to open_memstream
Quoted 62 lines · Stanislav Fomichev
Quoted 60 lines · Andrii Nakryiko
Quoted 34 lines · Stanislav Fomichev
Quoted 32 lines · Andrii Nakryiko
Quoted 31 lines · Stanislav Fomichev
Use
open_memstreamto override stdout during test execution. The copy of the original stdout is held in env.stdout and used to print subtest info and dump failed log.test_{v,}printf are now simple wrappers around stdout and will be removed in the next patch.
v4:
* one field per line for stdout/stderr (Andrii Nakryiko)v3:
* don't do strlen overlog_buf,log_cnthas it already (Andrii Nakryiko)v2:
* add ifdef__GLIBC__aroundopen_memstream(maybe pointless since we already depend on glibc forargp_parse)
* hijack stderr as well (Andrii Nakryiko)
* don't hijack for every test, do it once (Andrii Nakryiko)
*log_cap->log_size(Andrii Nakryiko)
* do fseeko in a proper place (Andrii Nakryiko)
* checkopen_memstreamreturned value (Andrii Nakryiko)Cc Andrii Nakryiko <[email protected]>Acked-by Andrii Nakryiko <[email protected]>Signed-off-by Stanislav Fomichev <[email protected]>--- tools/testing/selftests/bpf/test_progs.c | 115 ++++++++++++----------- tools/testing/selftests/bpf/test_progs.h | 3 +- 2 files changed, 62 insertions(+), 56 deletions(-)[...]
Quoted 21 lines
Quoted 5 lines
Quoted 5 lines
void
test__printf(const char *fmt, ...)tools/testing/selftests/bpf/test_progs.c +0
-0@@ -477,6 +438,48 @@ static error_t parse_arg(int key, char *arg, struct argp_state *state)return 0 ; }Quoted 14 lines
tools/testing/selftests/bpf/test_progs.c static error_t parse_arg(int key, char *arg, struct argp_state *state) · line 444
Quoted 4 lines
tools/testing/selftests/bpf/test_progs.c +4
-0+static void stdio_hijack (void ) +{ +#ifdef __GLIBC__ +if (env.verbose || (env.test && env.test->force_log)) {I just also realized that you don't need
(env.test && env.test->force_log)test. We hijack stdout/stderr before env.test is even set, so this does nothing anyways. Plus,force_logcan be set in the middle of test/sub-test, yet we hijack stdout just once (or even if per-test), so it's still going to be "racy". Let's buffer output (unless it's env.verbose, which is important to not buffer because some tests will have huge output, when failing, so this allows to bypass using tons of memory for those, when debugging) and dump at the end.Makes sense, will drop this test and resubmit along with a fix for '-v' that Alexei discovered. Thanks!
Quoted 6 lines
Quoted 3 lines
Oh, is it because env.stdout and env.stderr is not set in verbose mode? I'd always set env.stdout/env.stderr at the beginning, next to env.jit_enabled, to never care about "logging modes".
Yeah, I moved it to the beginning of
stdio_hijack()to mirror the 'undo' instdio_restore(). Let me know if you feel strongly about it and want it to be near env.jit_enabled instead.
I'm fine with it, no big deal, I wrote email before I saw your v5.
Quoted 7 lines
Quoted 7 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
tools/testing/selftests/bpf/test_progs.c +4
-0+/* nothing to do, output to stdout by default */ +return ; + } +[...]
PATCH v4 2/3 selftests/bpf: test_progs: test__printf -> printf
In reply to Stanislav FomichevNow that test__printf is a simple wraper around printf, let's drop it (and test__vprintf as well).
--- .../selftests/bpf/prog_tests/bpf_verif_scale.c | 4 ++-- .../testing/selftests/bpf/prog_tests/l4lb_all.c | 2 +- .../testing/selftests/bpf/prog_tests/map_lock.c | 10 +++++----- .../selftests/bpf/prog_tests/send_signal.c | 4 ++-- .../testing/selftests/bpf/prog_tests/spinlock.c | 2 +- .../bpf/prog_tests/stacktrace_build_id.c | 4 ++-- .../bpf/prog_tests/stacktrace_build_id_nmi.c | 4 ++-- .../selftests/bpf/prog_tests/xdp_noinline.c | 4 ++-- tools/testing/selftests/bpf/test_progs.c | 16 +--------------- tools/testing/selftests/bpf/test_progs.h | 10 ++++------ 10 files changed, 22 insertions(+), 38 deletions(-)
tools/testing/selftests/bpf/prog_tests/bpf_verif_scale.c +2 -2
@@ -5,13 +5,13 @@ static int libbpf_debug_print(enum libbpf_print_level level, const char *format, va_list args) { if (level != LIBBPF_DEBUG) { -test__vprintf (format ,args ); +vprintf (format ,args );return 0 ; }if (!strstr (format,"verifier log" ))return 0 ; -test__vprintf ("%s" , args); +vprintf ("%s" , args);return 0 ; }
tools/testing/selftests/bpf/prog_tests/l4lb_all.c +1 -1
@@ -74,7 +74,7 @@ static void test_l4lb(const char *file) }if (bytes !=MAGIC_BYTES *NUM_ITER *2 || pkts !=NUM_ITER *2 ) { error_cnt++; -test__printf ("test_l4lb:FAIL:stats %lld %lld\n" , bytes, pkts); +printf ("test_l4lb:FAIL:stats %lld %lld\n" , bytes, pkts); } out:bpf_object__close (obj);
tools/testing/selftests/bpf/prog_tests/map_lock.c +5 -5
@@ -9,12 +9,12 @@ static void *parallel_map_access(void *arg)for (i =0 ; i <10000 ; i++) { err =bpf_map_lookup_elem_flags (map_fd, &key, vars,BPF_F_LOCK );if (err) { -test__printf ("lookup failed\n" ); +printf ("lookup failed\n" ); error_cnt++; goto out; }if (vars[0 ] !=0 ) { -test__printf ("lookup #%d var[0]=%d\n" , i, vars[0 ]); +printf ("lookup #%d var[0]=%d\n" , i, vars[0 ]); error_cnt++; goto out; }
@@ -22,8 +22,8 @@ static void *parallel_map_access(void *arg)for (j =2 ; j <17 ; j++) {if (vars[j] == rnd)continue ; -test__printf ("lookup #%d var[1]=%d var[%d]=%d\n" , - i, rnd, j, vars[j]); +printf ("lookup #%d var[1]=%d var[%d]=%d\n" , + i, rnd, j, vars[j]); error_cnt++; goto out; }
@@ -43,7 +43,7 @@ void test_map_lock(void) err =bpf_prog_load (file,BPF_PROG_TYPE_CGROUP_SKB , &obj, &prog_fd);if (err) { -test__printf ("test_map_lock:bpf_prog_load errno %d\n" , errno); +printf ("test_map_lock:bpf_prog_load errno %d\n" , errno); goto close_prog; } map_fd[0 ] =bpf_find_map (__func__, obj,"hash_map" );
tools/testing/selftests/bpf/prog_tests/send_signal.c +2 -2
@@ -202,8 +202,8 @@ static int test_send_signal_nmi(void) -1 /* cpu */, -1 /* group_fd */, 0 /* flags */);if (pmu_fd ==-1 ) {if (errno ==ENOENT ) { -test__printf ("%s:SKIP:no PERF_COUNT_HW_CPU_CYCLES\n" , - __func__); +printf ("%s:SKIP:no PERF_COUNT_HW_CPU_CYCLES\n" , + __func__);return 0 ; }/* Let the test fail with a more informative message */
tools/testing/selftests/bpf/prog_tests/spinlock.c +1 -1
@@ -12,7 +12,7 @@ void test_spinlock(void) err =bpf_prog_load (file,BPF_PROG_TYPE_CGROUP_SKB , &obj, &prog_fd);if (err) { -test__printf ("test_spin_lock:bpf_prog_load errno %d\n" , errno); +printf ("test_spin_lock:bpf_prog_load errno %d\n" , errno); goto close_prog; }for (i =0 ; i <4 ; i++)
tools/testing/selftests/bpf/prog_tests/stacktrace_build_id.c +2 -2
@@ -109,8 +109,8 @@ void test_stacktrace_build_id(void)if (build_id_matches <1 && retry--) {bpf_link__destroy (link);bpf_object__close (obj); -test__printf ("%s:WARN:Didn't find expected build ID from the map, retrying\n" , - __func__); +printf ("%s:WARN:Didn't find expected build ID from the map, retrying\n" , + __func__); goto retry; }
tools/testing/selftests/bpf/prog_tests/stacktrace_build_id_nmi.c +2 -2
@@ -140,8 +140,8 @@ void test_stacktrace_build_id_nmi(void)if (build_id_matches <1 && retry--) {bpf_link__destroy (link);bpf_object__close (obj); -test__printf ("%s:WARN:Didn't find expected build ID from the map, retrying\n" , - __func__); +printf ("%s:WARN:Didn't find expected build ID from the map, retrying\n" , + __func__); goto retry; }
tools/testing/selftests/bpf/prog_tests/xdp_noinline.c +2 -2
@@ -75,8 +75,8 @@ void test_xdp_noinline(void) }if (bytes !=MAGIC_BYTES *NUM_ITER *2 || pkts !=NUM_ITER *2 ) { error_cnt++; -test__printf ("test_xdp_noinline:FAIL:stats %lld %lld\n" , - bytes, pkts); +printf ("test_xdp_noinline:FAIL:stats %lld %lld\n" , + bytes, pkts); } out:bpf_object__close (obj);
tools/testing/selftests/bpf/test_progs.c +1 -15
@@ -105,20 +105,6 @@ void test__force_log() { env.test->force_log = true; } -void test__vprintf (const char *fmt,va_list args) -{ -vprintf (fmt, args); -} - -void test__printf (const char *fmt, ...) -{ -va_list args; - -va_start (args, fmt); -test__vprintf (fmt, args); -va_end (args); -} -struct ipv4_packet pkt_v4 = { .eth.h_proto =__bpf_constant_htons (ETH_P_IP ), .iph.ihl =5 ,
@@ -310,7 +296,7 @@ static int libbpf_print_fn(enum libbpf_print_level level, {if (!env.very_verbose && level ==LIBBPF_DEBUG )return 0 ; -test__vprintf (format, args); +vprintf (format, args);return 0 ; }
tools/testing/selftests/bpf/test_progs.h +4 -6
@@ -70,8 +70,6 @@ extern int error_cnt;extern int pass_cnt;extern struct test_env env; -extern void test__printf (const char *fmt, ...); -extern void test__vprintf (const char *fmt,va_list args);extern void test__force_log ();extern bool test__start_subtest (const char *name);
@@ -97,12 +95,12 @@ extern struct ipv6_packet pkt_v6;int __ret = !!(condition); \if (__ret) { \ error_cnt++; \ -test__printf ("%s:FAIL:%s " , __func__, tag); \ -test__printf (format); \ +printf ("%s:FAIL:%s " , __func__, tag); \ +printf (format); \ }else { \ pass_cnt++; \ -test__printf ("%s:PASS:%s %d nsec\n" , \ - __func__, tag, duration); \ +printf ("%s:PASS:%s %d nsec\n" , \ + __func__, tag, duration); \ } \ __ret; \ })
Signature · 1 line
2.22.0.770.g0f2c4a37fd-goog
PATCH v4 3/3 selftests/bpf: test_progs: drop extra trailing tab
In reply to Stanislav FomichevSmall (un)related cleanup.
--- tools/testing/selftests/bpf/test_progs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/testing/selftests/bpf/test_progs.c +1 -1
@@ -278,7 +278,7 @@ enum ARG_KEYS {ARG_VERIFIER_STATS ='s' , ARG_VERBOSE = 'v', }; - +static const struct argp_option opts[] = { {"num" ,ARG_TEST_NUM ,"NUM" ,0 , "Run test number NUM only " },
Signature · 1 line
2.22.0.770.g0f2c4a37fd-goog
Quoted 8 lines · Stanislav Fomichev
I was looking into converting test_sockops* to
test_progsframework and that requires usingcgroup_helpers.cwhich rely on stdio/stderr. Let's useopen_memstreamto override stdout into buffer during subtests instead of custom test_{v,}printf wrappers. That lets us continue to use stdio in the subtests and dump it on failure if required.
Quoted 4 lines
That would also fix
bpf_find_mapwhich currently uses printf to signal failure (missed duringtest_printfconversion).Cc Andrii Nakryiko <[email protected]>
sadly test_progs -v now segfaults.
pls fix and resubmit.