From nobody Tue Aug 23 14:13:59 2022 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 4MBrnN1HGnz4Zly7; Tue, 23 Aug 2022 14:14:00 +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 4MBrnN0m26z4GPC; Tue, 23 Aug 2022 14:14:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1661264040; 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=3/9QUy4Qjb1knhZB0fiPmVN9De9SWIVrP/D/amUvNI8=; b=ATTEnzJt9asb+dZ6TlCNmVS0Am6zjdBo5A9+XqshxKL/ebs23o1DbIckhPzwhdd5nqnKxm ES2IfS3H8nTzqhnpvho7x6NBzlGn5Tj702lzMGn1le6WmASnIswj910+sGmTkb1xIIKU9C 0ZLb4UF8gJxe+UQnstxmOdEAcKn0bK7WqVf5JrlE6byfhm9v24UhYUEsrTsJHvCWqxnlnP 5XY/1U9XirOayuzUwRAmYUjUZ+ApmvnJ7ueQZbKAv/PLd7DBEAoAxWSFqLPVHUVUVs+8D5 iQYLTVR54aF//aQZ5rYFVtFinjk563uc2mTIQnTbChEo61P4qPrt8mPgXnEtgw== 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 4MBrnM6wWMzYG4; Tue, 23 Aug 2022 14:13:59 +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 27NEDxFV000187; Tue, 23 Aug 2022 14:13:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 27NEDxlR000186; Tue, 23 Aug 2022 14:13:59 GMT (envelope-from git) Date: Tue, 23 Aug 2022 14:13:59 GMT Message-Id: <202208231413.27NEDxlR000186@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Eric van Gyzen Subject: git: 3d268c19efb8 - main - Fix shared_shadow_inval_test when superpages are disabled 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: vangyzen X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3d268c19efb8b47dde1b5ac5bd367f2ff2d75c12 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1661264040; 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=3/9QUy4Qjb1knhZB0fiPmVN9De9SWIVrP/D/amUvNI8=; b=xRzkU9CCDfNTt1A/8HeysNTBmuajWpAwiP2GTBreXT3fhMBJVmlmzO15ajb/p+i89j6Ww5 rohAoaElyHbTbfQSaty6Qg9ps/oY39tM26Oz/G1NDOjbGTatS1o/CpKUxShX16ENypL3yF 0ZJbfizwqZ5oq/qzfc9uYDWINLiGot+UZ0ebi9gKmbUSPBuAGLzpsGPhwod09gwkVq0/9R HinZYK2e/WVCzx/np+JuyjdsAshTHAh+kIcwt/gv9zL6Ykq8c48gv+x6ktrTokqiFNJWfa pzuKhPepfkz4jeQn9QBKf/kfhVjSxmphhG80f4Ad4/N+ikCs2JPNRi+F9wN2lg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1661264040; a=rsa-sha256; cv=none; b=wc9Uxt9Elm38XDmDHbP+ApIpT4lVbO5A3eXwDzgSOrevdwzUr+yu0PRsPvb7pA6iSYK9bz tFud7rQIj40HzEaMzUm1GFBFRim7lgTYTVPl5hPfozMZmgmNo4Mv+ElSmpJgQDaxDxQ2Dv RJ/ZiHOGR0cEonLAVHUfiKFzRBPCx77aDZQ49TR0CTbrzjhB2NBGqNCS/8DGYoiQSSp6FX Dz+R7/lIrtirak2ptdwU7dY9egDKkKs8ntnBFttbs06Hdw/yFxxzYoGCMx+5gy3xFHZhR3 McETtW2qxz/Oh71EexOvfwZf1LHVIwd3sxonUMF/+iedt6sEPA4Yf4Z+FEpwjA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by vangyzen: URL: https://cgit.FreeBSD.org/src/commit/?id=3d268c19efb8b47dde1b5ac5bd367f2ff2d75c12 commit 3d268c19efb8b47dde1b5ac5bd367f2ff2d75c12 Author: Eric van Gyzen AuthorDate: 2022-08-19 20:05:19 +0000 Commit: Eric van Gyzen CommitDate: 2022-08-23 14:12:51 +0000 Fix shared_shadow_inval_test when superpages are disabled In that case, there is only one page size. Reviewed by: kib MFC after: 1 week Sponsored by: Dell EMC Isilon Differential Revision: https://reviews.freebsd.org/D36265 --- tests/sys/vm/shared_shadow_inval_test.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/sys/vm/shared_shadow_inval_test.c b/tests/sys/vm/shared_shadow_inval_test.c index 6a1e693d3455..8cd986b8ed99 100644 --- a/tests/sys/vm/shared_shadow_inval_test.c +++ b/tests/sys/vm/shared_shadow_inval_test.c @@ -365,7 +365,7 @@ do_shared_shadow_inval(bool lazy_cow) ATF_REQUIRE(sysctllen >= sizeof(size_t)); pagesize = pagesizes[0]; - largepagesize = sysctllen >= 2 * sizeof(size_t) ? + largepagesize = sysctllen >= 2 * sizeof(size_t) && pagesizes[1] != 0 ? pagesizes[1] : 2 * 1024 * 1024; for (unsigned int i = 0; i <= FLAG_MASK; i++) {