From nobody Mon Mar 13 15:53:23 2023 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 4Pb1Qr0gSJz3xs6k; Mon, 13 Mar 2023 15:53:24 +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 4Pb1Qr01Lhz47R9; Mon, 13 Mar 2023 15:53:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678722804; 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=ZKz/n54JfqHeEVUIAnM2uMT3wMBTHBUL1feorQw3W0w=; b=VIQN2pq1DUyKEsCMeUj9qWrEpPj37qxQrthul7bViyk1iA3GEcz9A/MOSclislGOvOPacS 8z2SIi71vM+Wu18oI/1l6aZJTosWeA4im5BK7Tze720Xtq39tFuEEnH1X2i0K0ewL0DtaN BI4mrejEyqVVCRiS0vm28f99uFt46MaTxmnV5oA/ttVXcpr5nVaTljzCkTW2IJTxMhx6UP 3TWV//tWD3Rr3l2UgBPlVMY5dx0rrlyiU7CQMNrkdnzMo66OyQQ568k3H97QWGtz+Y1yQK N3NY9cWY1RhuNA2WUxCppFeezzLdgZzT7L+IFCsegGWWIxv9nIj96xDXo/X6IA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678722804; 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=ZKz/n54JfqHeEVUIAnM2uMT3wMBTHBUL1feorQw3W0w=; b=tFASZ+DbOSVnjjRslRfWBOnF0NjMF9G2qB5tvy2Bs6rU3HdVvt1TZ86z15m8iTKGpHZvtd MfcoqthHAwFDlwECk5a9C/tYRiKwBI8rnkZXGRMw4h3wUCKX4Njj81I32zMtWc3B0nrgMd R9Tr1uqAz4n29iU1Y59V32/AQ1P6+sK/jkq5Jgd7WH9PX6oYxrnMGhmwwD9x2w3J4Vz4PI ofjDPezShuv+Mr15GOiVKZoNy4WNeq1IfgyS7X+z0swtot1hKi7tDInOG7f4VDgXTsvZrc M2FXW5ucBNyKgLiF2jIpeh67JqY4+l6ta+7fR4s1Fl7LjI+BlPcb5OU/ttveRw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1678722804; a=rsa-sha256; cv=none; b=YQ9YrEuFAkq48A5CA34CCMYuWlTDfHnVkPJe1MuMxvecrzUzRkDBQsyoZZhid1uAmUD4Kh mkezK9HD/yz9ea03HkcrCI+Q9asNyIcvaJzNaYR7agf4nsaxiLpKtZuEoDO5rYz86/Y33R 4cJPAGQlDyAUPoLU5Uu5CFW7KNFLfu3cqa2X0b4vkedCoX+uxJ1l/AtiXNCiwoLu/MQIgn RTVhFICzCjBJsBsl/ymdnJbvJdRNUO3bzBpUxm4qnFQdrzRyBYdTyowUMKKL5DrG4GMmDS 3p/2PYNhWyyOwOI/YjTffYSGMB3SJs1Ab3PmosHxzr9wYyXsuUvhaiAAOD6lLg== 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 4Pb1Qq65x7z10DX; Mon, 13 Mar 2023 15:53:23 +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 32DFrNve039785; Mon, 13 Mar 2023 15:53:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32DFrNB5039784; Mon, 13 Mar 2023 15:53:23 GMT (envelope-from git) Date: Mon, 13 Mar 2023 15:53:23 GMT Message-Id: <202303131553.32DFrNB5039784@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: ee429a15e499 - stable/13 - posixshm tests: Correct page size index checks 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/stable/13 X-Git-Reftype: branch X-Git-Commit: ee429a15e49933e51d9c00a7e063815f59b4cc45 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=ee429a15e49933e51d9c00a7e063815f59b4cc45 commit ee429a15e49933e51d9c00a7e063815f59b4cc45 Author: Mark Johnston AuthorDate: 2023-03-03 16:16:21 +0000 Commit: Mark Johnston CommitDate: 2023-03-13 15:53:16 +0000 posixshm tests: Correct page size index checks MFC after: 1 week Sponsored by: Klara, Inc. Sponsored by: Juniper Networks, Inc. (cherry picked from commit 560f9cd5e1e36ba725f3c677d7b8e514af9f3a85) --- tests/sys/posixshm/posixshm_test.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/tests/sys/posixshm/posixshm_test.c b/tests/sys/posixshm/posixshm_test.c index f0784f7b8769..50cba2cf7816 100644 --- a/tests/sys/posixshm/posixshm_test.c +++ b/tests/sys/posixshm/posixshm_test.c @@ -1092,7 +1092,8 @@ ATF_TC_BODY(largepage_basic, tc) for (size_t p = 0; p < ps[i] / PAGE_SIZE; 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]); } @@ -1253,7 +1254,8 @@ ATF_TC_BODY(largepage_mmap, tc) for (size_t p = 0; p < ps[i] / PAGE_SIZE; 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); } @@ -1588,7 +1590,7 @@ ATF_TC_BODY(largepage_minherit, tc) *(volatile char *)addr = 0; if (mincore(addr, PAGE_SIZE, &v) != 0) _exit(1); - if ((v & MINCORE_PSIND(i)) == 0) + if ((v & MINCORE_SUPER) == 0) _exit(2); _exit(0); } @@ -1737,7 +1739,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,