Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
From:   Rafael Aquini <aquini@redhat.com>
To:     linux-kernel@vger.kernel.org
Cc:     linux-kselftest@vger.kernel.org, shuah@kernel.org,
        shakeelb@google.com, akpm@linux-foundation.org
Subject: [PATCH] tools/testing/selftests/vm/mlock2-tests: fix mlock2 false-negative errors
Date:   Sat, 21 Mar 2020 21:35:25 -0400
Message-Id: <20200322013525.1095493-1-aquini@redhat.com>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

Changes for commit 9c4e6b1a7027f ("mm, mlock, vmscan: no more skipping pa=
gevecs")
break this test expectations on the behavior of mlock syscall family imme=
diately
inserting the recently faulted pages into the UNEVICTABLE_LRU, when MCL_O=
NFAULT is
passed to the syscall as part of its flag-set.

There is no functional error introduced by the aforementioned commit,
but it opens up a time window where the recently faulted and locked pages
might yet not be put back into the UNEVICTABLE_LRU, thus causing a
subsequent and immediate PFN flag check for the UNEVICTABLE bit
to trip on false-negative errors, as it happens with this test.

This patch fix the false negative by forcefully resorting to a code path =
that
will call a CPU pagevec drain right after the fault but before the PFN fl=
ag
check takes place, sorting out the race that way.

Fixes: 9c4e6b1a7027f ("mm, mlock, vmscan: no more skipping pagevecs")
Signed-off-by: Rafael Aquini <aquini@redhat.com>
---
 tools/testing/selftests/vm/mlock2-tests.c | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/tools/testing/selftests/vm/mlock2-tests.c b/tools/testing/se=
lftests/vm/mlock2-tests.c
index 637b6d0ac0d0..26dc320ca3c9 100644
--- a/tools/testing/selftests/vm/mlock2-tests.c
+++ b/tools/testing/selftests/vm/mlock2-tests.c
@@ -7,6 +7,7 @@
 #include <sys/time.h>
 #include <sys/resource.h>
 #include <stdbool.h>
+#include <sched.h>
 #include "mlock2.h"
=20
 #include "../kselftest.h"
@@ -328,6 +329,22 @@ static int test_mlock_lock()
 	return ret;
 }
=20
+/*
+ * After commit 9c4e6b1a7027f ("mm, mlock, vmscan: no more skipping page=
vecs")
+ * changes made by calls to mlock* family might not be immediately refle=
cted
+ * on the LRUs, thus checking the PFN flags might race against pagevec d=
rain.
+ *
+ * In order to sort out that race, and get the after fault checks consis=
tent,
+ * the "quick and dirty" trick below is required in order to force a cal=
l to
+ * lru_add_drain_all() to get the recently MLOCK_ONFAULT pages moved to
+ * the unevictable LRU, as expected by the checks in this selftest.
+ */
+static void force_lru_add_drain_all(void)
+{
+	sched_yield();
+	system("echo 1 > /proc/sys/vm/compact_memory");
+}
+
 static int onfault_check(char *map)
 {
 	unsigned long page_size =3D getpagesize();
@@ -343,6 +360,9 @@ static int onfault_check(char *map)
 	}
=20
 	*map =3D 'a';
+
+	force_lru_add_drain_all();
+
 	page1_flags =3D get_pageflags((unsigned long)map);
 	page2_flags =3D get_pageflags((unsigned long)map + page_size);
=20
@@ -465,6 +485,8 @@ static int test_lock_onfault_of_present()
 		goto unmap;
 	}
=20
+	force_lru_add_drain_all();
+
 	page1_flags =3D get_pageflags((unsigned long)map);
 	page2_flags =3D get_pageflags((unsigned long)map + page_size);
 	page1_flags =3D get_kpageflags(page1_flags & PFN_MASK);
--=20
2.24.1