d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

posixshm tests: Fix occasional largepage_mprotect failures

Browse Source 
largepage_mprotect maps a superpage and later extends the mapping.  This
occasionally fails with ASLR disabled.  To fix this, first try to
reserve a sufficiently large virtual address region.

Reported by:	Jenkins
MFC after:	1 week
Sponsored by:	The FreeBSD Foundation
This commit is contained in:
Mark Johnston 2022-01-03 11:15:46 -05:00
parent 0e494a9e3f
commit 321e586e46
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
tests/sys/posixshm/posixshm_test.c
View File

@ -1630,9 +1630,19 @@ ATF_TC_BODY(largepage_mprotect, tc)
pscnt = pagesizes(ps);
for (int i = 1; i < pscnt; i++) {
/*
* Reserve a contiguous region in the address space to avoid
* spurious failures in the face of ASLR.
*/
addr = mmap(NULL, ps[i] * 2, PROT_NONE,
MAP_ANON | MAP_ALIGNED(ffsl(ps[i]) - 1), -1, 0);
ATF_REQUIRE_MSG(addr != MAP_FAILED,
"mmap(%zu bytes) failed; error=%d", ps[i], errno);
ATF_REQUIRE(munmap(addr, ps[i] * 2) == 0);
fd = shm_open_large(i, SHM_LARGEPAGE_ALLOC_DEFAULT, ps[i]);
addr = mmap(NULL, ps[i], PROT_READ | PROT_WRITE, MAP_SHARED, fd,
0);
addr = mmap(addr, ps[i], PROT_READ | PROT_WRITE,
MAP_SHARED | MAP_FIXED, fd, 0);
ATF_REQUIRE_MSG(addr != MAP_FAILED,
"mmap(%zu bytes) failed; error=%d", ps[i], errno);