selftests-mm-add-atexit-and-signal-handlers-to-thp_settings.patch removed from -mm tree
The quilt patch titled
Subject: selftests/mm: add atexit() and signal handlers to thp_settings
has been removed from the -mm tree. Its filename was
selftests-mm-add-atexit-and-signal-handlers-to-thp_settings.patch
This patch was dropped because it was merged into the mm-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
------------------------------------------------------
From: "Mike Rapoport (Microsoft)" <[email protected]>
Subject: selftests/mm: add atexit() and signal handlers to thp_settings
Date: Mon, 11 May 2026 19:28:06 +0300
khugepaged registers atexit() and signal handlers that ensure that THP settings are restored regardless of how the test exited.
Make these handlers available for all users of thp_settings.
The call to thp_save_settings() installs thp_restore_settings as the atexit() callback and makes sure that signals that kill a process would still call exit() and atexit() callback.
Update child process in khugepaged tests using thp_settings to use _exit() instead of exit() to avoid altering THP settings in the middle of a test.
Remove redundant THP cleanup from folio_split_race_test.c.
---
tools/testing/selftests/mm/cow.c | 21 ++--- tools/testing/selftests/mm/folio_split_race_test.c | 23 ------ tools/testing/selftests/mm/khugepaged.c | 41 +---------- tools/testing/selftests/mm/thp_settings.c | 27 ++++++- tools/testing/selftests/mm/uffd-wp-mremap.c | 4 - 5 files changed, 38 insertions(+), 78 deletions(-)
tools/testing/selftests/mm/cow.c renamed from tools/testing/selftests/mm/cow.c~selftests-mm-add-atexit-and-signal-handlers-to-thp_settings +8 -13
@@ -202,7 +202,7 @@ static void do_test_cow_in_parent(char *log_test_result (KSFT_FAIL ); goto close_comm_pipes; }else if (!ret) { -exit (fn (mem, size, &comm_pipes)); +_exit (fn (mem, size, &comm_pipes)); }while (read (comm_pipes.child_ready[0 ], &buf,1 ) !=1 )
@@ -333,7 +333,7 @@ static void do_test_vmsplice_in_parent(c ;/* Modify page content in the child. */ memset (mem,0xff , size); -exit (0 ); +_exit (0 ); }if (!before_fork) {
@@ -480,7 +480,7 @@ static void do_test_iouring(char *mem, swrite (comm_pipes.child_ready[1 ],"0" ,1 );while (read (comm_pipes.parent_ready[0 ], &buf,1 ) !=1 ) ; -exit (0 ); +_exit (0 ); }while (read (comm_pipes.child_ready[0 ], &buf,1 ) !=1 )
@@ -645,7 +645,7 @@ static void do_test_ro_pin(char *mem, siwrite (comm_pipes.child_ready[1 ],"0" ,1 );while (read (comm_pipes.parent_ready[0 ], &buf,1 ) !=1 ) ; -exit (0 ); +_exit (0 ); }/* Wait until our child is ready. */
@@ -956,7 +956,7 @@ static void do_run_with_thp(test_fn fn,log_test_result (KSFT_FAIL ); goto munmap; }else if (!ret) { -exit (0 ); +_exit (0 ); }wait (&ret);/* Allow for sharing all pages again. */
@@ -1347,13 +1347,13 @@ static void do_test_anon_thp_collapse(chswitch (test) {case ANON_THP_COLLAPSE_UNSHARED :case ANON_THP_COLLAPSE_FULLY_SHARED : -exit (child_memcmp_fn (mem, size, &comm_pipes)); +_exit (child_memcmp_fn (mem, size, &comm_pipes));break ;case ANON_THP_COLLAPSE_LOWER_SHARED : -exit (child_memcmp_fn (mem, size /2 , &comm_pipes)); +_exit (child_memcmp_fn (mem, size /2 , &comm_pipes));break ;case ANON_THP_COLLAPSE_UPPER_SHARED : -exit (child_memcmp_fn (mem + size /2 , size /2 , +_exit (child_memcmp_fn (mem + size /2 , size /2 , &comm_pipes));break ;default :
@@ -1911,10 +1911,5 @@ int main(int argc, char **argv)run_anon_thp_test_cases ();run_non_anon_test_cases (); -if (pmdsize) { -/* Only if THP is supported. */ -thp_restore_settings (); - } -ksft_finished (); }
tools/testing/selftests/mm/folio_split_race_test.c renamed from tools/testing/selftests/mm/folio_split_race_test.c~selftests-mm-add-atexit-and-signal-handlers-to-thp_settings +0 -23
@@ -226,23 +226,6 @@ static uint64_t run_iteration(void)return reader_failures; } -static void thp_cleanup_handler (int signum) -{ -thp_restore_settings (); -/* -* Restore default handler and re-raise the signal to exit. -* This is to ensure the test process exits with the correct -* status code corresponding to the signal. -*/ -signal (signum,SIG_DFL ); -raise (signum); -} - -static void thp_settings_cleanup (void ) -{ -thp_restore_settings (); -} -int main (void ) {struct thp_settings current_settings;
@@ -261,12 +244,6 @@ int main(void)ksft_exit_skip ("Please run the test as root\n" );thp_save_settings (); -/* make sure thp settings are restored */ -if (atexit (thp_settings_cleanup) !=0 ) -ksft_exit_fail_msg ("atexit failed\n" ); - -signal (SIGINT , thp_cleanup_handler); -signal (SIGTERM , thp_cleanup_handler);thp_read_settings (¤t_settings); current_settings.shmem_enabled =SHMEM_ADVISE ;
tools/testing/selftests/mm/khugepaged.c renamed from tools/testing/selftests/mm/khugepaged.c~selftests-mm-add-atexit-and-signal-handlers-to-thp_settings +4 -37
99 lines not on this page · raw message
tools/testing/selftests/mm/thp_settings.c renamed from tools/testing/selftests/mm/thp_settings.c~selftests-mm-add-atexit-and-signal-handlers-to-thp_settings +26 -1
@@ -1,6 +1,7 @@// SPDX-License-Identifier: GPL-2.0 #include <fcntl.h> #include <limits.h> +#include <signal.h> #include <stdio.h> #include <stdlib.h> #include <string.h>
@@ -15,6 +16,7 @@ static struct thp_settings settings_stacstatic int settings_index;static struct thp_settings saved_settings;static char dev_queue_read_ahead_path[PATH_MAX ]; +static bool thp_settings_saved;static const char *const thp_enabled_strings[] = {"never" ,
@@ -298,12 +300,35 @@ void thp_pop_settings(void)void thp_restore_settings (void ) { -thp_write_settings (&saved_settings); +if (thp_settings_saved) +thp_write_settings (&saved_settings); +} + +static void thp_restore_settings_atexit (void ) +{ +thp_restore_settings (); +} + +static void thp_restore_settings_sighandler (int sig) +{ +/* exit() will invoke the thp_restore_settings_atexit handler. */ +exit (KSFT_FAIL ); }void thp_save_settings (void ) {thp_read_settings (&saved_settings); + thp_settings_saved = true; + +/* +* setup exit hooks to make sure THP settings are restored on graceful +* and error exits and signals +*/ +atexit (thp_restore_settings_atexit); +signal (SIGTERM , thp_restore_settings_sighandler); +signal (SIGINT , thp_restore_settings_sighandler); +signal (SIGHUP , thp_restore_settings_sighandler); +signal (SIGQUIT , thp_restore_settings_sighandler); }void thp_set_read_ahead_path (char *path)
tools/testing/selftests/mm/uffd-wp-mremap.c renamed from tools/testing/selftests/mm/uffd-wp-mremap.c~selftests-mm-add-atexit-and-signal-handlers-to-thp_settings +0 -4
@@ -368,10 +368,6 @@ int main(int argc, char **argv) tc->swapout, tc->hugetlb); } -/* If THP is supported, restore original THP settings. */ -if (nr_thpsizes) -thp_restore_settings (); - i =ksft_get_fail_cnt ();if (i) ksft_exit_fail_msg("%d out of %d tests failed\n",
_
Patches currently in -mm which might be from [email protected] are