Skip to contentSkip to conversation

selftests-mm-mlock-print-error-on-failure.patch removed from -mm tree

merged mm-stable Andrew Morton 1 participant 1 message Mar 17, 2025

lore
Share & tools
lore

Andrew Morton

author tree notice Applied
#0 lore raw

The quilt patch titled
Subject: selftests/mm/mlock: print error on failure
has been removed from the -mm tree. Its filename was
selftests-mm-mlock-print-error-on-failure.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: Brendan Jackman <[email protected]>
Subject: selftests/mm/mlock: print error on failure
Date: Tue, 11 Mar 2025 13:18:23 +0000

It's not really possible to start diagnosing this without knowing the actual error.

Also update the mlock2 helper to behave like libc would by setting errno and returning -1.

---

 tools/testing/selftests/mm/mlock-random-test.c |    4 ++--
 tools/testing/selftests/mm/mlock2.h            |    8 +++++++-
 2 files changed, 9 insertions(+), 3 deletions(-)
tools/testing/selftests/mm/mlock2.h renamed from tools/testing/selftests/mm/mlock2.h~selftests-mm-mlock-print-error-on-failure +7 -1
@@ -6,7 +6,13 @@
 
 static int mlock2_(void *start, size_t len, int flags)
 {
-	return syscall(__NR_mlock2, start, len, flags);
+	int ret = syscall(__NR_mlock2, start, len, flags);
+
+	if (ret) {
+		errno = ret;
+		return -1;
+	}
+	return 0;
 }
 
 static FILE *seek_to_smaps_entry(unsigned long addr)
tools/testing/selftests/mm/mlock-random-test.c renamed from tools/testing/selftests/mm/mlock-random-test.c~selftests-mm-mlock-print-error-on-failure +2 -2
@@ -161,9 +161,9 @@ static void test_mlock_within_limit(char
 				       MLOCK_ONFAULT);
 
 		if (ret)
-			ksft_exit_fail_msg("%s() failure at |%p(%d)| mlock:|%p(%d)|\n",
+			ksft_exit_fail_msg("%s() failure (%s) at |%p(%d)| mlock:|%p(%d)|\n",
 					   is_mlock ? "mlock" : "mlock2",
-					   p, alloc_size,
+					   strerror(errno), p, alloc_size,
 					   p + start_offset, lock_size);
 	}
 

_

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

scripts-gdb-add-lx_per_cpu_ptr.patch