From nobody Mon Oct 13 16:13:47 2025 X-Original-To: dev-commits-src-main@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 4clj8C51gzz6C0rF; Mon, 13 Oct 2025 16:13:47 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4clj8C4X1Hz3w6h; Mon, 13 Oct 2025 16:13:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760372027; 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=YbHgvFOVpTDif15T5z3rDT6Gczqq9rrya/RgasX+zX0=; b=MZCxqMF4lnuAX1ZsJ/q6bopeSoRVSN6vBMkZyTFlENpNktFGGW9MJZlnG9Q6lunjovSNuR h++WBNsH14Fl9bSq5rIbMcnNF3Q+OhBRBrRbO3/BRS/w8WGcsJ1iCGSuVkyzEeaSsPSJ+C cT9LWYeuFYDpLvycAc8/D5EYaKJCFP44BW7gGew95HFcL4uJLiqVahFp5Etd892GbigZJb j9yfyi8Kx+SdOh3EsW4AJKBzLH2QM9T5N97O2I6Al569AiBbx9ElIL/YTyDWp21qAfLPSZ m8rTCZ17G43kW5C7mqOAY4IQ39J37ATIe4As4JYhN+VmtUDlVk+jJULMGQZfKg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760372027; 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=YbHgvFOVpTDif15T5z3rDT6Gczqq9rrya/RgasX+zX0=; b=pK51ZCFG4oTPAqOqKLYdJSdABbBPIAPuh60pIJMi6m0/6xwOiZR6hn4VbGapN4zzwgb7EI AO8VwhFJMWBif0LnzWJGQ+G1drtDOI4orcZoHV9smpVFn0RNtsIUf03eqYTOGrEKXchffL vWW4gHLpHCx3vxN4pEdHXttcp0wpFBfgLAh5pz2N28EpK06s9qTdflQ4eIHZGfJmq6qiH/ siGOrnhXbe7oDgyHoixQPZ22Ry4HEvjBGnU76FX4jjNjZBOSanuKXWD1baOUIWCrcFzoEP Qu5lyMZMFez0jTvD2MxBNdkpuhzHslE3vaH7o/zwdpNbj7dKyBIaKQu6cEDXIg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1760372027; a=rsa-sha256; cv=none; b=u25dJwh5dz0Xd5zq+7dA4VUA6i46UiXhDxTtsin+LNzVFlOWawc9ZlwdpVb7Srduw5Bn1i +JfADasOKKa3Ibr1+6DfV3dRTo9aLwaY3DmlCWB3LMmBYPVt7G0kJl7NAE2YVJ+LFX11zA 7Wr+InmIJZ1+Bh9uaUmTHFovA8iZEF97l/7GgF+JJy6QKySEIso6hRatXrzdNHvIBTLwwS iM8Sna6z+pUInuRzBXDeMjeUW5yMhrXPhURdbgsZOkB1R/KXQKM/5Ihy3mR1w6bQYWA1bf /3ufo/yAx1FdxBAu6OoKh3aUyzyBEhy5fAz5X8Vi/x6jOSZTj88pWSSOCSCG7g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4clj8C3y98z9g; Mon, 13 Oct 2025 16:13:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59DGDlP4043395; Mon, 13 Oct 2025 16:13:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59DGDloi043392; Mon, 13 Oct 2025 16:13:47 GMT (envelope-from git) Date: Mon, 13 Oct 2025 16:13:47 GMT Message-Id: <202510131613.59DGDloi043392@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Chuck Silvers Subject: git: d5cfca008d63 - main - mmap_test: determine page size at run time rather than compile time List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: chs X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d5cfca008d63b3b9220ecbb152a36efa80423c31 Auto-Submitted: auto-generated The branch main has been updated by chs: URL: https://cgit.FreeBSD.org/src/commit/?id=d5cfca008d63b3b9220ecbb152a36efa80423c31 commit d5cfca008d63b3b9220ecbb152a36efa80423c31 Author: Chuck Silvers AuthorDate: 2025-10-13 16:13:22 +0000 Commit: Chuck Silvers CommitDate: 2025-10-13 16:13:22 +0000 mmap_test: determine page size at run time rather than compile time Sponsored by: Netflix Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D52735 --- tests/sys/vm/mmap_test.c | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/tests/sys/vm/mmap_test.c b/tests/sys/vm/mmap_test.c index 6bc30f73ca95..27d02ae667fb 100644 --- a/tests/sys/vm/mmap_test.c +++ b/tests/sys/vm/mmap_test.c @@ -36,21 +36,6 @@ #include #include -static const struct { - void *addr; - int ok[2]; /* Depending on security.bsd.map_at_zero {0, !=0}. */ -} map_at_zero_tests[] = { - { (void *)0, { 0, 1 } }, /* Test sysctl. */ - { (void *)1, { 0, 0 } }, - { (void *)(PAGE_SIZE - 1), { 0, 0 } }, - { (void *)PAGE_SIZE, { 1, 1 } }, - { (void *)-1, { 0, 0 } }, - { (void *)(-PAGE_SIZE), { 0, 0 } }, - { (void *)(-1 - PAGE_SIZE), { 0, 0 } }, - { (void *)(-1 - PAGE_SIZE - 1), { 0, 0 } }, - { (void *)(0x1000 * PAGE_SIZE), { 1, 1 } }, -}; - #define MAP_AT_ZERO "security.bsd.map_at_zero" #ifdef __LP64__ @@ -68,6 +53,22 @@ ATF_TC_BODY(mmap__map_at_zero, tc) int map_at_zero; bool allow_wx; int prot_flags; + size_t pgsz = getpagesize(); + + const struct { + void *addr; + int ok[2]; /* Depending on security.bsd.map_at_zero {0, !=0}. */ + } map_at_zero_tests[] = { + { (void *)0, { 0, 1 } }, /* Test sysctl. */ + { (void *)1, { 0, 0 } }, + { (void *)(pgsz - 1), { 0, 0 } }, + { (void *)pgsz, { 1, 1 } }, + { (void *)-1, { 0, 0 } }, + { (void *)(-pgsz), { 0, 0 } }, + { (void *)(-1 - pgsz), { 0, 0 } }, + { (void *)(-1 - pgsz - 1), { 0, 0 } }, + { (void *)(0x1000 * pgsz), { 1, 1 } }, + }; len = sizeof(map_at_zero); if (sysctlbyname(MAP_AT_ZERO, &map_at_zero, &len, NULL, 0) == -1) {