Skip to contentSkip to conversation

userfaultfd-selftests-infinite-loop-in-faulting_process.patch removed from -mm tree

merged mm-stable Andrew Morton 1 participant 1 message Jul 4, 2022

lore
Share & tools
lore

Andrew Morton

author tree notice Applied
#0 lore raw

The quilt patch titled
Subject: userfaultfd: selftests: infinite loop in faulting_process
has been removed from the -mm tree. Its filename was
userfaultfd-selftests-infinite-loop-in-faulting_process.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: Edward Liaw <[email protected]>
Subject: userfaultfd: selftests: infinite loop in faulting_process
Date: Mon, 13 Jun 2022 23:33:21 +0000

On Android this test is getting stuck in an infinite loop due to indeterminate behavior:

The local variables steps and signalled were being reset to 1 and 0 respectively after every jump back to sigsetjmp by siglongjmp in the signal handler. The test was incrementing them and expecting them to retain their incremented values. The documentation for siglongjmp says:

All accessible objects have values as of the time sigsetjmp() was called, except that the values of objects of automatic storage duration which are local to the function containing the invocation of the corresponding sigsetjmp() which do not have volatile-qualified type and which are changed between the sigsetjmp() invocation and siglongjmp() call are indeterminate.

Tagging steps and signalled with volatile enabled the test to pass.

---

 tools/testing/selftests/vm/userfaultfd.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
tools/testing/selftests/vm/userfaultfd.c renamed from tools/testing/selftests/vm/userfaultfd.c~userfaultfd-selftests-infinite-loop-in-faulting_process +2 -2
@@ -931,7 +931,7 @@ static int faulting_process(int signal_t
 	unsigned long split_nr_pages;
 	unsigned long lastnr;
 	struct sigaction act;
-	unsigned long signalled = 0;
+	volatile unsigned long signalled = 0;
 
 	split_nr_pages = (nr_pages + 1) / 2;
 
@@ -946,7 +946,7 @@ static int faulting_process(int signal_t
 	}
 
 	for (nr = 0; nr < split_nr_pages; nr++) {
-		int steps = 1;
+		volatile int steps = 1;
 		unsigned long offset = nr * page_size;
 
 		if (signal_test) {

_

Patches currently in -mm which might be from [email protected] are