From nobody Fri Mar 3 16:25:04 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 4PStc159fsz3w5Bg; Fri, 3 Mar 2023 16:25:05 +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 4PStc11Phpz3hfF; Fri, 3 Mar 2023 16:25:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677860705; 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=XKl1cM1RKhDnC9zcqAUb8YTx2T10iMEt58Ee5x5pD1U=; b=kY7LbprKwWWWs+BLmu+isIsGG+UeetzDzIl7PKFQ4AYLJJp90hSc1GyXtwSTF2lJ991IPN 4ELy/cfNiSWW/y2ugXBHKRgULWOAQI+zCIhmlQ4RDLSX/2msgd8RshreYj0EqWYz//19c/ 2BIT7/O/0MKUJguPYTL9lw1uhJcWh4B47gjQbk5Qxo8FgF+7p3cx+6Sk8+ZC/sGYlqCVRm 5BSvjvbgxSdKP/yMiavvRbuKWDX30raO4hMYlvPd02cUc5J+Ni0tnwdPTQ8IrURHmANTvl 0kTdyoxya7zpGnfjLCScT6k46U0qHXyw3OWbhVQWTg6RAk6mnUcEnK1+XDzTJA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677860705; 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=XKl1cM1RKhDnC9zcqAUb8YTx2T10iMEt58Ee5x5pD1U=; b=P9xxYS9X85Qknq6HS2XGMiQazmWRTsk44EoRcCJHqC7ZkYu0rghN3dULuALeokK7G81gUB w4HKbP7OU8+SYUXuYOIxthPtKCvtiKYdYAZl9wAV119btLyGkizxTAH943C1xuwp+tE3Y0 wzA3T7FHqch3KkgyiPbrovJT4sEPFnoMmX0FUhhPPc2OJrHPuIfdH6FXuzWo90FQafQqlj f7VjNDL8WKEWLBoyyLHT3lo8ddtOkFJgm+G3g9TxCg5/4jYvHBG/D6uSaFzz8M+1xznINq 5jbrVkGz+joquITBMX5FrsvLcN4mHXqggudPht2L81TFZ53HSltz3IPrG852aw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677860705; a=rsa-sha256; cv=none; b=Lk4Zvb0p0qfXVHyFMkE+CdwZZJUwW8PXegP0tmat0tB9hs0DHXjesDS9CajfwgH/WXPcan ZcsjadkKi191zHvHjF6lR5VfWU/zo1U7ytTknjjXM0Zb4iUagP5biJSo+UnDRPpX5vRuc6 biQN4TXzzSsJJSRHZ6a/rfAHKZH3uIkcfTeHHJSzGRHwh7oE74SUjkywv4duhspquJYznI gkuaC9I/BcCNt2+9nqypktdKj4X6/Sl9hStLWueTUTgLIBHSGiF/dYY4lbyOj23SlmUmx3 1HV+oY5358BbEDLVphOoJi8qw7S7caG6H20bKqMKgtRguabDpuHvcNxCbUZ5JA== 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 4PStc10Sq3z14KW; Fri, 3 Mar 2023 16:25:05 +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 323GP4nK016969; Fri, 3 Mar 2023 16:25:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 323GP406016967; Fri, 3 Mar 2023 16:25:04 GMT (envelope-from git) Date: Fri, 3 Mar 2023 16:25:04 GMT Message-Id: <202303031625.323GP406016967@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: 560f9cd5e1e3 - main - 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/main X-Git-Reftype: branch X-Git-Commit: 560f9cd5e1e36ba725f3c677d7b8e514af9f3a85 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=560f9cd5e1e36ba725f3c677d7b8e514af9f3a85 commit 560f9cd5e1e36ba725f3c677d7b8e514af9f3a85 Author: Mark Johnston AuthorDate: 2023-03-03 16:16:21 +0000 Commit: Mark Johnston CommitDate: 2023-03-03 16:16:51 +0000 posixshm tests: Correct page size index checks MFC after: 1 week Sponsored by: Klara, Inc. Sponsored by: Juniper Networks, Inc. --- 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 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,