diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2024-05-14 11:36:54 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2024-05-14 11:36:54 -0700 |
commit | 4b95dc87362aa57bdd0dcbad109ca5e5ef3cbb6c (patch) | |
tree | 08067e68292d39b1820882e54dd7ff0319538adf /tools/testing/selftests/resctrl/resctrl_val.c | |
parent | 896d3fce84e7798520eb11b0e53abdcfb47b21be (diff) | |
parent | 2c3b8f8f37c6c0c926d584cf4158db95e62b960c (diff) |
Merge tag 'linux_kselftest-next-6.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest
Pull kselftest updates from Shuah Khan:
- make framework and tests reporting KTAP compliant
- make ktap_helpers and power_supply test POSIX compliant
- add ksft_exit_fail_perror() to include errono in string form
- avoid clang reporting false positive static analysis errors about
functions that exit and never return. ksft_exit* functions are marked
__noreturn to address this problem
- add mechanism for reporting a KSFT_ result code
- fix build warnings related missing headers and unused variables
- fix clang build failures
- cleanups to resctrl test
- add host arch for LLVM builds
* tag 'linux_kselftest-next-6.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest: (44 commits)
selftests/sgx: Include KHDR_INCLUDES in Makefile
selftests: Compile kselftest headers with -D_GNU_SOURCE
selftests/resctrl: fix clang build warnings related to abs(), labs() calls
selftests/ftrace: Fix checkbashisms errors
selftests/ftrace: Fix BTFARG testcase to check fprobe is enabled correctly
selftests/capabilities: fix warn_unused_result build warnings
selftests: filesystems: add missing stddef header
selftests: kselftest_deps: fix l5_test() empty variable
selftests: default to host arch for LLVM builds
selftests/resctrl: fix clang build failure: use LOCAL_HDRS
selftests/binderfs: use the Makefile's rules, not Make's implicit rules
Documentation: kselftest: fix codeblock
selftests: kselftest: Make ksft_exit functions return void instead of int
selftests: x86: ksft_exit_pass() does not return
selftests: timers: ksft_exit functions do not return
selftests: sync: ksft_exit_pass() does not return
selftests/resctrl: ksft_exit_skip() does not return
selftests: pidfd: ksft_exit functions do not return
selftests/mm: ksft_exit functions do not return
selftests: membarrier: ksft_exit_pass() does not return
...
Diffstat (limited to 'tools/testing/selftests/resctrl/resctrl_val.c')
-rw-r--r-- | tools/testing/selftests/resctrl/resctrl_val.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/tools/testing/selftests/resctrl/resctrl_val.c b/tools/testing/selftests/resctrl/resctrl_val.c index 5a49f07a6c85..445f306d4c2f 100644 --- a/tools/testing/selftests/resctrl/resctrl_val.c +++ b/tools/testing/selftests/resctrl/resctrl_val.c @@ -62,6 +62,7 @@ struct imc_counter_config { static char mbm_total_path[1024]; static int imcs; static struct imc_counter_config imc_counters_config[MAX_IMCS][2]; +static const struct resctrl_test *current_test; void membw_initialize_perf_event_attr(int i, int j) { @@ -472,7 +473,8 @@ void ctrlc_handler(int signum, siginfo_t *info, void *ptr) if (bm_pid) kill(bm_pid, SIGKILL); umount_resctrlfs(); - tests_cleanup(); + if (current_test && current_test->cleanup) + current_test->cleanup(); ksft_print_msg("Ending\n\n"); exit(EXIT_SUCCESS); @@ -482,13 +484,14 @@ void ctrlc_handler(int signum, siginfo_t *info, void *ptr) * Register CTRL-C handler for parent, as it has to kill * child process before exiting. */ -int signal_handler_register(void) +int signal_handler_register(const struct resctrl_test *test) { struct sigaction sigact = {}; int ret = 0; bm_pid = 0; + current_test = test; sigact.sa_sigaction = ctrlc_handler; sigemptyset(&sigact.sa_mask); sigact.sa_flags = SA_SIGINFO; @@ -510,6 +513,7 @@ void signal_handler_unregister(void) { struct sigaction sigact = {}; + current_test = NULL; sigact.sa_handler = SIG_DFL; sigemptyset(&sigact.sa_mask); if (sigaction(SIGINT, &sigact, NULL) || |