aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Johnston <markj@FreeBSD.org>2023-03-03 16:16:21 +0000
committerMark Johnston <markj@FreeBSD.org>2023-03-03 16:16:51 +0000
commit560f9cd5e1e36ba725f3c677d7b8e514af9f3a85 (patch)
tree5294a83482403068dfef0c24a746970539115c07
parent831601773e5ab58b9485c1b111eb8c7c7343abf6 (diff)
downloadsrc-560f9cd5e1e36ba725f3c677d7b8e514af9f3a85.tar.gz
src-560f9cd5e1e36ba725f3c677d7b8e514af9f3a85.zip
posixshm tests: Correct page size index checks
MFC after: 1 week Sponsored by: Klara, Inc. Sponsored by: Juniper Networks, Inc.
-rw-r--r--tests/sys/posixshm/posixshm_test.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/tests/sys/posixshm/posixshm_test.c b/tests/sys/posixshm/posixshm_test.c
index 7c63c6542cd7..bc48863f98a0 100644
--- a/tests/sys/posixshm/posixshm_test.c
+++ b/tests/sys/posixshm/posixshm_test.c
@@ -1263,7 +1263,8 @@ ATF_TC_BODY(largepage_basic, tc)
for (size_t p = 0; p < ps[i] / ps[0]; p++) {
ATF_REQUIRE_MSG((vec[p] & MINCORE_INCORE) != 0,
"page %zu is not mapped", p);
- ATF_REQUIRE_MSG((vec[p] & MINCORE_PSIND(i)) != 0,
+ ATF_REQUIRE_MSG((vec[p] & MINCORE_SUPER) ==
+ MINCORE_PSIND(i),
"page %zu is not in a %zu-byte superpage",
p, ps[i]);
}
@@ -1426,7 +1427,8 @@ ATF_TC_BODY(largepage_mmap, tc)
for (size_t p = 0; p < ps[i] / ps[0]; p++) {
ATF_REQUIRE_MSG((vec[p] & MINCORE_INCORE) != 0,
"page %zu is not resident", p);
- ATF_REQUIRE_MSG((vec[p] & MINCORE_PSIND(i)) != 0,
+ ATF_REQUIRE_MSG((vec[p] & MINCORE_SUPER) ==
+ MINCORE_PSIND(i),
"page %zu is not resident", p);
}
@@ -1761,7 +1763,7 @@ ATF_TC_BODY(largepage_minherit, tc)
*(volatile char *)addr = 0;
if (mincore(addr, ps[0], &v) != 0)
_exit(1);
- if ((v & MINCORE_PSIND(i)) == 0)
+ if ((v & MINCORE_SUPER) == 0)
_exit(2);
_exit(0);
}
@@ -1910,7 +1912,7 @@ ATF_TC_BODY(largepage_reopen, tc)
ATF_REQUIRE(vec != NULL);
ATF_REQUIRE_MSG(mincore(addr, ps[psind], vec) == 0,
"mincore failed; error=%d", errno);
- ATF_REQUIRE_MSG((vec[0] & MINCORE_PSIND(psind)) != 0,
+ ATF_REQUIRE_MSG((vec[0] & MINCORE_SUPER) == MINCORE_PSIND(psind),
"page not mapped into a %zu-byte superpage", ps[psind]);
ATF_REQUIRE_MSG(shm_unlink(test_path) == 0,