From nobody Mon Jan 03 18:01:21 2022 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id A6DA3193F15C; Mon, 3 Jan 2022 18:01:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4JSNpp1QT0z4t3N; Mon, 3 Jan 2022 18:01:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 0DFEB1D93; Mon, 3 Jan 2022 18:01:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 203I1L3f094994; Mon, 3 Jan 2022 18:01:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 203I1L5j094992; Mon, 3 Jan 2022 18:01:21 GMT (envelope-from git) Date: Mon, 3 Jan 2022 18:01:21 GMT Message-Id: <202201031801.203I1L5j094992@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 321e586e4611 - main - posixshm tests: Fix occasional largepage_mprotect failures List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 321e586e46115c69e7e833d592703d997a4ec477 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1641232882; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jc+GxJTrIVIUIKtqKcgjvRvRadm6N/Uo6eKvalEbiT4=; b=yaBehthTYI2KpYgw8587fvC42Vb2gxcxJOqPJAHep9Idbwa2QPc0n96/mljrfKt3DKReoi 3oqAsJfZA3bxo4s4l+qSb9RaMSdEnfP/C80ddi+RDTAlgTeFW/sk7v3fbcclQl/Mk3zPIE CRns/hv2vKNqFbmqQE9fngCCk9HvIywusWLaokGmplZNcFKipTIT69bNIPSl1smTB2mIdX 1J0Lrxifehqz4PFYdqLU7LxZfalDgwiB934YLT7s/7LBrwMlij7pL1g8oI9TR+9TfBg0Pb XsOKY7FraBlMQq6MLbVVPwrfzzuSKHko2aTmS338Ju5O5x0Ds3FELTm1YifSQQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1641232882; a=rsa-sha256; cv=none; b=CpAs8aJ+gqFuZ/zrnj7XhQP/Mi+QW5pbqUO2i9loLKlRLxEM4T/lRvVezmZlcMV/qbp3z4 UloSt23G9n1eNGMQWNUAlclN/YLuJhKIpCVTvZsZn1xVbqnqf6bL05qFF3QVNqpb2ISU1s vqn6T+P7cwU/wiiKQoj+p7CkIzmG3487zBlkO5AunmgojrQ0eXNR5o5RlmYHvVuWvnmjdX /EttY+9hXTdrudxmE29Ba4ASAZau25ph19de2KNary7Y1yuqcE4TWAawoTal44Ajk53M3w krP9/eXonkPmDMPmXguho1PqKcyk4EjZvgq/48l0azZaGdHkO3D3FbboLCwDew== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=321e586e46115c69e7e833d592703d997a4ec477 commit 321e586e46115c69e7e833d592703d997a4ec477 Author: Mark Johnston AuthorDate: 2022-01-03 16:15:46 +0000 Commit: Mark Johnston CommitDate: 2022-01-03 18:00:50 +0000 posixshm tests: Fix occasional largepage_mprotect failures 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 --- tests/sys/posixshm/posixshm_test.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/tests/sys/posixshm/posixshm_test.c b/tests/sys/posixshm/posixshm_test.c index b460639ba647..e3a4e55b3704 100644 --- a/tests/sys/posixshm/posixshm_test.c +++ b/tests/sys/posixshm/posixshm_test.c @@ -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);