selftests: kselftest.h: mark functions with 'noreturn'
Subsystems (6)
PATCH v2 1/1 selftests: kselftest.h: mark functions with 'noreturn'
When building kselftests/capabilities the following warning shows up:
clang -O2 -g -std=gnu99 -Wall test_execve.c -lcap-ng -lrt -ldl -o test_execve
test_execve.c:121:13: warning: variable 'have_outer_privilege' is used uninitialized whenever 'if' condition is false [-Wsometimes-uninitialized]
} else if (unshare(CLONE_NEWUSER | CLONE_NEWNS) == 0) {
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
test_execve.c:136:9: note: uninitialized use occurs here
return have_outer_privilege;
^~~~~~~~~~~~~~~~~~~~
test_execve.c:121:9: note: remove the 'if' if its condition is always true
} else if (unshare(CLONE_NEWUSER | CLONE_NEWNS) == 0) {
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
test_execve.c:94:27: note: initialize the variable 'have_outer_privilege' to silence this warning
bool have_outer_privilege;
^
= falseRework so all the ksft_exit_*() functions have attribue '__attribute__((noreturn))' so the compiler knows that there wont be any return from the function. That said, without '__attribute__((noreturn))' the compiler warns about the above issue since it thinks that it will get back from the ksft_exit_skip() function, which it wont.
Cleaning up the callers that rely on ksft_exit_*() return code, since the functions ksft_exit_*() have never returned anything.
--- tools/testing/selftests/clone3/clone3.c | 4 +++- .../testing/selftests/clone3/clone3_clear_sighand.c | 2 +- tools/testing/selftests/clone3/clone3_set_tid.c | 4 +++- tools/testing/selftests/ipc/msgque.c | 10 +++++----- tools/testing/selftests/kcmp/kcmp_test.c | 2 +- tools/testing/selftests/kselftest.h | 12 ++++++------ .../membarrier/membarrier_test_multi_thread.c | 2 +- .../membarrier/membarrier_test_single_thread.c | 2 +- tools/testing/selftests/pidfd/pidfd_fdinfo_test.c | 2 +- tools/testing/selftests/pidfd/pidfd_open_test.c | 4 +++- tools/testing/selftests/pidfd/pidfd_poll_test.c | 2 +- tools/testing/selftests/pidfd/pidfd_test.c | 2 +- tools/testing/selftests/resctrl/resctrl_tests.c | 6 +++--- tools/testing/selftests/sync/sync_test.c | 2 +- tools/testing/selftests/timers/adjtick.c | 4 ++-- tools/testing/selftests/timers/alarmtimer-suspend.c | 4 ++-- tools/testing/selftests/timers/change_skew.c | 4 ++-- tools/testing/selftests/timers/clocksource-switch.c | 4 ++-- tools/testing/selftests/timers/freq-step.c | 4 ++-- tools/testing/selftests/timers/inconsistency-check.c | 4 ++-- tools/testing/selftests/timers/leap-a-day.c | 10 +++++----- tools/testing/selftests/timers/leapcrash.c | 4 ++-- tools/testing/selftests/timers/mqueue-lat.c | 4 ++-- tools/testing/selftests/timers/nanosleep.c | 4 ++-- tools/testing/selftests/timers/nsleep-lat.c | 4 ++-- tools/testing/selftests/timers/posix_timers.c | 12 ++++++------ tools/testing/selftests/timers/raw_skew.c | 6 +++--- tools/testing/selftests/timers/set-2038.c | 4 ++-- tools/testing/selftests/timers/set-tai.c | 4 ++-- tools/testing/selftests/timers/set-timer-lat.c | 4 ++-- tools/testing/selftests/timers/set-tz.c | 4 ++-- tools/testing/selftests/timers/skew_consistency.c | 4 ++-- tools/testing/selftests/timers/threadtest.c | 2 +- tools/testing/selftests/timers/valid-adjtimex.c | 6 +++--- tools/testing/selftests/vm/madv_populate.c | 2 +- 35 files changed, 80 insertions(+), 74 deletions(-)
tools/testing/selftests/clone3/clone3.c +3 -1
@@ -191,5 +191,7 @@ int main(int argc, char *argv[])test_clone3 (CLONE_NEWPID ,getpagesize () +8 , -E2BIG ,CLONE3_ARGS_NO_TEST ); -return !ksft_get_fail_cnt () ?ksft_exit_pass () :ksft_exit_fail (); +if (ksft_get_fail_cnt ()) +ksft_exit_fail (); +ksft_exit_pass (); }
tools/testing/selftests/clone3/clone3_clear_sighand.c +1 -1
@@ -124,5 +124,5 @@ int main(int argc, char **argv)test_clone3_clear_sighand (); -return ksft_exit_pass (); +ksft_exit_pass (); }
tools/testing/selftests/clone3/clone3_set_tid.c +3 -1
@@ -393,5 +393,7 @@ int main(int argc, char *argv[]) out: ret =0 ; -return !ret ?ksft_exit_pass () :ksft_exit_fail (); +if (ret) +ksft_exit_fail (); +ksft_exit_pass (); }
tools/testing/selftests/ipc/msgque.c +5 -5
@@ -198,13 +198,13 @@ int main(int argc, char **argv)struct msgque_data msgque;if (getuid () !=0 ) -return ksft_exit_skip ( +ksft_exit_skip ("Please run the test as root - Exiting.\n" ); msgque.key =ftok (argv[0 ],822155650 );if (msgque.key ==-1 ) {printf ("Can't make key: %d\n" , -errno); -return ksft_exit_fail (); +ksft_exit_fail (); } msgque.msq_id =msgget (msgque.key,IPC_CREAT |IPC_EXCL |0666 );
@@ -243,13 +243,13 @@ int main(int argc, char **argv)printf ("Failed to test queue: %d\n" , err); goto err_out; } -return ksft_exit_pass (); +ksft_exit_pass (); err_destroy:if (msgctl (msgque.msq_id,IPC_RMID ,NULL )) {printf ("Failed to destroy queue: %d\n" , -errno); -return ksft_exit_fail (); +ksft_exit_fail (); } err_out: -return ksft_exit_fail (); +ksft_exit_fail (); }
tools/testing/selftests/kcmp/kcmp_test.c +1 -1
@@ -162,5 +162,5 @@ int main(int argc, char **argv)waitpid (pid2, &status,P_ALL ); -return ksft_exit_pass (); +ksft_exit_pass (); }
tools/testing/selftests/kselftest.h +6 -6
@@ -207,13 +207,13 @@ static inline void ksft_test_result_error(const char *msg, ...)va_end (args); } -static inline int ksft_exit_pass (void ) +static inline void __attribute__((noreturn))ksft_exit_pass (void ) {ksft_print_cnts ();exit (KSFT_PASS ); } -static inline int ksft_exit_fail (void ) +static inline void __attribute__((noreturn))ksft_exit_fail (void ) {ksft_print_cnts ();exit (KSFT_FAIL );
@@ -231,7 +231,7 @@ static inline int ksft_exit_fail(void)ksft_exit_fail (); \ }while (0 ) -static inline int ksft_exit_fail_msg(const char *msg, ...) +static inline void __attribute__((noreturn)) ksft_exit_fail_msg(const char *msg, ...) {int saved_errno = errno;va_list args;
@@ -246,19 +246,19 @@ static inline int ksft_exit_fail_msg(const char *msg, ...)exit (KSFT_FAIL ); } -static inline int ksft_exit_xfail (void ) +static inline void __attribute__((noreturn))ksft_exit_xfail (void ) {ksft_print_cnts ();exit (KSFT_XFAIL ); } -static inline int ksft_exit_xpass (void ) +static inline void __attribute__((noreturn))ksft_exit_xpass (void ) {ksft_print_cnts ();exit (KSFT_XPASS ); } -static inline int ksft_exit_skip (const char *msg, ...) +static inline void __attribute__((noreturn))ksft_exit_skip (const char *msg, ...) {int saved_errno = errno;va_list args;
tools/testing/selftests/membarrier/membarrier_test_multi_thread.c +1 -1
@@ -69,5 +69,5 @@ int main(int argc, char **argv)/* Multi-threaded */ test_mt_membarrier (); -return ksft_exit_pass (); +ksft_exit_pass (); }
tools/testing/selftests/membarrier/membarrier_test_single_thread.c +1 -1
@@ -20,5 +20,5 @@ int main(int argc, char **argv)test_membarrier_success (); -return ksft_exit_pass (); +ksft_exit_pass (); }
tools/testing/selftests/pidfd/pidfd_fdinfo_test.c +1 -1
@@ -292,5 +292,5 @@ int main(int argc, char **argv)test_pidfd_fdinfo_nspid ();test_pidfd_dead_fdinfo (); -return ksft_exit_pass (); +ksft_exit_pass (); }
tools/testing/selftests/pidfd/pidfd_open_test.c +3 -1
@@ -159,5 +159,7 @@ int main(int argc, char **argv)if (pidfd >=0 )close (pidfd); -return !ret ?ksft_exit_pass () :ksft_exit_fail (); +if (ret) +ksft_exit_fail (); +ksft_exit_pass (); }
tools/testing/selftests/pidfd/pidfd_poll_test.c +1 -1
@@ -112,5 +112,5 @@ int main(int argc, char **argv) }ksft_test_result_pass ("pidfd poll test: pass\n" ); -return ksft_exit_pass (); +ksft_exit_pass (); }
tools/testing/selftests/pidfd/pidfd_test.c +1 -1
@@ -569,5 +569,5 @@ int main(int argc, char **argv)test_pidfd_send_signal_exited_fail ();test_pidfd_send_signal_recycled_pid_fail (); -return ksft_exit_pass (); +ksft_exit_pass (); }
tools/testing/selftests/resctrl/resctrl_tests.c +3 -3
@@ -205,7 +205,7 @@ int main(int argc, char **argv)* 2. We execute perf commands */ if (geteuid () !=0 ) -return ksft_exit_fail_msg ("Not running as root, abort testing.\n" ); +ksft_exit_fail_msg ("Not running as root, abort testing.\n" );/* Detect AMD vendor */ detect_amd ();
@@ -235,7 +235,7 @@ int main(int argc, char **argv)sprintf (bm_type,"fill_buf" );if (!check_resctrlfs_support ()) -return ksft_exit_fail_msg ("resctrl FS does not exist\n" ); +ksft_exit_fail_msg ("resctrl FS does not exist\n" );filter_dmesg ();
@@ -255,5 +255,5 @@ int main(int argc, char **argv)umount_resctrlfs (); -return ksft_exit_pass (); +ksft_exit_pass (); }
tools/testing/selftests/sync/sync_test.c +1 -1
@@ -110,5 +110,5 @@ int main(void) err, ksft_test_num());/* need this return to keep gcc happy */ -return ksft_exit_pass (); +ksft_exit_pass (); }
tools/testing/selftests/timers/adjtick.c +2 -2
@@ -205,7 +205,7 @@ int main(int argv, char **argc)adjtimex (&tx1);if (err) -return ksft_exit_fail (); +ksft_exit_fail (); -return ksft_exit_pass (); +ksft_exit_pass (); }
tools/testing/selftests/timers/alarmtimer-suspend.c +2 -2
@@ -173,6 +173,6 @@ int main(void)timer_delete (tm1); }if (final_ret) -return ksft_exit_fail (); -return ksft_exit_pass (); +ksft_exit_fail (); +ksft_exit_pass (); }
tools/testing/selftests/timers/change_skew.c +2 -2
@@ -89,8 +89,8 @@ int main(int argv, char **argc)if (ret) {printf ("[FAIL]" ); -return ksft_exit_fail (); +ksft_exit_fail (); }printf ("[OK]" ); -return ksft_exit_pass (); +ksft_exit_pass (); }
tools/testing/selftests/timers/clocksource-switch.c +2 -2
@@ -163,6 +163,6 @@ int main(int argv, char **argc)change_clocksource (orig_clk);if (status) -return ksft_exit_fail (); -return ksft_exit_pass (); +ksft_exit_fail (); +ksft_exit_pass (); }
tools/testing/selftests/timers/freq-step.c +2 -2
@@ -257,7 +257,7 @@ int main(int argc, char **argv)set_frequency (0.0 );if (fails) -return ksft_exit_fail (); +ksft_exit_fail (); -return ksft_exit_pass (); +ksft_exit_pass (); }
tools/testing/selftests/timers/inconsistency-check.c +2 -2
@@ -186,8 +186,8 @@ int main(int argc, char *argv[])if (!clock_gettime (clockid, &ts)) {printf ("Consistent %-30s " ,clockstring (clockid));if (consistency_test (clockid, runtime)) -return ksft_exit_fail (); +ksft_exit_fail (); } } -return ksft_exit_pass (); +ksft_exit_pass (); }
tools/testing/selftests/timers/leap-a-day.c +5 -5
@@ -268,7 +268,7 @@ int main(int argc, char **argv)if (ret <0 ) {printf ("Error: Problem setting STA_INS/STA_DEL!: %s\n" ,time_state_str (ret)); -return ksft_exit_fail (); +ksft_exit_fail (); }/* Validate STA_INS was set */
@@ -277,7 +277,7 @@ int main(int argc, char **argv)if (tx.status !=STA_INS && tx.status !=STA_DEL ) {printf ("Error: STA_INS/STA_DEL not set!: %s\n" ,time_state_str (ret)); -return ksft_exit_fail (); +ksft_exit_fail (); }if (tai_time) {
@@ -295,7 +295,7 @@ int main(int argc, char **argv) se.sigev_value.sival_int =0 ;if (timer_create (CLOCK_REALTIME , &se, &tm1) ==-1 ) {printf ("Error: timer_create failed\n" ); -return ksft_exit_fail (); +ksft_exit_fail (); } its1.it_value.tv_sec = next_leap; its1.it_value.tv_nsec =0 ;
@@ -366,7 +366,7 @@ int main(int argc, char **argv)if (error_found) {printf ("Errors observed\n" );clear_time_state (); -return ksft_exit_fail (); +ksft_exit_fail (); }printf ("\n" );if ((iterations !=-1 ) && !(--iterations))
@@ -374,5 +374,5 @@ int main(int argc, char **argv) }clear_time_state (); -return ksft_exit_pass (); +ksft_exit_pass (); }
tools/testing/selftests/timers/leapcrash.c +2 -2
@@ -87,7 +87,7 @@ int main(void) tv.tv_usec =0 ;if (settimeofday (&tv,NULL )) {printf ("Error: You're likely not running with proper (ie: root) permissions\n" ); -return ksft_exit_fail (); +ksft_exit_fail (); } tx.modes =0 ;adjtimex (&tx);
@@ -104,5 +104,5 @@ int main(void)fflush (stdout); }printf ("[OK]\n" ); -return ksft_exit_pass (); +ksft_exit_pass (); }
tools/testing/selftests/timers/mqueue-lat.c +2 -2
@@ -107,8 +107,8 @@ int main(int argc, char **argv) ret =mqueue_lat_test ();if (ret <0 ) {printf ("[FAILED]\n" ); -return ksft_exit_fail (); +ksft_exit_fail (); }printf ("[OK]\n" ); -return ksft_exit_pass (); +ksft_exit_pass (); }
tools/testing/selftests/timers/nanosleep.c +2 -2
@@ -153,7 +153,7 @@ int main(int argc, char **argv) }if (ret <0 ) {printf ("[FAILED]\n" ); -return ksft_exit_fail (); +ksft_exit_fail (); } length *=100 ; }
@@ -161,5 +161,5 @@ int main(int argc, char **argv) next: ret =0 ; } -return ksft_exit_pass (); +ksft_exit_pass (); }
tools/testing/selftests/timers/nsleep-lat.c +2 -2
@@ -172,9 +172,9 @@ int main(int argc, char **argv) }if (ret <0 ) {printf ("[FAILED]\n" ); -return ksft_exit_fail (); +ksft_exit_fail (); }printf ("[OK]\n" ); } -return ksft_exit_pass (); +ksft_exit_pass (); }
tools/testing/selftests/timers/posix_timers.c +6 -6
@@ -194,16 +194,16 @@ int main(int argc, char **argv)printf ("based timers if other threads run on the CPU...\n" );if (check_itimer (ITIMER_VIRTUAL ) <0 ) -return ksft_exit_fail (); +ksft_exit_fail ();if (check_itimer (ITIMER_PROF ) <0 ) -return ksft_exit_fail (); +ksft_exit_fail ();if (check_itimer (ITIMER_REAL ) <0 ) -return ksft_exit_fail (); +ksft_exit_fail ();if (check_timer_create (CLOCK_THREAD_CPUTIME_ID ) <0 ) -return ksft_exit_fail (); +ksft_exit_fail ();/* * It's unfortunately hard to reliably test a timer expiration
@@ -215,7 +215,7 @@ int main(int argc, char **argv)* find a better solution. */ if (check_timer_create (CLOCK_PROCESS_CPUTIME_ID ) <0 ) -return ksft_exit_fail (); +ksft_exit_fail (); -return ksft_exit_pass (); +ksft_exit_pass (); }
tools/testing/selftests/timers/raw_skew.c +3 -3
@@ -138,11 +138,11 @@ int main(int argv, char **argc)if (tx1.offset || tx2.offset || tx1.freq != tx2.freq || tx1.tick != tx2.tick) {printf (" [SKIP]\n" ); -return ksft_exit_skip ("The clock was adjusted externally. Shutdown NTPd or other time sync daemons\n" ); +ksft_exit_skip ("The clock was adjusted externally. Shutdown NTPd or other time sync daemons\n" ); }printf (" [FAILED]\n" ); -return ksft_exit_fail (); +ksft_exit_fail (); }printf (" [OK]\n" ); -return ksft_exit_pass (); +ksft_exit_pass (); }
tools/testing/selftests/timers/set-2038.c +2 -2
@@ -128,6 +128,6 @@ int main(int argc, char *argv[])/* restore clock */ settime (start);if (ret) -return ksft_exit_fail (); -return ksft_exit_pass (); +ksft_exit_fail (); +ksft_exit_pass (); }
tools/testing/selftests/timers/set-tai.c +2 -2
@@ -61,9 +61,9 @@ int main(int argc, char **argv) ret =get_tai ();if (ret != i) {printf ("[FAILED] expected: %i got %i\n" , i, ret); -return ksft_exit_fail (); +ksft_exit_fail (); } }printf ("[OK]\n" ); -return ksft_exit_pass (); +ksft_exit_pass (); }
tools/testing/selftests/timers/set-timer-lat.c +2 -2
@@ -278,6 +278,6 @@ int main(void) ret |=do_timer_oneshot (clock_id,0 ); }if (ret) -return ksft_exit_fail (); -return ksft_exit_pass (); +ksft_exit_fail (); +ksft_exit_pass (); }
tools/testing/selftests/timers/set-tz.c +2 -2
@@ -102,9 +102,9 @@ int main(int argc, char **argv)printf ("[OK]\n" );set_tz (min, dst); -return ksft_exit_pass (); +ksft_exit_pass (); err:set_tz (min, dst); -return ksft_exit_fail (); +ksft_exit_fail (); }
tools/testing/selftests/timers/skew_consistency.c +2 -2
@@ -70,8 +70,8 @@ int main(int argv, char **argc)if (ret) {printf ("[FAILED]\n" ); -return ksft_exit_fail (); +ksft_exit_fail (); }printf ("[OK]\n" ); -return ksft_exit_pass (); +ksft_exit_pass (); }
tools/testing/selftests/timers/threadtest.c +1 -1
@@ -189,5 +189,5 @@ int main(int argc, char **argv)/* die */ if (ret)ksft_exit_fail (); -return ksft_exit_pass (); +ksft_exit_pass (); }
tools/testing/selftests/timers/valid-adjtimex.c +3 -3
@@ -321,10 +321,10 @@ int validate_set_offset(void)int main (int argc,char **argv) {if (validate_freq ()) -return ksft_exit_fail (); +ksft_exit_fail ();if (validate_set_offset ()) -return ksft_exit_fail (); +ksft_exit_fail (); -return ksft_exit_pass (); +ksft_exit_pass (); }
tools/testing/selftests/vm/madv_populate.c +1 -1
@@ -325,5 +325,5 @@ int main(int argc, char **argv)if (err)ksft_exit_fail_msg ("%d out of %d tests failed\n" , err,ksft_test_num ()); -return ksft_exit_pass (); +ksft_exit_pass (); }
Signature · 1 line
2.33.0
Quoted 95 lines · Anders Roxell
When building kselftests/capabilities the following warning shows up:
clang -O2 -g -std=gnu99 -Wall
test_execve.c-lcap-ng -lrt -ldl -otest_execve
test_execve.c:121:13: warning: variable 'have_outer_privilege' is used uninitialized whenever 'if' condition is false [-Wsometimes-uninitialized]} else if (unshare(CLONE_NEWUSER | CLONE_NEWNS) == 0) { ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ test_execve.c:136:9: note: uninitialized use occurs here return have_outer_privilege; ^~~~~~~~~~~~~~~~~~~~ test_execve.c:121:9: note: remove the 'if' if its condition is always true } else if (unshare(CLONE_NEWUSER | CLONE_NEWNS) == 0) { ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ test_execve.c:94:27: note: initialize the variable 'have_outer_privilege' to silence this warning bool have_outer_privilege; ^ = falseRework so all the ksft_exit_*() functions have attribue '__attribute__((noreturn))' so the compiler knows that there wont be any return from the function. That said, without '__attribute__((noreturn))' the compiler warns about the above issue since it thinks that it will get back from the
ksft_exit_skip()function, which it wont.
Cleaning up the callers that rely on ksft_exit_*() return code, since the functions ksft_exit_*() have never returned anything.Signed-off-by Anders Roxell <[email protected]>--- tools/testing/selftests/clone3/clone3.c | 4 +++- .../testing/selftests/clone3/clone3_clear_sighand.c | 2 +- tools/testing/selftests/clone3/clone3_set_tid.c | 4 +++- tools/testing/selftests/ipc/msgque.c | 10 +++++----- tools/testing/selftests/kcmp/kcmp_test.c | 2 +- tools/testing/selftests/kselftest.h | 12 ++++++------ .../membarrier/membarrier_test_multi_thread.c | 2 +- .../membarrier/membarrier_test_single_thread.c | 2 +- tools/testing/selftests/pidfd/pidfd_fdinfo_test.c | 2 +- tools/testing/selftests/pidfd/pidfd_open_test.c | 4 +++- tools/testing/selftests/pidfd/pidfd_poll_test.c | 2 +- tools/testing/selftests/pidfd/pidfd_test.c | 2 +- tools/testing/selftests/resctrl/resctrl_tests.c | 6 +++--- tools/testing/selftests/sync/sync_test.c | 2 +- tools/testing/selftests/timers/adjtick.c | 4 ++-- tools/testing/selftests/timers/alarmtimer-suspend.c | 4 ++-- tools/testing/selftests/timers/change_skew.c | 4 ++-- tools/testing/selftests/timers/clocksource-switch.c | 4 ++-- tools/testing/selftests/timers/freq-step.c | 4 ++-- tools/testing/selftests/timers/inconsistency-check.c | 4 ++-- tools/testing/selftests/timers/leap-a-day.c | 10 +++++----- tools/testing/selftests/timers/leapcrash.c | 4 ++-- tools/testing/selftests/timers/mqueue-lat.c | 4 ++-- tools/testing/selftests/timers/nanosleep.c | 4 ++-- tools/testing/selftests/timers/nsleep-lat.c | 4 ++-- tools/testing/selftests/timers/posix_timers.c | 12 ++++++------ tools/testing/selftests/timers/raw_skew.c | 6 +++--- tools/testing/selftests/timers/set-2038.c | 4 ++-- tools/testing/selftests/timers/set-tai.c | 4 ++-- tools/testing/selftests/timers/set-timer-lat.c | 4 ++-- tools/testing/selftests/timers/set-tz.c | 4 ++-- tools/testing/selftests/timers/skew_consistency.c | 4 ++-- tools/testing/selftests/timers/threadtest.c | 2 +- tools/testing/selftests/timers/valid-adjtimex.c | 6 +++--- tools/testing/selftests/vm/madv_populate.c | 2 +- 35 files changed, 80 insertions(+), 74 deletions(-)tools/testing/selftests/clone3/clone3.c +3
-1@@ -191,5 +191,7 @@ int main(int argc, char *argv[])test_clone3 (CLONE_NEWPID ,getpagesize () +8 , -E2BIG ,CLONE3_ARGS_NO_TEST ); -return !ksft_get_fail_cnt () ?ksft_exit_pass () :ksft_exit_fail (); +if (ksft_get_fail_cnt ()) +ksft_exit_fail (); +ksft_exit_pass (); }tools/testing/selftests/clone3/clone3_clear_sighand.c +1
-1@@ -124,5 +124,5 @@ int main(int argc, char **argv)test_clone3_clear_sighand (); -return ksft_exit_pass (); +ksft_exit_pass (); }tools/testing/selftests/clone3/clone3_set_tid.c +0
-0
tools/testing/selftests/clone3/clone3_set_tid.c int main(int argc, char *argv[]) · line 398
Quoted 7 lines
tools/testing/selftests/clone3/clone3_set_tid.c +3
-1@@ -393,5 +393,7 @@ int main(int argc, char *argv[]) out: ret =0 ; -return !ret ?ksft_exit_pass () :ksft_exit_fail (); +if (ret) +ksft_exit_fail (); +ksft_exit_pass ();
This case is weird (pre-existing-ly) and looks broken. The assignment to ret should probably occur _before_ the out: label. Honestly, I'd remove the use of goto from this function and just call either ksft_exit_pass() or ksft_exit_fail(). Rest of the patch looks good. Thanks for sending. (I did not check that this is every case of return ksft_exit_{pass|fail};).
Quoted 581 lines
tools/testing/selftests/clone3/clone3_set_tid.c +0
-0}tools/testing/selftests/ipc/msgque.c +5
-5@@ -198,13 +198,13 @@ int main(int argc, char **argv)struct msgque_data msgque;if (getuid () !=0 ) -return ksft_exit_skip ( +ksft_exit_skip ("Please run the test as root - Exiting.\n" ); msgque.key =ftok (argv[0 ],822155650 );if (msgque.key ==-1 ) {printf ("Can't make key: %d\n" , -errno); -return ksft_exit_fail (); +ksft_exit_fail (); } msgque.msq_id =msgget (msgque.key,IPC_CREAT |IPC_EXCL |0666 );@@ -243,13 +243,13 @@ int main(int argc, char **argv)printf ("Failed to test queue: %d\n" , err); goto err_out; } -return ksft_exit_pass (); +ksft_exit_pass (); err_destroy:if (msgctl (msgque.msq_id,IPC_RMID ,NULL )) {printf ("Failed to destroy queue: %d\n" , -errno); -return ksft_exit_fail (); +ksft_exit_fail (); } err_out: -return ksft_exit_fail (); +ksft_exit_fail (); }tools/testing/selftests/kcmp/kcmp_test.c +1
-1@@ -162,5 +162,5 @@ int main(int argc, char **argv)waitpid (pid2, &status,P_ALL ); -return ksft_exit_pass (); +ksft_exit_pass (); }tools/testing/selftests/kselftest.h +6
-6@@ -207,13 +207,13 @@ static inline void ksft_test_result_error(const char *msg, ...)va_end (args); } -static inline int ksft_exit_pass (void ) +static inline void __attribute__((noreturn))ksft_exit_pass (void ) {ksft_print_cnts ();exit (KSFT_PASS ); } -static inline int ksft_exit_fail (void ) +static inline void __attribute__((noreturn))ksft_exit_fail (void ) {ksft_print_cnts ();exit (KSFT_FAIL );@@ -231,7 +231,7 @@ static inline int ksft_exit_fail(void)ksft_exit_fail (); \ }while (0 ) -static inline int ksft_exit_fail_msg(const char *msg, ...) +static inline void __attribute__((noreturn)) ksft_exit_fail_msg(const char *msg, ...) {int saved_errno = errno;va_list args;@@ -246,19 +246,19 @@ static inline int ksft_exit_fail_msg(const char *msg, ...)exit (KSFT_FAIL ); } -static inline int ksft_exit_xfail (void ) +static inline void __attribute__((noreturn))ksft_exit_xfail (void ) {ksft_print_cnts ();exit (KSFT_XFAIL ); } -static inline int ksft_exit_xpass (void ) +static inline void __attribute__((noreturn))ksft_exit_xpass (void ) {ksft_print_cnts ();exit (KSFT_XPASS ); } -static inline int ksft_exit_skip (const char *msg, ...) +static inline void __attribute__((noreturn))ksft_exit_skip (const char *msg, ...) {int saved_errno = errno;va_list args;tools/testing/selftests/membarrier/membarrier_test_multi_thread.c +1
-1@@ -69,5 +69,5 @@ int main(int argc, char **argv)/* Multi-threaded */ test_mt_membarrier (); -return ksft_exit_pass (); +ksft_exit_pass (); }tools/testing/selftests/membarrier/membarrier_test_single_thread.c +1
-1@@ -20,5 +20,5 @@ int main(int argc, char **argv)test_membarrier_success (); -return ksft_exit_pass (); +ksft_exit_pass (); }tools/testing/selftests/pidfd/pidfd_fdinfo_test.c +1
-1@@ -292,5 +292,5 @@ int main(int argc, char **argv)test_pidfd_fdinfo_nspid ();test_pidfd_dead_fdinfo (); -return ksft_exit_pass (); +ksft_exit_pass (); }tools/testing/selftests/pidfd/pidfd_open_test.c +3
-1@@ -159,5 +159,7 @@ int main(int argc, char **argv)if (pidfd >=0 )close (pidfd); -return !ret ?ksft_exit_pass () :ksft_exit_fail (); +if (ret) +ksft_exit_fail (); +ksft_exit_pass (); }tools/testing/selftests/pidfd/pidfd_poll_test.c +1
-1@@ -112,5 +112,5 @@ int main(int argc, char **argv) }ksft_test_result_pass ("pidfd poll test: pass\n" ); -return ksft_exit_pass (); +ksft_exit_pass (); }tools/testing/selftests/pidfd/pidfd_test.c +1
-1@@ -569,5 +569,5 @@ int main(int argc, char **argv)test_pidfd_send_signal_exited_fail ();test_pidfd_send_signal_recycled_pid_fail (); -return ksft_exit_pass (); +ksft_exit_pass (); }tools/testing/selftests/resctrl/resctrl_tests.c +3
-3@@ -205,7 +205,7 @@ int main(int argc, char **argv)* 2. We execute perf commands */ if (geteuid () !=0 ) -return ksft_exit_fail_msg ("Not running as root, abort testing.\n" ); +ksft_exit_fail_msg ("Not running as root, abort testing.\n" );/* Detect AMD vendor */ detect_amd ();@@ -235,7 +235,7 @@ int main(int argc, char **argv)sprintf (bm_type,"fill_buf" );if (!check_resctrlfs_support ()) -return ksft_exit_fail_msg ("resctrl FS does not exist\n" ); +ksft_exit_fail_msg ("resctrl FS does not exist\n" );filter_dmesg ();@@ -255,5 +255,5 @@ int main(int argc, char **argv)umount_resctrlfs (); -return ksft_exit_pass (); +ksft_exit_pass (); }tools/testing/selftests/sync/sync_test.c +1
-1@@ -110,5 +110,5 @@ int main(void) err, ksft_test_num());/* need this return to keep gcc happy */ -return ksft_exit_pass (); +ksft_exit_pass (); }tools/testing/selftests/timers/adjtick.c +2
-2@@ -205,7 +205,7 @@ int main(int argv, char **argc)adjtimex (&tx1);if (err) -return ksft_exit_fail (); +ksft_exit_fail (); -return ksft_exit_pass (); +ksft_exit_pass (); }tools/testing/selftests/timers/alarmtimer-suspend.c +2
-2@@ -173,6 +173,6 @@ int main(void)timer_delete (tm1); }if (final_ret) -return ksft_exit_fail (); -return ksft_exit_pass (); +ksft_exit_fail (); +ksft_exit_pass (); }tools/testing/selftests/timers/change_skew.c +2
-2@@ -89,8 +89,8 @@ int main(int argv, char **argc)if (ret) {printf ("[FAIL]" ); -return ksft_exit_fail (); +ksft_exit_fail (); }printf ("[OK]" ); -return ksft_exit_pass (); +ksft_exit_pass (); }tools/testing/selftests/timers/clocksource-switch.c +2
-2@@ -163,6 +163,6 @@ int main(int argv, char **argc)change_clocksource (orig_clk);if (status) -return ksft_exit_fail (); -return ksft_exit_pass (); +ksft_exit_fail (); +ksft_exit_pass (); }tools/testing/selftests/timers/freq-step.c +2
-2@@ -257,7 +257,7 @@ int main(int argc, char **argv)set_frequency (0.0 );if (fails) -return ksft_exit_fail (); +ksft_exit_fail (); -return ksft_exit_pass (); +ksft_exit_pass (); }tools/testing/selftests/timers/inconsistency-check.c +2
-2@@ -186,8 +186,8 @@ int main(int argc, char *argv[])if (!clock_gettime (clockid, &ts)) {printf ("Consistent %-30s " ,clockstring (clockid));if (consistency_test (clockid, runtime)) -return ksft_exit_fail (); +ksft_exit_fail (); } } -return ksft_exit_pass (); +ksft_exit_pass (); }tools/testing/selftests/timers/leap-a-day.c +5
-5@@ -268,7 +268,7 @@ int main(int argc, char **argv)if (ret <0 ) {printf ("Error: Problem setting STA_INS/STA_DEL!: %s\n" ,time_state_str (ret)); -return ksft_exit_fail (); +ksft_exit_fail (); }/* Validate STA_INS was set */ @@ -277,7 +277,7 @@ int main(int argc, char **argv)if (tx.status !=STA_INS && tx.status !=STA_DEL ) {printf ("Error: STA_INS/STA_DEL not set!: %s\n" ,time_state_str (ret)); -return ksft_exit_fail (); +ksft_exit_fail (); }if (tai_time) {@@ -295,7 +295,7 @@ int main(int argc, char **argv) se.sigev_value.sival_int =0 ;if (timer_create (CLOCK_REALTIME , &se, &tm1) ==-1 ) {printf ("Error: timer_create failed\n" ); -return ksft_exit_fail (); +ksft_exit_fail (); } its1.it_value.tv_sec = next_leap; its1.it_value.tv_nsec =0 ;@@ -366,7 +366,7 @@ int main(int argc, char **argv)if (error_found) {printf ("Errors observed\n" );clear_time_state (); -return ksft_exit_fail (); +ksft_exit_fail (); }printf ("\n" );if ((iterations !=-1 ) && !(--iterations))@@ -374,5 +374,5 @@ int main(int argc, char **argv) }clear_time_state (); -return ksft_exit_pass (); +ksft_exit_pass (); }tools/testing/selftests/timers/leapcrash.c +2
-2@@ -87,7 +87,7 @@ int main(void) tv.tv_usec =0 ;if (settimeofday (&tv,NULL )) {printf ("Error: You're likely not running with proper (ie: root) permissions\n" ); -return ksft_exit_fail (); +ksft_exit_fail (); } tx.modes =0 ;adjtimex (&tx);@@ -104,5 +104,5 @@ int main(void)fflush (stdout); }printf ("[OK]\n" ); -return ksft_exit_pass (); +ksft_exit_pass (); }tools/testing/selftests/timers/mqueue-lat.c +2
-2@@ -107,8 +107,8 @@ int main(int argc, char **argv) ret =mqueue_lat_test ();if (ret <0 ) {printf ("[FAILED]\n" ); -return ksft_exit_fail (); +ksft_exit_fail (); }printf ("[OK]\n" ); -return ksft_exit_pass (); +ksft_exit_pass (); }tools/testing/selftests/timers/nanosleep.c +2
-2@@ -153,7 +153,7 @@ int main(int argc, char **argv) }if (ret <0 ) {printf ("[FAILED]\n" ); -return ksft_exit_fail (); +ksft_exit_fail (); } length *=100 ; }@@ -161,5 +161,5 @@ int main(int argc, char **argv) next: ret =0 ; } -return ksft_exit_pass (); +ksft_exit_pass (); }tools/testing/selftests/timers/nsleep-lat.c +2
-2@@ -172,9 +172,9 @@ int main(int argc, char **argv) }if (ret <0 ) {printf ("[FAILED]\n" ); -return ksft_exit_fail (); +ksft_exit_fail (); }printf ("[OK]\n" ); } -return ksft_exit_pass (); +ksft_exit_pass (); }tools/testing/selftests/timers/posix_timers.c +6
-6@@ -194,16 +194,16 @@ int main(int argc, char **argv)printf ("based timers if other threads run on the CPU...\n" );if (check_itimer (ITIMER_VIRTUAL ) <0 ) -return ksft_exit_fail (); +ksft_exit_fail ();if (check_itimer (ITIMER_PROF ) <0 ) -return ksft_exit_fail (); +ksft_exit_fail ();if (check_itimer (ITIMER_REAL ) <0 ) -return ksft_exit_fail (); +ksft_exit_fail ();if (check_timer_create (CLOCK_THREAD_CPUTIME_ID ) <0 ) -return ksft_exit_fail (); +ksft_exit_fail ();/* * It's unfortunately hard to reliably test a timer expiration @@ -215,7 +215,7 @@ int main(int argc, char **argv)* find a better solution. */ if (check_timer_create (CLOCK_PROCESS_CPUTIME_ID ) <0 ) -return ksft_exit_fail (); +ksft_exit_fail (); -return ksft_exit_pass (); +ksft_exit_pass (); }tools/testing/selftests/timers/raw_skew.c +3
-3@@ -138,11 +138,11 @@ int main(int argv, char **argc)if (tx1.offset || tx2.offset || tx1.freq != tx2.freq || tx1.tick != tx2.tick) {printf (" [SKIP]\n" ); -return ksft_exit_skip ("The clock was adjusted externally. Shutdown NTPd or other time sync daemons\n" ); +ksft_exit_skip ("The clock was adjusted externally. Shutdown NTPd or other time sync daemons\n" ); }printf (" [FAILED]\n" ); -return ksft_exit_fail (); +ksft_exit_fail (); }printf (" [OK]\n" ); -return ksft_exit_pass (); +ksft_exit_pass (); }tools/testing/selftests/timers/set-2038.c +2
-2@@ -128,6 +128,6 @@ int main(int argc, char *argv[])/* restore clock */ settime (start);if (ret) -return ksft_exit_fail (); -return ksft_exit_pass (); +ksft_exit_fail (); +ksft_exit_pass (); }tools/testing/selftests/timers/set-tai.c +2
-2@@ -61,9 +61,9 @@ int main(int argc, char **argv) ret =get_tai ();if (ret != i) {printf ("[FAILED] expected: %i got %i\n" , i, ret); -return ksft_exit_fail (); +ksft_exit_fail (); } }printf ("[OK]\n" ); -return ksft_exit_pass (); +ksft_exit_pass (); }tools/testing/selftests/timers/set-timer-lat.c +2
-2@@ -278,6 +278,6 @@ int main(void) ret |=do_timer_oneshot (clock_id,0 ); }if (ret) -return ksft_exit_fail (); -return ksft_exit_pass (); +ksft_exit_fail (); +ksft_exit_pass (); }tools/testing/selftests/timers/set-tz.c +2
-2@@ -102,9 +102,9 @@ int main(int argc, char **argv)printf ("[OK]\n" );set_tz (min, dst); -return ksft_exit_pass (); +ksft_exit_pass (); err:set_tz (min, dst); -return ksft_exit_fail (); +ksft_exit_fail (); }tools/testing/selftests/timers/skew_consistency.c +2
-2@@ -70,8 +70,8 @@ int main(int argv, char **argc)if (ret) {printf ("[FAILED]\n" ); -return ksft_exit_fail (); +ksft_exit_fail (); }printf ("[OK]\n" ); -return ksft_exit_pass (); +ksft_exit_pass (); }tools/testing/selftests/timers/threadtest.c +1
-1@@ -189,5 +189,5 @@ int main(int argc, char **argv)/* die */ if (ret)ksft_exit_fail (); -return ksft_exit_pass (); +ksft_exit_pass (); }tools/testing/selftests/timers/valid-adjtimex.c +3
-3@@ -321,10 +321,10 @@ int validate_set_offset(void)int main (int argc,char **argv) {if (validate_freq ()) -return ksft_exit_fail (); +ksft_exit_fail ();if (validate_set_offset ()) -return ksft_exit_fail (); +ksft_exit_fail (); -return ksft_exit_pass (); +ksft_exit_pass (); }tools/testing/selftests/vm/madv_populate.c +1
-2@@ -325,5 +325,5 @@ int main(int argc, char **argv)if (err)ksft_exit_fail_msg ("%d out of %d tests failed\n" , err,ksft_test_num ()); -return ksft_exit_pass (); +ksft_exit_pass (); } --2.33.0
Signature · 2 lines
Thanks, ~Nick Desaulniers
Quoted 100 lines · Nick Desaulniers
Quoted 98 lines · Anders Roxell
When building kselftests/capabilities the following warning shows up:
clang -O2 -g -std=gnu99 -Wall
test_execve.c-lcap-ng -lrt -ldl -otest_execve
test_execve.c:121:13: warning: variable 'have_outer_privilege' is used uninitialized whenever 'if' condition is false [-Wsometimes-uninitialized]} else if (unshare(CLONE_NEWUSER | CLONE_NEWNS) == 0) { ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ test_execve.c:136:9: note: uninitialized use occurs here return have_outer_privilege; ^~~~~~~~~~~~~~~~~~~~ test_execve.c:121:9: note: remove the 'if' if its condition is always true } else if (unshare(CLONE_NEWUSER | CLONE_NEWNS) == 0) { ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ test_execve.c:94:27: note: initialize the variable 'have_outer_privilege' to silence this warning bool have_outer_privilege; ^ = falseRework so all the ksft_exit_*() functions have attribue '__attribute__((noreturn))' so the compiler knows that there wont be any return from the function. That said, without '__attribute__((noreturn))' the compiler warns about the above issue since it thinks that it will get back from the
ksft_exit_skip()function, which it wont.
Cleaning up the callers that rely on ksft_exit_*() return code, since the functions ksft_exit_*() have never returned anything.Signed-off-by Anders Roxell <[email protected]>--- tools/testing/selftests/clone3/clone3.c | 4 +++- .../testing/selftests/clone3/clone3_clear_sighand.c | 2 +- tools/testing/selftests/clone3/clone3_set_tid.c | 4 +++- tools/testing/selftests/ipc/msgque.c | 10 +++++----- tools/testing/selftests/kcmp/kcmp_test.c | 2 +- tools/testing/selftests/kselftest.h | 12 ++++++------ .../membarrier/membarrier_test_multi_thread.c | 2 +- .../membarrier/membarrier_test_single_thread.c | 2 +- tools/testing/selftests/pidfd/pidfd_fdinfo_test.c | 2 +- tools/testing/selftests/pidfd/pidfd_open_test.c | 4 +++- tools/testing/selftests/pidfd/pidfd_poll_test.c | 2 +- tools/testing/selftests/pidfd/pidfd_test.c | 2 +- tools/testing/selftests/resctrl/resctrl_tests.c | 6 +++--- tools/testing/selftests/sync/sync_test.c | 2 +- tools/testing/selftests/timers/adjtick.c | 4 ++-- tools/testing/selftests/timers/alarmtimer-suspend.c | 4 ++-- tools/testing/selftests/timers/change_skew.c | 4 ++-- tools/testing/selftests/timers/clocksource-switch.c | 4 ++-- tools/testing/selftests/timers/freq-step.c | 4 ++-- tools/testing/selftests/timers/inconsistency-check.c | 4 ++-- tools/testing/selftests/timers/leap-a-day.c | 10 +++++----- tools/testing/selftests/timers/leapcrash.c | 4 ++-- tools/testing/selftests/timers/mqueue-lat.c | 4 ++-- tools/testing/selftests/timers/nanosleep.c | 4 ++-- tools/testing/selftests/timers/nsleep-lat.c | 4 ++-- tools/testing/selftests/timers/posix_timers.c | 12 ++++++------ tools/testing/selftests/timers/raw_skew.c | 6 +++--- tools/testing/selftests/timers/set-2038.c | 4 ++-- tools/testing/selftests/timers/set-tai.c | 4 ++-- tools/testing/selftests/timers/set-timer-lat.c | 4 ++-- tools/testing/selftests/timers/set-tz.c | 4 ++-- tools/testing/selftests/timers/skew_consistency.c | 4 ++-- tools/testing/selftests/timers/threadtest.c | 2 +- tools/testing/selftests/timers/valid-adjtimex.c | 6 +++--- tools/testing/selftests/vm/madv_populate.c | 2 +- 35 files changed, 80 insertions(+), 74 deletions(-)tools/testing/selftests/clone3/clone3.c +3
-1@@ -191,5 +191,7 @@ int main(int argc, char *argv[])test_clone3 (CLONE_NEWPID ,getpagesize () +8 , -E2BIG ,CLONE3_ARGS_NO_TEST ); -return !ksft_get_fail_cnt () ?ksft_exit_pass () :ksft_exit_fail (); +if (ksft_get_fail_cnt ()) +ksft_exit_fail (); +ksft_exit_pass (); }tools/testing/selftests/clone3/clone3_clear_sighand.c +1
-1@@ -124,5 +124,5 @@ int main(int argc, char **argv)test_clone3_clear_sighand (); -return ksft_exit_pass (); +ksft_exit_pass (); }tools/testing/selftests/clone3/clone3_set_tid.c +0
-0@@ -393,5 +393,7 @@ int main(int argc, char *argv[]) out: ret =0 ;
Quoted 9 lines
tools/testing/selftests/clone3/clone3_set_tid.c int main(int argc, char *argv[]) · line 398
Quoted 4 lines
tools/testing/selftests/clone3/clone3_set_tid.c +3
-1-return !ret ?ksft_exit_pass () :ksft_exit_fail (); +if (ret) +ksft_exit_fail (); +ksft_exit_pass ();This case is weird (pre-existing-ly) and looks broken. The assignment to ret should probably occur _before_ the out: label. Honestly, I'd remove the use of goto from this function and just call either
ksft_exit_pass()orksft_exit_fail().
I can do that in a followup patch.
Quoted 5 lines
Rest of the patch looks good.
Thanks for sending. (I did not check that this is every case ofreturn ksft_exit_{pass|fail};).Reviewed-by Nick Desaulniers <[email protected]>
Thank you for the review Nick.
Shuah, will you pick up this patch ?
Cheers,
Anders
Quoted 587 lines
Quoted 580 lines
tools/testing/selftests/clone3/clone3_set_tid.c +0
-0}tools/testing/selftests/ipc/msgque.c +5
-5@@ -198,13 +198,13 @@ int main(int argc, char **argv)struct msgque_data msgque;if (getuid () !=0 ) -return ksft_exit_skip ( +ksft_exit_skip ("Please run the test as root - Exiting.\n" ); msgque.key =ftok (argv[0 ],822155650 );if (msgque.key ==-1 ) {printf ("Can't make key: %d\n" , -errno); -return ksft_exit_fail (); +ksft_exit_fail (); } msgque.msq_id =msgget (msgque.key,IPC_CREAT |IPC_EXCL |0666 );@@ -243,13 +243,13 @@ int main(int argc, char **argv)printf ("Failed to test queue: %d\n" , err); goto err_out; } -return ksft_exit_pass (); +ksft_exit_pass (); err_destroy:if (msgctl (msgque.msq_id,IPC_RMID ,NULL )) {printf ("Failed to destroy queue: %d\n" , -errno); -return ksft_exit_fail (); +ksft_exit_fail (); } err_out: -return ksft_exit_fail (); +ksft_exit_fail (); }tools/testing/selftests/kcmp/kcmp_test.c +1
-1@@ -162,5 +162,5 @@ int main(int argc, char **argv)waitpid (pid2, &status,P_ALL ); -return ksft_exit_pass (); +ksft_exit_pass (); }tools/testing/selftests/kselftest.h +6
-6@@ -207,13 +207,13 @@ static inline void ksft_test_result_error(const char *msg, ...)va_end (args); } -static inline int ksft_exit_pass (void ) +static inline void __attribute__((noreturn))ksft_exit_pass (void ) {ksft_print_cnts ();exit (KSFT_PASS ); } -static inline int ksft_exit_fail (void ) +static inline void __attribute__((noreturn))ksft_exit_fail (void ) {ksft_print_cnts ();exit (KSFT_FAIL );@@ -231,7 +231,7 @@ static inline int ksft_exit_fail(void)ksft_exit_fail (); \ }while (0 ) -static inline int ksft_exit_fail_msg(const char *msg, ...) +static inline void __attribute__((noreturn)) ksft_exit_fail_msg(const char *msg, ...) {int saved_errno = errno;va_list args;@@ -246,19 +246,19 @@ static inline int ksft_exit_fail_msg(const char *msg, ...)exit (KSFT_FAIL ); } -static inline int ksft_exit_xfail (void ) +static inline void __attribute__((noreturn))ksft_exit_xfail (void ) {ksft_print_cnts ();exit (KSFT_XFAIL ); } -static inline int ksft_exit_xpass (void ) +static inline void __attribute__((noreturn))ksft_exit_xpass (void ) {ksft_print_cnts ();exit (KSFT_XPASS ); } -static inline int ksft_exit_skip (const char *msg, ...) +static inline void __attribute__((noreturn))ksft_exit_skip (const char *msg, ...) {int saved_errno = errno;va_list args;tools/testing/selftests/membarrier/membarrier_test_multi_thread.c +1
-1@@ -69,5 +69,5 @@ int main(int argc, char **argv)/* Multi-threaded */ test_mt_membarrier (); -return ksft_exit_pass (); +ksft_exit_pass (); }tools/testing/selftests/membarrier/membarrier_test_single_thread.c +1
-1@@ -20,5 +20,5 @@ int main(int argc, char **argv)test_membarrier_success (); -return ksft_exit_pass (); +ksft_exit_pass (); }tools/testing/selftests/pidfd/pidfd_fdinfo_test.c +1
-1@@ -292,5 +292,5 @@ int main(int argc, char **argv)test_pidfd_fdinfo_nspid ();test_pidfd_dead_fdinfo (); -return ksft_exit_pass (); +ksft_exit_pass (); }tools/testing/selftests/pidfd/pidfd_open_test.c +3
-1@@ -159,5 +159,7 @@ int main(int argc, char **argv)if (pidfd >=0 )close (pidfd); -return !ret ?ksft_exit_pass () :ksft_exit_fail (); +if (ret) +ksft_exit_fail (); +ksft_exit_pass (); }tools/testing/selftests/pidfd/pidfd_poll_test.c +1
-1@@ -112,5 +112,5 @@ int main(int argc, char **argv) }ksft_test_result_pass ("pidfd poll test: pass\n" ); -return ksft_exit_pass (); +ksft_exit_pass (); }tools/testing/selftests/pidfd/pidfd_test.c +1
-1@@ -569,5 +569,5 @@ int main(int argc, char **argv)test_pidfd_send_signal_exited_fail ();test_pidfd_send_signal_recycled_pid_fail (); -return ksft_exit_pass (); +ksft_exit_pass (); }tools/testing/selftests/resctrl/resctrl_tests.c +3
-3@@ -205,7 +205,7 @@ int main(int argc, char **argv)* 2. We execute perf commands */ if (geteuid () !=0 ) -return ksft_exit_fail_msg ("Not running as root, abort testing.\n" ); +ksft_exit_fail_msg ("Not running as root, abort testing.\n" );/* Detect AMD vendor */ detect_amd ();@@ -235,7 +235,7 @@ int main(int argc, char **argv)sprintf (bm_type,"fill_buf" );if (!check_resctrlfs_support ()) -return ksft_exit_fail_msg ("resctrl FS does not exist\n" ); +ksft_exit_fail_msg ("resctrl FS does not exist\n" );filter_dmesg ();@@ -255,5 +255,5 @@ int main(int argc, char **argv)umount_resctrlfs (); -return ksft_exit_pass (); +ksft_exit_pass (); }tools/testing/selftests/sync/sync_test.c +1
-1@@ -110,5 +110,5 @@ int main(void) err, ksft_test_num());/* need this return to keep gcc happy */ -return ksft_exit_pass (); +ksft_exit_pass (); }tools/testing/selftests/timers/adjtick.c +2
-2@@ -205,7 +205,7 @@ int main(int argv, char **argc)adjtimex (&tx1);if (err) -return ksft_exit_fail (); +ksft_exit_fail (); -return ksft_exit_pass (); +ksft_exit_pass (); }tools/testing/selftests/timers/alarmtimer-suspend.c +2
-2@@ -173,6 +173,6 @@ int main(void)timer_delete (tm1); }if (final_ret) -return ksft_exit_fail (); -return ksft_exit_pass (); +ksft_exit_fail (); +ksft_exit_pass (); }tools/testing/selftests/timers/change_skew.c +2
-2@@ -89,8 +89,8 @@ int main(int argv, char **argc)if (ret) {printf ("[FAIL]" ); -return ksft_exit_fail (); +ksft_exit_fail (); }printf ("[OK]" ); -return ksft_exit_pass (); +ksft_exit_pass (); }tools/testing/selftests/timers/clocksource-switch.c +2
-2@@ -163,6 +163,6 @@ int main(int argv, char **argc)change_clocksource (orig_clk);if (status) -return ksft_exit_fail (); -return ksft_exit_pass (); +ksft_exit_fail (); +ksft_exit_pass (); }tools/testing/selftests/timers/freq-step.c +2
-2@@ -257,7 +257,7 @@ int main(int argc, char **argv)set_frequency (0.0 );if (fails) -return ksft_exit_fail (); +ksft_exit_fail (); -return ksft_exit_pass (); +ksft_exit_pass (); }tools/testing/selftests/timers/inconsistency-check.c +2
-2@@ -186,8 +186,8 @@ int main(int argc, char *argv[])if (!clock_gettime (clockid, &ts)) {printf ("Consistent %-30s " ,clockstring (clockid));if (consistency_test (clockid, runtime)) -return ksft_exit_fail (); +ksft_exit_fail (); } } -return ksft_exit_pass (); +ksft_exit_pass (); }tools/testing/selftests/timers/leap-a-day.c +5
-5@@ -268,7 +268,7 @@ int main(int argc, char **argv)if (ret <0 ) {printf ("Error: Problem setting STA_INS/STA_DEL!: %s\n" ,time_state_str (ret)); -return ksft_exit_fail (); +ksft_exit_fail (); }/* Validate STA_INS was set */ @@ -277,7 +277,7 @@ int main(int argc, char **argv)if (tx.status !=STA_INS && tx.status !=STA_DEL ) {printf ("Error: STA_INS/STA_DEL not set!: %s\n" ,time_state_str (ret)); -return ksft_exit_fail (); +ksft_exit_fail (); }if (tai_time) {@@ -295,7 +295,7 @@ int main(int argc, char **argv) se.sigev_value.sival_int =0 ;if (timer_create (CLOCK_REALTIME , &se, &tm1) ==-1 ) {printf ("Error: timer_create failed\n" ); -return ksft_exit_fail (); +ksft_exit_fail (); } its1.it_value.tv_sec = next_leap; its1.it_value.tv_nsec =0 ;@@ -366,7 +366,7 @@ int main(int argc, char **argv)if (error_found) {printf ("Errors observed\n" );clear_time_state (); -return ksft_exit_fail (); +ksft_exit_fail (); }printf ("\n" );if ((iterations !=-1 ) && !(--iterations))@@ -374,5 +374,5 @@ int main(int argc, char **argv) }clear_time_state (); -return ksft_exit_pass (); +ksft_exit_pass (); }tools/testing/selftests/timers/leapcrash.c +2
-2@@ -87,7 +87,7 @@ int main(void) tv.tv_usec =0 ;if (settimeofday (&tv,NULL )) {printf ("Error: You're likely not running with proper (ie: root) permissions\n" ); -return ksft_exit_fail (); +ksft_exit_fail (); } tx.modes =0 ;adjtimex (&tx);@@ -104,5 +104,5 @@ int main(void)fflush (stdout); }printf ("[OK]\n" ); -return ksft_exit_pass (); +ksft_exit_pass (); }tools/testing/selftests/timers/mqueue-lat.c +2
-2@@ -107,8 +107,8 @@ int main(int argc, char **argv) ret =mqueue_lat_test ();if (ret <0 ) {printf ("[FAILED]\n" ); -return ksft_exit_fail (); +ksft_exit_fail (); }printf ("[OK]\n" ); -return ksft_exit_pass (); +ksft_exit_pass (); }tools/testing/selftests/timers/nanosleep.c +2
-2@@ -153,7 +153,7 @@ int main(int argc, char **argv) }if (ret <0 ) {printf ("[FAILED]\n" ); -return ksft_exit_fail (); +ksft_exit_fail (); } length *=100 ; }@@ -161,5 +161,5 @@ int main(int argc, char **argv) next: ret =0 ; } -return ksft_exit_pass (); +ksft_exit_pass (); }tools/testing/selftests/timers/nsleep-lat.c +2
-2@@ -172,9 +172,9 @@ int main(int argc, char **argv) }if (ret <0 ) {printf ("[FAILED]\n" ); -return ksft_exit_fail (); +ksft_exit_fail (); }printf ("[OK]\n" ); } -return ksft_exit_pass (); +ksft_exit_pass (); }tools/testing/selftests/timers/posix_timers.c +6
-6@@ -194,16 +194,16 @@ int main(int argc, char **argv)printf ("based timers if other threads run on the CPU...\n" );if (check_itimer (ITIMER_VIRTUAL ) <0 ) -return ksft_exit_fail (); +ksft_exit_fail ();if (check_itimer (ITIMER_PROF ) <0 ) -return ksft_exit_fail (); +ksft_exit_fail ();if (check_itimer (ITIMER_REAL ) <0 ) -return ksft_exit_fail (); +ksft_exit_fail ();if (check_timer_create (CLOCK_THREAD_CPUTIME_ID ) <0 ) -return ksft_exit_fail (); +ksft_exit_fail ();/* * It's unfortunately hard to reliably test a timer expiration @@ -215,7 +215,7 @@ int main(int argc, char **argv)* find a better solution. */ if (check_timer_create (CLOCK_PROCESS_CPUTIME_ID ) <0 ) -return ksft_exit_fail (); +ksft_exit_fail (); -return ksft_exit_pass (); +ksft_exit_pass (); }tools/testing/selftests/timers/raw_skew.c +3
-3@@ -138,11 +138,11 @@ int main(int argv, char **argc)if (tx1.offset || tx2.offset || tx1.freq != tx2.freq || tx1.tick != tx2.tick) {printf (" [SKIP]\n" ); -return ksft_exit_skip ("The clock was adjusted externally. Shutdown NTPd or other time sync daemons\n" ); +ksft_exit_skip ("The clock was adjusted externally. Shutdown NTPd or other time sync daemons\n" ); }printf (" [FAILED]\n" ); -return ksft_exit_fail (); +ksft_exit_fail (); }printf (" [OK]\n" ); -return ksft_exit_pass (); +ksft_exit_pass (); }tools/testing/selftests/timers/set-2038.c +2
-2@@ -128,6 +128,6 @@ int main(int argc, char *argv[])/* restore clock */ settime (start);if (ret) -return ksft_exit_fail (); -return ksft_exit_pass (); +ksft_exit_fail (); +ksft_exit_pass (); }tools/testing/selftests/timers/set-tai.c +2
-2@@ -61,9 +61,9 @@ int main(int argc, char **argv) ret =get_tai ();if (ret != i) {printf ("[FAILED] expected: %i got %i\n" , i, ret); -return ksft_exit_fail (); +ksft_exit_fail (); } }printf ("[OK]\n" ); -return ksft_exit_pass (); +ksft_exit_pass (); }tools/testing/selftests/timers/set-timer-lat.c +2
-2@@ -278,6 +278,6 @@ int main(void) ret |=do_timer_oneshot (clock_id,0 ); }if (ret) -return ksft_exit_fail (); -return ksft_exit_pass (); +ksft_exit_fail (); +ksft_exit_pass (); }tools/testing/selftests/timers/set-tz.c +2
-2@@ -102,9 +102,9 @@ int main(int argc, char **argv)printf ("[OK]\n" );set_tz (min, dst); -return ksft_exit_pass (); +ksft_exit_pass (); err:set_tz (min, dst); -return ksft_exit_fail (); +ksft_exit_fail (); }tools/testing/selftests/timers/skew_consistency.c +2
-2@@ -70,8 +70,8 @@ int main(int argv, char **argc)if (ret) {printf ("[FAILED]\n" ); -return ksft_exit_fail (); +ksft_exit_fail (); }printf ("[OK]\n" ); -return ksft_exit_pass (); +ksft_exit_pass (); }tools/testing/selftests/timers/threadtest.c +1
-1@@ -189,5 +189,5 @@ int main(int argc, char **argv)/* die */ if (ret)ksft_exit_fail (); -return ksft_exit_pass (); +ksft_exit_pass (); }tools/testing/selftests/timers/valid-adjtimex.c +3
-3@@ -321,10 +321,10 @@ int validate_set_offset(void)int main (int argc,char **argv) {if (validate_freq ()) -return ksft_exit_fail (); +ksft_exit_fail ();if (validate_set_offset ()) -return ksft_exit_fail (); +ksft_exit_fail (); -return ksft_exit_pass (); +ksft_exit_pass (); }tools/testing/selftests/vm/madv_populate.c +1
-2@@ -325,5 +325,5 @@ int main(int argc, char **argv)if (err)ksft_exit_fail_msg ("%d out of %d tests failed\n" , err,ksft_test_num ()); -return ksft_exit_pass (); +ksft_exit_pass (); } --Quoted 2 lines
2.33.0
--
Thanks,
~Nick Desaulniers
Shuah Khan
maintainerQuoted 111 lines · Anders Roxell
Quoted 100 lines · Nick Desaulniers
Quoted 98 lines · Anders Roxell
When building kselftests/capabilities the following warning shows up:
clang -O2 -g -std=gnu99 -Wall
test_execve.c-lcap-ng -lrt -ldl -otest_execve
test_execve.c:121:13: warning: variable 'have_outer_privilege' is used uninitialized whenever 'if' condition is false [-Wsometimes-uninitialized]} else if (unshare(CLONE_NEWUSER | CLONE_NEWNS) == 0) { ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ test_execve.c:136:9: note: uninitialized use occurs here return have_outer_privilege; ^~~~~~~~~~~~~~~~~~~~ test_execve.c:121:9: note: remove the 'if' if its condition is always true } else if (unshare(CLONE_NEWUSER | CLONE_NEWNS) == 0) { ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ test_execve.c:94:27: note: initialize the variable 'have_outer_privilege' to silence this warning bool have_outer_privilege; ^ = falseRework so all the ksft_exit_*() functions have attribue '__attribute__((noreturn))' so the compiler knows that there wont be any return from the function. That said, without '__attribute__((noreturn))' the compiler warns about the above issue since it thinks that it will get back from the
ksft_exit_skip()function, which it wont.
Cleaning up the callers that rely on ksft_exit_*() return code, since the functions ksft_exit_*() have never returned anything.Signed-off-by Anders Roxell <[email protected]>--- tools/testing/selftests/clone3/clone3.c | 4 +++- .../testing/selftests/clone3/clone3_clear_sighand.c | 2 +- tools/testing/selftests/clone3/clone3_set_tid.c | 4 +++- tools/testing/selftests/ipc/msgque.c | 10 +++++----- tools/testing/selftests/kcmp/kcmp_test.c | 2 +- tools/testing/selftests/kselftest.h | 12 ++++++------ .../membarrier/membarrier_test_multi_thread.c | 2 +- .../membarrier/membarrier_test_single_thread.c | 2 +- tools/testing/selftests/pidfd/pidfd_fdinfo_test.c | 2 +- tools/testing/selftests/pidfd/pidfd_open_test.c | 4 +++- tools/testing/selftests/pidfd/pidfd_poll_test.c | 2 +- tools/testing/selftests/pidfd/pidfd_test.c | 2 +- tools/testing/selftests/resctrl/resctrl_tests.c | 6 +++--- tools/testing/selftests/sync/sync_test.c | 2 +- tools/testing/selftests/timers/adjtick.c | 4 ++-- tools/testing/selftests/timers/alarmtimer-suspend.c | 4 ++-- tools/testing/selftests/timers/change_skew.c | 4 ++-- tools/testing/selftests/timers/clocksource-switch.c | 4 ++-- tools/testing/selftests/timers/freq-step.c | 4 ++-- tools/testing/selftests/timers/inconsistency-check.c | 4 ++-- tools/testing/selftests/timers/leap-a-day.c | 10 +++++----- tools/testing/selftests/timers/leapcrash.c | 4 ++-- tools/testing/selftests/timers/mqueue-lat.c | 4 ++-- tools/testing/selftests/timers/nanosleep.c | 4 ++-- tools/testing/selftests/timers/nsleep-lat.c | 4 ++-- tools/testing/selftests/timers/posix_timers.c | 12 ++++++------ tools/testing/selftests/timers/raw_skew.c | 6 +++--- tools/testing/selftests/timers/set-2038.c | 4 ++-- tools/testing/selftests/timers/set-tai.c | 4 ++-- tools/testing/selftests/timers/set-timer-lat.c | 4 ++-- tools/testing/selftests/timers/set-tz.c | 4 ++-- tools/testing/selftests/timers/skew_consistency.c | 4 ++-- tools/testing/selftests/timers/threadtest.c | 2 +- tools/testing/selftests/timers/valid-adjtimex.c | 6 +++--- tools/testing/selftests/vm/madv_populate.c | 2 +- 35 files changed, 80 insertions(+), 74 deletions(-)tools/testing/selftests/clone3/clone3.c +3
-1@@ -191,5 +191,7 @@ int main(int argc, char *argv[])test_clone3 (CLONE_NEWPID ,getpagesize () +8 , -E2BIG ,CLONE3_ARGS_NO_TEST ); -return !ksft_get_fail_cnt () ?ksft_exit_pass () :ksft_exit_fail (); +if (ksft_get_fail_cnt ()) +ksft_exit_fail (); +ksft_exit_pass (); }tools/testing/selftests/clone3/clone3_clear_sighand.c +1
-1@@ -124,5 +124,5 @@ int main(int argc, char **argv)test_clone3_clear_sighand (); -return ksft_exit_pass (); +ksft_exit_pass (); }tools/testing/selftests/clone3/clone3_set_tid.c +0
-0@@ -393,5 +393,7 @@ int main(int argc, char *argv[]) out: ret =0 ;Quoted 9 lines
tools/testing/selftests/clone3/clone3_set_tid.c int main(int argc, char *argv[]) · line 398
Quoted 4 lines
tools/testing/selftests/clone3/clone3_set_tid.c +3
-1-return !ret ?ksft_exit_pass () :ksft_exit_fail (); +if (ret) +ksft_exit_fail (); +ksft_exit_pass ();This case is weird (pre-existing-ly) and looks broken. The assignment to ret should probably occur _before_ the out: label. Honestly, I'd remove the use of goto from this function and just call either
ksft_exit_pass()orksft_exit_fail().
Quoted 2 lines
I can do that in a followup patch.
Let's fold this change in. Please send me v3 with.
thanks,
-- Shuah
PATCH v3 1/2 selftests: kselftest.h: mark functions with 'noreturn'
In reply to Anders RoxellWhen building kselftests/capabilities the following warning shows up:
clang -O2 -g -std=gnu99 -Wall test_execve.c -lcap-ng -lrt -ldl -o test_execve
test_execve.c:121:13: warning: variable 'have_outer_privilege' is used uninitialized whenever 'if' condition is false [-Wsometimes-uninitialized]
} else if (unshare(CLONE_NEWUSER | CLONE_NEWNS) == 0) {
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
test_execve.c:136:9: note: uninitialized use occurs here
return have_outer_privilege;
^~~~~~~~~~~~~~~~~~~~
test_execve.c:121:9: note: remove the 'if' if its condition is always true
} else if (unshare(CLONE_NEWUSER | CLONE_NEWNS) == 0) {
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
test_execve.c:94:27: note: initialize the variable 'have_outer_privilege' to silence this warning
bool have_outer_privilege;
^
= falseRework so all the ksft_exit_*() functions have attribue '__attribute__((noreturn))' so the compiler knows that there wont be any return from the function. That said, without '__attribute__((noreturn))' the compiler warns about the above issue since it thinks that it will get back from the ksft_exit_skip() function, which it wont.
Cleaning up the callers that rely on ksft_exit_*() return code, since the functions ksft_exit_*() have never returned anything.
--- tools/testing/selftests/clone3/clone3.c | 4 +++- .../testing/selftests/clone3/clone3_clear_sighand.c | 2 +- tools/testing/selftests/clone3/clone3_set_tid.c | 4 +++- tools/testing/selftests/ipc/msgque.c | 10 +++++----- tools/testing/selftests/kcmp/kcmp_test.c | 2 +- tools/testing/selftests/kselftest.h | 12 ++++++------ .../membarrier/membarrier_test_multi_thread.c | 2 +- .../membarrier/membarrier_test_single_thread.c | 2 +- tools/testing/selftests/pidfd/pidfd_fdinfo_test.c | 2 +- tools/testing/selftests/pidfd/pidfd_open_test.c | 4 +++- tools/testing/selftests/pidfd/pidfd_poll_test.c | 2 +- tools/testing/selftests/pidfd/pidfd_test.c | 2 +- tools/testing/selftests/resctrl/resctrl_tests.c | 6 +++--- tools/testing/selftests/sync/sync_test.c | 2 +- tools/testing/selftests/timers/adjtick.c | 4 ++-- tools/testing/selftests/timers/alarmtimer-suspend.c | 4 ++-- tools/testing/selftests/timers/change_skew.c | 4 ++-- tools/testing/selftests/timers/clocksource-switch.c | 4 ++-- tools/testing/selftests/timers/freq-step.c | 4 ++-- tools/testing/selftests/timers/inconsistency-check.c | 4 ++-- tools/testing/selftests/timers/leap-a-day.c | 10 +++++----- tools/testing/selftests/timers/leapcrash.c | 4 ++-- tools/testing/selftests/timers/mqueue-lat.c | 4 ++-- tools/testing/selftests/timers/nanosleep.c | 4 ++-- tools/testing/selftests/timers/nsleep-lat.c | 4 ++-- tools/testing/selftests/timers/posix_timers.c | 12 ++++++------ tools/testing/selftests/timers/raw_skew.c | 6 +++--- tools/testing/selftests/timers/set-2038.c | 4 ++-- tools/testing/selftests/timers/set-tai.c | 4 ++-- tools/testing/selftests/timers/set-timer-lat.c | 4 ++-- tools/testing/selftests/timers/set-tz.c | 4 ++-- tools/testing/selftests/timers/skew_consistency.c | 4 ++-- tools/testing/selftests/timers/threadtest.c | 2 +- tools/testing/selftests/timers/valid-adjtimex.c | 6 +++--- tools/testing/selftests/vm/madv_populate.c | 2 +- 35 files changed, 80 insertions(+), 74 deletions(-)
tools/testing/selftests/clone3/clone3.c +3 -1
@@ -191,5 +191,7 @@ int main(int argc, char *argv[])test_clone3 (CLONE_NEWPID ,getpagesize () +8 , -E2BIG ,CLONE3_ARGS_NO_TEST ); -return !ksft_get_fail_cnt () ?ksft_exit_pass () :ksft_exit_fail (); +if (ksft_get_fail_cnt ()) +ksft_exit_fail (); +ksft_exit_pass (); }
tools/testing/selftests/clone3/clone3_clear_sighand.c +1 -1
@@ -124,5 +124,5 @@ int main(int argc, char **argv)test_clone3_clear_sighand (); -return ksft_exit_pass (); +ksft_exit_pass (); }
tools/testing/selftests/clone3/clone3_set_tid.c +3 -1
@@ -393,5 +393,7 @@ int main(int argc, char *argv[]) out: ret =0 ; -return !ret ?ksft_exit_pass () :ksft_exit_fail (); +if (ret) +ksft_exit_fail (); +ksft_exit_pass (); }
tools/testing/selftests/ipc/msgque.c +5 -5
@@ -198,13 +198,13 @@ int main(int argc, char **argv)struct msgque_data msgque;if (getuid () !=0 ) -return ksft_exit_skip ( +ksft_exit_skip ("Please run the test as root - Exiting.\n" ); msgque.key =ftok (argv[0 ],822155650 );if (msgque.key ==-1 ) {printf ("Can't make key: %d\n" , -errno); -return ksft_exit_fail (); +ksft_exit_fail (); } msgque.msq_id =msgget (msgque.key,IPC_CREAT |IPC_EXCL |0666 );
@@ -243,13 +243,13 @@ int main(int argc, char **argv)printf ("Failed to test queue: %d\n" , err); goto err_out; } -return ksft_exit_pass (); +ksft_exit_pass (); err_destroy:if (msgctl (msgque.msq_id,IPC_RMID ,NULL )) {printf ("Failed to destroy queue: %d\n" , -errno); -return ksft_exit_fail (); +ksft_exit_fail (); } err_out: -return ksft_exit_fail (); +ksft_exit_fail (); }
tools/testing/selftests/kcmp/kcmp_test.c +1 -1
@@ -162,5 +162,5 @@ int main(int argc, char **argv)waitpid (pid2, &status,P_ALL ); -return ksft_exit_pass (); +ksft_exit_pass (); }
tools/testing/selftests/kselftest.h +6 -6
@@ -207,13 +207,13 @@ static inline void ksft_test_result_error(const char *msg, ...)va_end (args); } -static inline int ksft_exit_pass (void ) +static inline void __attribute__((noreturn))ksft_exit_pass (void ) {ksft_print_cnts ();exit (KSFT_PASS ); } -static inline int ksft_exit_fail (void ) +static inline void __attribute__((noreturn))ksft_exit_fail (void ) {ksft_print_cnts ();exit (KSFT_FAIL );
@@ -231,7 +231,7 @@ static inline int ksft_exit_fail(void)ksft_exit_fail (); \ }while (0 ) -static inline int ksft_exit_fail_msg(const char *msg, ...) +static inline void __attribute__((noreturn)) ksft_exit_fail_msg(const char *msg, ...) {int saved_errno = errno;va_list args;
@@ -246,19 +246,19 @@ static inline int ksft_exit_fail_msg(const char *msg, ...)exit (KSFT_FAIL ); } -static inline int ksft_exit_xfail (void ) +static inline void __attribute__((noreturn))ksft_exit_xfail (void ) {ksft_print_cnts ();exit (KSFT_XFAIL ); } -static inline int ksft_exit_xpass (void ) +static inline void __attribute__((noreturn))ksft_exit_xpass (void ) {ksft_print_cnts ();exit (KSFT_XPASS ); } -static inline int ksft_exit_skip (const char *msg, ...) +static inline void __attribute__((noreturn))ksft_exit_skip (const char *msg, ...) {int saved_errno = errno;va_list args;
tools/testing/selftests/membarrier/membarrier_test_multi_thread.c +1 -1
@@ -69,5 +69,5 @@ int main(int argc, char **argv)/* Multi-threaded */ test_mt_membarrier (); -return ksft_exit_pass (); +ksft_exit_pass (); }
tools/testing/selftests/membarrier/membarrier_test_single_thread.c +1 -1
@@ -20,5 +20,5 @@ int main(int argc, char **argv)test_membarrier_success (); -return ksft_exit_pass (); +ksft_exit_pass (); }
tools/testing/selftests/pidfd/pidfd_fdinfo_test.c +1 -1
@@ -292,5 +292,5 @@ int main(int argc, char **argv)test_pidfd_fdinfo_nspid ();test_pidfd_dead_fdinfo (); -return ksft_exit_pass (); +ksft_exit_pass (); }
tools/testing/selftests/pidfd/pidfd_open_test.c +3 -1
@@ -159,5 +159,7 @@ int main(int argc, char **argv)if (pidfd >=0 )close (pidfd); -return !ret ?ksft_exit_pass () :ksft_exit_fail (); +if (ret) +ksft_exit_fail (); +ksft_exit_pass (); }
tools/testing/selftests/pidfd/pidfd_poll_test.c +1 -1
@@ -112,5 +112,5 @@ int main(int argc, char **argv) }ksft_test_result_pass ("pidfd poll test: pass\n" ); -return ksft_exit_pass (); +ksft_exit_pass (); }
tools/testing/selftests/pidfd/pidfd_test.c +1 -1
@@ -569,5 +569,5 @@ int main(int argc, char **argv)test_pidfd_send_signal_exited_fail ();test_pidfd_send_signal_recycled_pid_fail (); -return ksft_exit_pass (); +ksft_exit_pass (); }
tools/testing/selftests/resctrl/resctrl_tests.c +3 -3
@@ -205,7 +205,7 @@ int main(int argc, char **argv)* 2. We execute perf commands */ if (geteuid () !=0 ) -return ksft_exit_fail_msg ("Not running as root, abort testing.\n" ); +ksft_exit_fail_msg ("Not running as root, abort testing.\n" );/* Detect AMD vendor */ detect_amd ();
@@ -235,7 +235,7 @@ int main(int argc, char **argv)sprintf (bm_type,"fill_buf" );if (!check_resctrlfs_support ()) -return ksft_exit_fail_msg ("resctrl FS does not exist\n" ); +ksft_exit_fail_msg ("resctrl FS does not exist\n" );filter_dmesg ();
@@ -255,5 +255,5 @@ int main(int argc, char **argv)umount_resctrlfs (); -return ksft_exit_pass (); +ksft_exit_pass (); }
tools/testing/selftests/sync/sync_test.c +1 -1
@@ -110,5 +110,5 @@ int main(void) err, ksft_test_num());/* need this return to keep gcc happy */ -return ksft_exit_pass (); +ksft_exit_pass (); }
tools/testing/selftests/timers/adjtick.c +2 -2
@@ -205,7 +205,7 @@ int main(int argv, char **argc)adjtimex (&tx1);if (err) -return ksft_exit_fail (); +ksft_exit_fail (); -return ksft_exit_pass (); +ksft_exit_pass (); }
tools/testing/selftests/timers/alarmtimer-suspend.c +2 -2
@@ -173,6 +173,6 @@ int main(void)timer_delete (tm1); }if (final_ret) -return ksft_exit_fail (); -return ksft_exit_pass (); +ksft_exit_fail (); +ksft_exit_pass (); }
tools/testing/selftests/timers/change_skew.c +2 -2
@@ -89,8 +89,8 @@ int main(int argv, char **argc)if (ret) {printf ("[FAIL]" ); -return ksft_exit_fail (); +ksft_exit_fail (); }printf ("[OK]" ); -return ksft_exit_pass (); +ksft_exit_pass (); }
tools/testing/selftests/timers/clocksource-switch.c +2 -2
@@ -163,6 +163,6 @@ int main(int argv, char **argc)change_clocksource (orig_clk);if (status) -return ksft_exit_fail (); -return ksft_exit_pass (); +ksft_exit_fail (); +ksft_exit_pass (); }
tools/testing/selftests/timers/freq-step.c +2 -2
@@ -257,7 +257,7 @@ int main(int argc, char **argv)set_frequency (0.0 );if (fails) -return ksft_exit_fail (); +ksft_exit_fail (); -return ksft_exit_pass (); +ksft_exit_pass (); }
tools/testing/selftests/timers/inconsistency-check.c +2 -2
@@ -186,8 +186,8 @@ int main(int argc, char *argv[])if (!clock_gettime (clockid, &ts)) {printf ("Consistent %-30s " ,clockstring (clockid));if (consistency_test (clockid, runtime)) -return ksft_exit_fail (); +ksft_exit_fail (); } } -return ksft_exit_pass (); +ksft_exit_pass (); }
tools/testing/selftests/timers/leap-a-day.c +5 -5
@@ -268,7 +268,7 @@ int main(int argc, char **argv)if (ret <0 ) {printf ("Error: Problem setting STA_INS/STA_DEL!: %s\n" ,time_state_str (ret)); -return ksft_exit_fail (); +ksft_exit_fail (); }/* Validate STA_INS was set */
@@ -277,7 +277,7 @@ int main(int argc, char **argv)if (tx.status !=STA_INS && tx.status !=STA_DEL ) {printf ("Error: STA_INS/STA_DEL not set!: %s\n" ,time_state_str (ret)); -return ksft_exit_fail (); +ksft_exit_fail (); }if (tai_time) {
@@ -295,7 +295,7 @@ int main(int argc, char **argv) se.sigev_value.sival_int =0 ;if (timer_create (CLOCK_REALTIME , &se, &tm1) ==-1 ) {printf ("Error: timer_create failed\n" ); -return ksft_exit_fail (); +ksft_exit_fail (); } its1.it_value.tv_sec = next_leap; its1.it_value.tv_nsec =0 ;
@@ -366,7 +366,7 @@ int main(int argc, char **argv)if (error_found) {printf ("Errors observed\n" );clear_time_state (); -return ksft_exit_fail (); +ksft_exit_fail (); }printf ("\n" );if ((iterations !=-1 ) && !(--iterations))
@@ -374,5 +374,5 @@ int main(int argc, char **argv) }clear_time_state (); -return ksft_exit_pass (); +ksft_exit_pass (); }
tools/testing/selftests/timers/leapcrash.c +2 -2
@@ -87,7 +87,7 @@ int main(void) tv.tv_usec =0 ;if (settimeofday (&tv,NULL )) {printf ("Error: You're likely not running with proper (ie: root) permissions\n" ); -return ksft_exit_fail (); +ksft_exit_fail (); } tx.modes =0 ;adjtimex (&tx);
@@ -104,5 +104,5 @@ int main(void)fflush (stdout); }printf ("[OK]\n" ); -return ksft_exit_pass (); +ksft_exit_pass (); }
tools/testing/selftests/timers/mqueue-lat.c +2 -2
@@ -107,8 +107,8 @@ int main(int argc, char **argv) ret =mqueue_lat_test ();if (ret <0 ) {printf ("[FAILED]\n" ); -return ksft_exit_fail (); +ksft_exit_fail (); }printf ("[OK]\n" ); -return ksft_exit_pass (); +ksft_exit_pass (); }
tools/testing/selftests/timers/nanosleep.c +2 -2
@@ -153,7 +153,7 @@ int main(int argc, char **argv) }if (ret <0 ) {printf ("[FAILED]\n" ); -return ksft_exit_fail (); +ksft_exit_fail (); } length *=100 ; }
@@ -161,5 +161,5 @@ int main(int argc, char **argv) next: ret =0 ; } -return ksft_exit_pass (); +ksft_exit_pass (); }
tools/testing/selftests/timers/nsleep-lat.c +2 -2
@@ -172,9 +172,9 @@ int main(int argc, char **argv) }if (ret <0 ) {printf ("[FAILED]\n" ); -return ksft_exit_fail (); +ksft_exit_fail (); }printf ("[OK]\n" ); } -return ksft_exit_pass (); +ksft_exit_pass (); }
tools/testing/selftests/timers/posix_timers.c +6 -6
@@ -194,16 +194,16 @@ int main(int argc, char **argv)printf ("based timers if other threads run on the CPU...\n" );if (check_itimer (ITIMER_VIRTUAL ) <0 ) -return ksft_exit_fail (); +ksft_exit_fail ();if (check_itimer (ITIMER_PROF ) <0 ) -return ksft_exit_fail (); +ksft_exit_fail ();if (check_itimer (ITIMER_REAL ) <0 ) -return ksft_exit_fail (); +ksft_exit_fail ();if (check_timer_create (CLOCK_THREAD_CPUTIME_ID ) <0 ) -return ksft_exit_fail (); +ksft_exit_fail ();/* * It's unfortunately hard to reliably test a timer expiration
@@ -215,7 +215,7 @@ int main(int argc, char **argv)* find a better solution. */ if (check_timer_create (CLOCK_PROCESS_CPUTIME_ID ) <0 ) -return ksft_exit_fail (); +ksft_exit_fail (); -return ksft_exit_pass (); +ksft_exit_pass (); }
tools/testing/selftests/timers/raw_skew.c +3 -3
@@ -138,11 +138,11 @@ int main(int argv, char **argc)if (tx1.offset || tx2.offset || tx1.freq != tx2.freq || tx1.tick != tx2.tick) {printf (" [SKIP]\n" ); -return ksft_exit_skip ("The clock was adjusted externally. Shutdown NTPd or other time sync daemons\n" ); +ksft_exit_skip ("The clock was adjusted externally. Shutdown NTPd or other time sync daemons\n" ); }printf (" [FAILED]\n" ); -return ksft_exit_fail (); +ksft_exit_fail (); }printf (" [OK]\n" ); -return ksft_exit_pass (); +ksft_exit_pass (); }
tools/testing/selftests/timers/set-2038.c +2 -2
@@ -128,6 +128,6 @@ int main(int argc, char *argv[])/* restore clock */ settime (start);if (ret) -return ksft_exit_fail (); -return ksft_exit_pass (); +ksft_exit_fail (); +ksft_exit_pass (); }
tools/testing/selftests/timers/set-tai.c +2 -2
@@ -61,9 +61,9 @@ int main(int argc, char **argv) ret =get_tai ();if (ret != i) {printf ("[FAILED] expected: %i got %i\n" , i, ret); -return ksft_exit_fail (); +ksft_exit_fail (); } }printf ("[OK]\n" ); -return ksft_exit_pass (); +ksft_exit_pass (); }
tools/testing/selftests/timers/set-timer-lat.c +2 -2
@@ -278,6 +278,6 @@ int main(void) ret |=do_timer_oneshot (clock_id,0 ); }if (ret) -return ksft_exit_fail (); -return ksft_exit_pass (); +ksft_exit_fail (); +ksft_exit_pass (); }
tools/testing/selftests/timers/set-tz.c +2 -2
@@ -102,9 +102,9 @@ int main(int argc, char **argv)printf ("[OK]\n" );set_tz (min, dst); -return ksft_exit_pass (); +ksft_exit_pass (); err:set_tz (min, dst); -return ksft_exit_fail (); +ksft_exit_fail (); }
tools/testing/selftests/timers/skew_consistency.c +2 -2
@@ -70,8 +70,8 @@ int main(int argv, char **argc)if (ret) {printf ("[FAILED]\n" ); -return ksft_exit_fail (); +ksft_exit_fail (); }printf ("[OK]\n" ); -return ksft_exit_pass (); +ksft_exit_pass (); }
tools/testing/selftests/timers/threadtest.c +1 -1
@@ -189,5 +189,5 @@ int main(int argc, char **argv)/* die */ if (ret)ksft_exit_fail (); -return ksft_exit_pass (); +ksft_exit_pass (); }
tools/testing/selftests/timers/valid-adjtimex.c +3 -3
@@ -321,10 +321,10 @@ int validate_set_offset(void)int main (int argc,char **argv) {if (validate_freq ()) -return ksft_exit_fail (); +ksft_exit_fail ();if (validate_set_offset ()) -return ksft_exit_fail (); +ksft_exit_fail (); -return ksft_exit_pass (); +ksft_exit_pass (); }
tools/testing/selftests/vm/madv_populate.c +1 -1
@@ -325,5 +325,5 @@ int main(int argc, char **argv)if (err)ksft_exit_fail_msg ("%d out of %d tests failed\n" , err,ksft_test_num ()); -return ksft_exit_pass (); +ksft_exit_pass (); }
Signature · 1 line
2.33.0
PATCH v3 2/2 selftests: clone3: simplify return logic in clone3_set_tid()
Use ksft_exit_* and exit instead of using goto.
--- tools/testing/selftests/clone3/clone3_set_tid.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-)
tools/testing/selftests/clone3/clone3_set_tid.c +3 -8
@@ -250,7 +250,8 @@ int main(int argc, char *argv[])* that all those tests are skipped as non-root. */ ksft_cnt.ksft_xskip += ksft_plan -ksft_test_num (); - goto out; +ksft_exit_skip ( +"Please run the remaining tests as root - Exiting.\n" ); }/* Find the current active PID */
@@ -371,9 +372,7 @@ int main(int argc, char *argv[])close (pipe_2[1 ]);if (waitpid (ns_pid, &status,0 ) <0 ) { -ksft_print_msg ("Child returned %s\n" ,strerror (errno)); - ret = -errno; - goto out; +ksft_exit_fail_msg ("Child returned %s\n" ,strerror (errno)); }if (!WIFEXITED (status))
@@ -390,10 +389,6 @@ int main(int argc, char *argv[])ksft_test_result_fail ("PIDs in all namespaces not as expected (%d,%d,%d)\n" , ns3, ns2, ns1); -out: - ret =0 ; -if (ret) -ksft_exit_fail ();ksft_exit_pass (); }
Signature · 1 line
2.33.0
Re: [PATCH v3 2/2] selftests: clone3: simplify return logic in clone3_set_tid()
Quoted 3 lines · Anders Roxell
Use ksft_exit_* and exit instead of using goto.
I'm sorry, I should have added Nick to this patch, since he suggested it.
Cheers,
Anders
Quoted 44 lines
Signed-off-by Anders Roxell <[email protected]>--- tools/testing/selftests/clone3/clone3_set_tid.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-)tools/testing/selftests/clone3/clone3_set_tid.c +3
-9@@ -250,7 +250,8 @@ int main(int argc, char *argv[])* that all those tests are skipped as non-root. */ ksft_cnt.ksft_xskip += ksft_plan -ksft_test_num (); - goto out; +ksft_exit_skip ( +"Please run the remaining tests as root - Exiting.\n" ); }/* Find the current active PID */ @@ -371,9 +372,7 @@ int main(int argc, char *argv[])close (pipe_2[1 ]);if (waitpid (ns_pid, &status,0 ) <0 ) { -ksft_print_msg ("Child returned %s\n" ,strerror (errno)); - ret = -errno; - goto out; +ksft_exit_fail_msg ("Child returned %s\n" ,strerror (errno)); }if (!WIFEXITED (status))@@ -390,10 +389,6 @@ int main(int argc, char *argv[])ksft_test_result_fail ("PIDs in all namespaces not as expected (%d,%d,%d)\n" , ns3, ns2, ns1); -out: - ret =0 ; -if (ret) -ksft_exit_fail ();ksft_exit_pass (); } --2.33.0
Nick Desaulniers
Reviewed-byRe: [PATCH v3 2/2] selftests: clone3: simplify return logic in clone3_set_tid()
Quoted 6 lines · Anders Roxell
Quoted 3 lines · Anders Roxell
Use ksft_exit_* and exit instead of using goto.
Quoted 8 lines
I'm sorry, I should have added Nick to this patch, since he suggested it.
Suggested-by Nick Desaulniers <[email protected]>Cheers,
AndersQuoted 1 line
Signed-off-by Anders Roxell <[email protected]>
Thanks for the patch!
Quoted 43 lines
Quoted 43 lines
--- tools/testing/selftests/clone3/clone3_set_tid.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-)tools/testing/selftests/clone3/clone3_set_tid.c +3
-9@@ -250,7 +250,8 @@ int main(int argc, char *argv[])* that all those tests are skipped as non-root. */ ksft_cnt.ksft_xskip += ksft_plan -ksft_test_num (); - goto out; +ksft_exit_skip ( +"Please run the remaining tests as root - Exiting.\n" ); }/* Find the current active PID */ @@ -371,9 +372,7 @@ int main(int argc, char *argv[])close (pipe_2[1 ]);if (waitpid (ns_pid, &status,0 ) <0 ) { -ksft_print_msg ("Child returned %s\n" ,strerror (errno)); - ret = -errno; - goto out; +ksft_exit_fail_msg ("Child returned %s\n" ,strerror (errno)); }if (!WIFEXITED (status))@@ -390,10 +389,6 @@ int main(int argc, char *argv[])ksft_test_result_fail ("PIDs in all namespaces not as expected (%d,%d,%d)\n" , ns3, ns2, ns1); -out: - ret =0 ; -if (ret) -ksft_exit_fail ();ksft_exit_pass (); } --2.33.0
Signature · 2 lines
Thanks, ~Nick Desaulniers
Quoted 96 lines · Anders Roxell
When building kselftests/capabilities the following warning shows up:
clang -O2 -g -std=gnu99 -Wall
test_execve.c-lcap-ng -lrt -ldl -otest_execve
test_execve.c:121:13: warning: variable 'have_outer_privilege' is used uninitialized whenever 'if' condition is false [-Wsometimes-uninitialized]} else if (unshare(CLONE_NEWUSER | CLONE_NEWNS) == 0) { ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ test_execve.c:136:9: note: uninitialized use occurs here return have_outer_privilege; ^~~~~~~~~~~~~~~~~~~~ test_execve.c:121:9: note: remove the 'if' if its condition is always true } else if (unshare(CLONE_NEWUSER | CLONE_NEWNS) == 0) { ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ test_execve.c:94:27: note: initialize the variable 'have_outer_privilege' to silence this warning bool have_outer_privilege; ^ = falseRework so all the ksft_exit_*() functions have attribue '__attribute__((noreturn))' so the compiler knows that there wont be any return from the function. That said, without '__attribute__((noreturn))' the compiler warns about the above issue since it thinks that it will get back from the
ksft_exit_skip()function, which it wont.
Cleaning up the callers that rely on ksft_exit_*() return code, since the functions ksft_exit_*() have never returned anything.Signed-off-by Anders Roxell <[email protected]>Reviewed-by Nick Desaulniers <[email protected]>--- tools/testing/selftests/clone3/clone3.c | 4 +++- .../testing/selftests/clone3/clone3_clear_sighand.c | 2 +- tools/testing/selftests/clone3/clone3_set_tid.c | 4 +++- tools/testing/selftests/ipc/msgque.c | 10 +++++----- tools/testing/selftests/kcmp/kcmp_test.c | 2 +- tools/testing/selftests/kselftest.h | 12 ++++++------ .../membarrier/membarrier_test_multi_thread.c | 2 +- .../membarrier/membarrier_test_single_thread.c | 2 +- tools/testing/selftests/pidfd/pidfd_fdinfo_test.c | 2 +- tools/testing/selftests/pidfd/pidfd_open_test.c | 4 +++- tools/testing/selftests/pidfd/pidfd_poll_test.c | 2 +- tools/testing/selftests/pidfd/pidfd_test.c | 2 +- tools/testing/selftests/resctrl/resctrl_tests.c | 6 +++--- tools/testing/selftests/sync/sync_test.c | 2 +- tools/testing/selftests/timers/adjtick.c | 4 ++-- tools/testing/selftests/timers/alarmtimer-suspend.c | 4 ++-- tools/testing/selftests/timers/change_skew.c | 4 ++-- tools/testing/selftests/timers/clocksource-switch.c | 4 ++-- tools/testing/selftests/timers/freq-step.c | 4 ++-- tools/testing/selftests/timers/inconsistency-check.c | 4 ++-- tools/testing/selftests/timers/leap-a-day.c | 10 +++++----- tools/testing/selftests/timers/leapcrash.c | 4 ++-- tools/testing/selftests/timers/mqueue-lat.c | 4 ++-- tools/testing/selftests/timers/nanosleep.c | 4 ++-- tools/testing/selftests/timers/nsleep-lat.c | 4 ++-- tools/testing/selftests/timers/posix_timers.c | 12 ++++++------ tools/testing/selftests/timers/raw_skew.c | 6 +++--- tools/testing/selftests/timers/set-2038.c | 4 ++-- tools/testing/selftests/timers/set-tai.c | 4 ++-- tools/testing/selftests/timers/set-timer-lat.c | 4 ++-- tools/testing/selftests/timers/set-tz.c | 4 ++-- tools/testing/selftests/timers/skew_consistency.c | 4 ++-- tools/testing/selftests/timers/threadtest.c | 2 +- tools/testing/selftests/timers/valid-adjtimex.c | 6 +++--- tools/testing/selftests/vm/madv_populate.c | 2 +- 35 files changed, 80 insertions(+), 74 deletions(-)tools/testing/selftests/clone3/clone3.c +3
-1@@ -191,5 +191,7 @@ int main(int argc, char *argv[])test_clone3 (CLONE_NEWPID ,getpagesize () +8 , -E2BIG ,CLONE3_ARGS_NO_TEST ); -return !ksft_get_fail_cnt () ?ksft_exit_pass () :ksft_exit_fail (); +if (ksft_get_fail_cnt ()) +ksft_exit_fail (); +ksft_exit_pass (); }tools/testing/selftests/clone3/clone3_clear_sighand.c +1
-1@@ -124,5 +124,5 @@ int main(int argc, char **argv)test_clone3_clear_sighand (); -return ksft_exit_pass (); +ksft_exit_pass (); }tools/testing/selftests/clone3/clone3_set_tid.c +0
-0
tools/testing/selftests/clone3/clone3_set_tid.c int main(int argc, char *argv[]) · line 398
Quoted 7 lines
tools/testing/selftests/clone3/clone3_set_tid.c +3
-1@@ -393,5 +393,7 @@ int main(int argc, char *argv[]) out: ret =0 ; -return !ret ?ksft_exit_pass () :ksft_exit_fail (); +if (ret) +ksft_exit_fail (); +ksft_exit_pass ();
err...did you update clone3_set_tid as Shuah requested in v3? Otherwise what changed from v2 -> v3?
Quoted 581 lines
tools/testing/selftests/clone3/clone3_set_tid.c +0
-0}tools/testing/selftests/ipc/msgque.c +5
-5@@ -198,13 +198,13 @@ int main(int argc, char **argv)struct msgque_data msgque;if (getuid () !=0 ) -return ksft_exit_skip ( +ksft_exit_skip ("Please run the test as root - Exiting.\n" ); msgque.key =ftok (argv[0 ],822155650 );if (msgque.key ==-1 ) {printf ("Can't make key: %d\n" , -errno); -return ksft_exit_fail (); +ksft_exit_fail (); } msgque.msq_id =msgget (msgque.key,IPC_CREAT |IPC_EXCL |0666 );@@ -243,13 +243,13 @@ int main(int argc, char **argv)printf ("Failed to test queue: %d\n" , err); goto err_out; } -return ksft_exit_pass (); +ksft_exit_pass (); err_destroy:if (msgctl (msgque.msq_id,IPC_RMID ,NULL )) {printf ("Failed to destroy queue: %d\n" , -errno); -return ksft_exit_fail (); +ksft_exit_fail (); } err_out: -return ksft_exit_fail (); +ksft_exit_fail (); }tools/testing/selftests/kcmp/kcmp_test.c +1
-1@@ -162,5 +162,5 @@ int main(int argc, char **argv)waitpid (pid2, &status,P_ALL ); -return ksft_exit_pass (); +ksft_exit_pass (); }tools/testing/selftests/kselftest.h +6
-6@@ -207,13 +207,13 @@ static inline void ksft_test_result_error(const char *msg, ...)va_end (args); } -static inline int ksft_exit_pass (void ) +static inline void __attribute__((noreturn))ksft_exit_pass (void ) {ksft_print_cnts ();exit (KSFT_PASS ); } -static inline int ksft_exit_fail (void ) +static inline void __attribute__((noreturn))ksft_exit_fail (void ) {ksft_print_cnts ();exit (KSFT_FAIL );@@ -231,7 +231,7 @@ static inline int ksft_exit_fail(void)ksft_exit_fail (); \ }while (0 ) -static inline int ksft_exit_fail_msg(const char *msg, ...) +static inline void __attribute__((noreturn)) ksft_exit_fail_msg(const char *msg, ...) {int saved_errno = errno;va_list args;@@ -246,19 +246,19 @@ static inline int ksft_exit_fail_msg(const char *msg, ...)exit (KSFT_FAIL ); } -static inline int ksft_exit_xfail (void ) +static inline void __attribute__((noreturn))ksft_exit_xfail (void ) {ksft_print_cnts ();exit (KSFT_XFAIL ); } -static inline int ksft_exit_xpass (void ) +static inline void __attribute__((noreturn))ksft_exit_xpass (void ) {ksft_print_cnts ();exit (KSFT_XPASS ); } -static inline int ksft_exit_skip (const char *msg, ...) +static inline void __attribute__((noreturn))ksft_exit_skip (const char *msg, ...) {int saved_errno = errno;va_list args;tools/testing/selftests/membarrier/membarrier_test_multi_thread.c +1
-1@@ -69,5 +69,5 @@ int main(int argc, char **argv)/* Multi-threaded */ test_mt_membarrier (); -return ksft_exit_pass (); +ksft_exit_pass (); }tools/testing/selftests/membarrier/membarrier_test_single_thread.c +1
-1@@ -20,5 +20,5 @@ int main(int argc, char **argv)test_membarrier_success (); -return ksft_exit_pass (); +ksft_exit_pass (); }tools/testing/selftests/pidfd/pidfd_fdinfo_test.c +1
-1@@ -292,5 +292,5 @@ int main(int argc, char **argv)test_pidfd_fdinfo_nspid ();test_pidfd_dead_fdinfo (); -return ksft_exit_pass (); +ksft_exit_pass (); }tools/testing/selftests/pidfd/pidfd_open_test.c +3
-1@@ -159,5 +159,7 @@ int main(int argc, char **argv)if (pidfd >=0 )close (pidfd); -return !ret ?ksft_exit_pass () :ksft_exit_fail (); +if (ret) +ksft_exit_fail (); +ksft_exit_pass (); }tools/testing/selftests/pidfd/pidfd_poll_test.c +1
-1@@ -112,5 +112,5 @@ int main(int argc, char **argv) }ksft_test_result_pass ("pidfd poll test: pass\n" ); -return ksft_exit_pass (); +ksft_exit_pass (); }tools/testing/selftests/pidfd/pidfd_test.c +1
-1@@ -569,5 +569,5 @@ int main(int argc, char **argv)test_pidfd_send_signal_exited_fail ();test_pidfd_send_signal_recycled_pid_fail (); -return ksft_exit_pass (); +ksft_exit_pass (); }tools/testing/selftests/resctrl/resctrl_tests.c +3
-3@@ -205,7 +205,7 @@ int main(int argc, char **argv)* 2. We execute perf commands */ if (geteuid () !=0 ) -return ksft_exit_fail_msg ("Not running as root, abort testing.\n" ); +ksft_exit_fail_msg ("Not running as root, abort testing.\n" );/* Detect AMD vendor */ detect_amd ();@@ -235,7 +235,7 @@ int main(int argc, char **argv)sprintf (bm_type,"fill_buf" );if (!check_resctrlfs_support ()) -return ksft_exit_fail_msg ("resctrl FS does not exist\n" ); +ksft_exit_fail_msg ("resctrl FS does not exist\n" );filter_dmesg ();@@ -255,5 +255,5 @@ int main(int argc, char **argv)umount_resctrlfs (); -return ksft_exit_pass (); +ksft_exit_pass (); }tools/testing/selftests/sync/sync_test.c +1
-1@@ -110,5 +110,5 @@ int main(void) err, ksft_test_num());/* need this return to keep gcc happy */ -return ksft_exit_pass (); +ksft_exit_pass (); }tools/testing/selftests/timers/adjtick.c +2
-2@@ -205,7 +205,7 @@ int main(int argv, char **argc)adjtimex (&tx1);if (err) -return ksft_exit_fail (); +ksft_exit_fail (); -return ksft_exit_pass (); +ksft_exit_pass (); }tools/testing/selftests/timers/alarmtimer-suspend.c +2
-2@@ -173,6 +173,6 @@ int main(void)timer_delete (tm1); }if (final_ret) -return ksft_exit_fail (); -return ksft_exit_pass (); +ksft_exit_fail (); +ksft_exit_pass (); }tools/testing/selftests/timers/change_skew.c +2
-2@@ -89,8 +89,8 @@ int main(int argv, char **argc)if (ret) {printf ("[FAIL]" ); -return ksft_exit_fail (); +ksft_exit_fail (); }printf ("[OK]" ); -return ksft_exit_pass (); +ksft_exit_pass (); }tools/testing/selftests/timers/clocksource-switch.c +2
-2@@ -163,6 +163,6 @@ int main(int argv, char **argc)change_clocksource (orig_clk);if (status) -return ksft_exit_fail (); -return ksft_exit_pass (); +ksft_exit_fail (); +ksft_exit_pass (); }tools/testing/selftests/timers/freq-step.c +2
-2@@ -257,7 +257,7 @@ int main(int argc, char **argv)set_frequency (0.0 );if (fails) -return ksft_exit_fail (); +ksft_exit_fail (); -return ksft_exit_pass (); +ksft_exit_pass (); }tools/testing/selftests/timers/inconsistency-check.c +2
-2@@ -186,8 +186,8 @@ int main(int argc, char *argv[])if (!clock_gettime (clockid, &ts)) {printf ("Consistent %-30s " ,clockstring (clockid));if (consistency_test (clockid, runtime)) -return ksft_exit_fail (); +ksft_exit_fail (); } } -return ksft_exit_pass (); +ksft_exit_pass (); }tools/testing/selftests/timers/leap-a-day.c +5
-5@@ -268,7 +268,7 @@ int main(int argc, char **argv)if (ret <0 ) {printf ("Error: Problem setting STA_INS/STA_DEL!: %s\n" ,time_state_str (ret)); -return ksft_exit_fail (); +ksft_exit_fail (); }/* Validate STA_INS was set */ @@ -277,7 +277,7 @@ int main(int argc, char **argv)if (tx.status !=STA_INS && tx.status !=STA_DEL ) {printf ("Error: STA_INS/STA_DEL not set!: %s\n" ,time_state_str (ret)); -return ksft_exit_fail (); +ksft_exit_fail (); }if (tai_time) {@@ -295,7 +295,7 @@ int main(int argc, char **argv) se.sigev_value.sival_int =0 ;if (timer_create (CLOCK_REALTIME , &se, &tm1) ==-1 ) {printf ("Error: timer_create failed\n" ); -return ksft_exit_fail (); +ksft_exit_fail (); } its1.it_value.tv_sec = next_leap; its1.it_value.tv_nsec =0 ;@@ -366,7 +366,7 @@ int main(int argc, char **argv)if (error_found) {printf ("Errors observed\n" );clear_time_state (); -return ksft_exit_fail (); +ksft_exit_fail (); }printf ("\n" );if ((iterations !=-1 ) && !(--iterations))@@ -374,5 +374,5 @@ int main(int argc, char **argv) }clear_time_state (); -return ksft_exit_pass (); +ksft_exit_pass (); }tools/testing/selftests/timers/leapcrash.c +2
-2@@ -87,7 +87,7 @@ int main(void) tv.tv_usec =0 ;if (settimeofday (&tv,NULL )) {printf ("Error: You're likely not running with proper (ie: root) permissions\n" ); -return ksft_exit_fail (); +ksft_exit_fail (); } tx.modes =0 ;adjtimex (&tx);@@ -104,5 +104,5 @@ int main(void)fflush (stdout); }printf ("[OK]\n" ); -return ksft_exit_pass (); +ksft_exit_pass (); }tools/testing/selftests/timers/mqueue-lat.c +2
-2@@ -107,8 +107,8 @@ int main(int argc, char **argv) ret =mqueue_lat_test ();if (ret <0 ) {printf ("[FAILED]\n" ); -return ksft_exit_fail (); +ksft_exit_fail (); }printf ("[OK]\n" ); -return ksft_exit_pass (); +ksft_exit_pass (); }tools/testing/selftests/timers/nanosleep.c +2
-2@@ -153,7 +153,7 @@ int main(int argc, char **argv) }if (ret <0 ) {printf ("[FAILED]\n" ); -return ksft_exit_fail (); +ksft_exit_fail (); } length *=100 ; }@@ -161,5 +161,5 @@ int main(int argc, char **argv) next: ret =0 ; } -return ksft_exit_pass (); +ksft_exit_pass (); }tools/testing/selftests/timers/nsleep-lat.c +2
-2@@ -172,9 +172,9 @@ int main(int argc, char **argv) }if (ret <0 ) {printf ("[FAILED]\n" ); -return ksft_exit_fail (); +ksft_exit_fail (); }printf ("[OK]\n" ); } -return ksft_exit_pass (); +ksft_exit_pass (); }tools/testing/selftests/timers/posix_timers.c +6
-6@@ -194,16 +194,16 @@ int main(int argc, char **argv)printf ("based timers if other threads run on the CPU...\n" );if (check_itimer (ITIMER_VIRTUAL ) <0 ) -return ksft_exit_fail (); +ksft_exit_fail ();if (check_itimer (ITIMER_PROF ) <0 ) -return ksft_exit_fail (); +ksft_exit_fail ();if (check_itimer (ITIMER_REAL ) <0 ) -return ksft_exit_fail (); +ksft_exit_fail ();if (check_timer_create (CLOCK_THREAD_CPUTIME_ID ) <0 ) -return ksft_exit_fail (); +ksft_exit_fail ();/* * It's unfortunately hard to reliably test a timer expiration @@ -215,7 +215,7 @@ int main(int argc, char **argv)* find a better solution. */ if (check_timer_create (CLOCK_PROCESS_CPUTIME_ID ) <0 ) -return ksft_exit_fail (); +ksft_exit_fail (); -return ksft_exit_pass (); +ksft_exit_pass (); }tools/testing/selftests/timers/raw_skew.c +3
-3@@ -138,11 +138,11 @@ int main(int argv, char **argc)if (tx1.offset || tx2.offset || tx1.freq != tx2.freq || tx1.tick != tx2.tick) {printf (" [SKIP]\n" ); -return ksft_exit_skip ("The clock was adjusted externally. Shutdown NTPd or other time sync daemons\n" ); +ksft_exit_skip ("The clock was adjusted externally. Shutdown NTPd or other time sync daemons\n" ); }printf (" [FAILED]\n" ); -return ksft_exit_fail (); +ksft_exit_fail (); }printf (" [OK]\n" ); -return ksft_exit_pass (); +ksft_exit_pass (); }tools/testing/selftests/timers/set-2038.c +2
-2@@ -128,6 +128,6 @@ int main(int argc, char *argv[])/* restore clock */ settime (start);if (ret) -return ksft_exit_fail (); -return ksft_exit_pass (); +ksft_exit_fail (); +ksft_exit_pass (); }tools/testing/selftests/timers/set-tai.c +2
-2@@ -61,9 +61,9 @@ int main(int argc, char **argv) ret =get_tai ();if (ret != i) {printf ("[FAILED] expected: %i got %i\n" , i, ret); -return ksft_exit_fail (); +ksft_exit_fail (); } }printf ("[OK]\n" ); -return ksft_exit_pass (); +ksft_exit_pass (); }tools/testing/selftests/timers/set-timer-lat.c +2
-2@@ -278,6 +278,6 @@ int main(void) ret |=do_timer_oneshot (clock_id,0 ); }if (ret) -return ksft_exit_fail (); -return ksft_exit_pass (); +ksft_exit_fail (); +ksft_exit_pass (); }tools/testing/selftests/timers/set-tz.c +2
-2@@ -102,9 +102,9 @@ int main(int argc, char **argv)printf ("[OK]\n" );set_tz (min, dst); -return ksft_exit_pass (); +ksft_exit_pass (); err:set_tz (min, dst); -return ksft_exit_fail (); +ksft_exit_fail (); }tools/testing/selftests/timers/skew_consistency.c +2
-2@@ -70,8 +70,8 @@ int main(int argv, char **argc)if (ret) {printf ("[FAILED]\n" ); -return ksft_exit_fail (); +ksft_exit_fail (); }printf ("[OK]\n" ); -return ksft_exit_pass (); +ksft_exit_pass (); }tools/testing/selftests/timers/threadtest.c +1
-1@@ -189,5 +189,5 @@ int main(int argc, char **argv)/* die */ if (ret)ksft_exit_fail (); -return ksft_exit_pass (); +ksft_exit_pass (); }tools/testing/selftests/timers/valid-adjtimex.c +3
-3@@ -321,10 +321,10 @@ int validate_set_offset(void)int main (int argc,char **argv) {if (validate_freq ()) -return ksft_exit_fail (); +ksft_exit_fail ();if (validate_set_offset ()) -return ksft_exit_fail (); +ksft_exit_fail (); -return ksft_exit_pass (); +ksft_exit_pass (); }tools/testing/selftests/vm/madv_populate.c +1
-2@@ -325,5 +325,5 @@ int main(int argc, char **argv)if (err)ksft_exit_fail_msg ("%d out of %d tests failed\n" , err,ksft_test_num ()); -return ksft_exit_pass (); +ksft_exit_pass (); } --2.33.0
Signature · 2 lines
Thanks, ~Nick Desaulniers
Quoted 101 lines · Nick Desaulniers
Quoted 99 lines · Anders Roxell
When building kselftests/capabilities the following warning shows up:
clang -O2 -g -std=gnu99 -Wall
test_execve.c-lcap-ng -lrt -ldl -otest_execve
test_execve.c:121:13: warning: variable 'have_outer_privilege' is used uninitialized whenever 'if' condition is false [-Wsometimes-uninitialized]} else if (unshare(CLONE_NEWUSER | CLONE_NEWNS) == 0) { ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ test_execve.c:136:9: note: uninitialized use occurs here return have_outer_privilege; ^~~~~~~~~~~~~~~~~~~~ test_execve.c:121:9: note: remove the 'if' if its condition is always true } else if (unshare(CLONE_NEWUSER | CLONE_NEWNS) == 0) { ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ test_execve.c:94:27: note: initialize the variable 'have_outer_privilege' to silence this warning bool have_outer_privilege; ^ = falseRework so all the ksft_exit_*() functions have attribue '__attribute__((noreturn))' so the compiler knows that there wont be any return from the function. That said, without '__attribute__((noreturn))' the compiler warns about the above issue since it thinks that it will get back from the
ksft_exit_skip()function, which it wont.
Cleaning up the callers that rely on ksft_exit_*() return code, since the functions ksft_exit_*() have never returned anything.Signed-off-by Anders Roxell <[email protected]>Reviewed-by Nick Desaulniers <[email protected]>--- tools/testing/selftests/clone3/clone3.c | 4 +++- .../testing/selftests/clone3/clone3_clear_sighand.c | 2 +- tools/testing/selftests/clone3/clone3_set_tid.c | 4 +++- tools/testing/selftests/ipc/msgque.c | 10 +++++----- tools/testing/selftests/kcmp/kcmp_test.c | 2 +- tools/testing/selftests/kselftest.h | 12 ++++++------ .../membarrier/membarrier_test_multi_thread.c | 2 +- .../membarrier/membarrier_test_single_thread.c | 2 +- tools/testing/selftests/pidfd/pidfd_fdinfo_test.c | 2 +- tools/testing/selftests/pidfd/pidfd_open_test.c | 4 +++- tools/testing/selftests/pidfd/pidfd_poll_test.c | 2 +- tools/testing/selftests/pidfd/pidfd_test.c | 2 +- tools/testing/selftests/resctrl/resctrl_tests.c | 6 +++--- tools/testing/selftests/sync/sync_test.c | 2 +- tools/testing/selftests/timers/adjtick.c | 4 ++-- tools/testing/selftests/timers/alarmtimer-suspend.c | 4 ++-- tools/testing/selftests/timers/change_skew.c | 4 ++-- tools/testing/selftests/timers/clocksource-switch.c | 4 ++-- tools/testing/selftests/timers/freq-step.c | 4 ++-- tools/testing/selftests/timers/inconsistency-check.c | 4 ++-- tools/testing/selftests/timers/leap-a-day.c | 10 +++++----- tools/testing/selftests/timers/leapcrash.c | 4 ++-- tools/testing/selftests/timers/mqueue-lat.c | 4 ++-- tools/testing/selftests/timers/nanosleep.c | 4 ++-- tools/testing/selftests/timers/nsleep-lat.c | 4 ++-- tools/testing/selftests/timers/posix_timers.c | 12 ++++++------ tools/testing/selftests/timers/raw_skew.c | 6 +++--- tools/testing/selftests/timers/set-2038.c | 4 ++-- tools/testing/selftests/timers/set-tai.c | 4 ++-- tools/testing/selftests/timers/set-timer-lat.c | 4 ++-- tools/testing/selftests/timers/set-tz.c | 4 ++-- tools/testing/selftests/timers/skew_consistency.c | 4 ++-- tools/testing/selftests/timers/threadtest.c | 2 +- tools/testing/selftests/timers/valid-adjtimex.c | 6 +++--- tools/testing/selftests/vm/madv_populate.c | 2 +- 35 files changed, 80 insertions(+), 74 deletions(-)tools/testing/selftests/clone3/clone3.c +3
-1@@ -191,5 +191,7 @@ int main(int argc, char *argv[])test_clone3 (CLONE_NEWPID ,getpagesize () +8 , -E2BIG ,CLONE3_ARGS_NO_TEST ); -return !ksft_get_fail_cnt () ?ksft_exit_pass () :ksft_exit_fail (); +if (ksft_get_fail_cnt ()) +ksft_exit_fail (); +ksft_exit_pass (); }tools/testing/selftests/clone3/clone3_clear_sighand.c +1
-1@@ -124,5 +124,5 @@ int main(int argc, char **argv)test_clone3_clear_sighand (); -return ksft_exit_pass (); +ksft_exit_pass (); }tools/testing/selftests/clone3/clone3_set_tid.c +0
-0@@ -393,5 +393,7 @@ int main(int argc, char *argv[]) out: ret =0 ;
Quoted 7 lines
tools/testing/selftests/clone3/clone3_set_tid.c int main(int argc, char *argv[]) · line 398
Quoted 4 lines
tools/testing/selftests/clone3/clone3_set_tid.c +3
-1-return !ret ?ksft_exit_pass () :ksft_exit_fail (); +if (ret) +ksft_exit_fail (); +ksft_exit_pass ();err...did you update
clone3_set_tidas Shuah requested in v3? Otherwise what changed from v2 -> v3?
Ah, this was part of a series. Sorry I missed that; gmail keeps the original subject line when --in-reply-to is used even when the subject changes.
Signature · 2 lines
Thanks, ~Nick Desaulniers
Shuah Khan
maintainerQuoted 17 lines · Anders Roxell
When building kselftests/capabilities the following warning shows up:
clang -O2 -g -std=gnu99 -Wall
test_execve.c-lcap-ng -lrt -ldl -otest_execve
test_execve.c:121:13: warning: variable 'have_outer_privilege' is used uninitialized whenever 'if' condition is false [-Wsometimes-uninitialized]} else if (unshare(CLONE_NEWUSER | CLONE_NEWNS) == 0) { ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ test_execve.c:136:9: note: uninitialized use occurs here return have_outer_privilege; ^~~~~~~~~~~~~~~~~~~~ test_execve.c:121:9: note: remove the 'if' if its condition is always true } else if (unshare(CLONE_NEWUSER | CLONE_NEWNS) == 0) { ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ test_execve.c:94:27: note: initialize the variable 'have_outer_privilege' to silence this warning bool have_outer_privilege; ^ = false
Quoted 2 lines
Rework so all the ksft_exit_*() functions have attribue '__attribute__((noreturn))' so the compiler knows that there wont be
won't be
Quoted 10 lines
any return from the function. That said, without '__attribute__((noreturn))' the compiler warns about the above issue since it thinks that it will get back from the
ksft_exit_skip()function, which it wont.
Cleaning up the callers that rely on ksft_exit_*() return code, since the functions ksft_exit_*() have never returned anything.Signed-off-by Anders Roxell <[email protected]>Reviewed-by Nick Desaulniers <[email protected]>---
My commit script failed due to checkpatch warns. Run checkpatchp.l --strict to find the problems and send me v4
thanks,
-- Shuah