From nobody Tue Aug 23 20:46:58 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 4MC1Vp4Dsqz4ZFkM; Tue, 23 Aug 2022 20:46:58 +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 4MC1Vp3px6z3ZKq; Tue, 23 Aug 2022 20:46:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1661287618; 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=WTaqCjA/Reld0f46wbboHeFMNjTR4PgbOlb7D3gskRg=; b=rWmMsObaH9dpnGdrInlfeRO1II485mvxC752+fXRWDQtF4olURFYIBEt1OfrlpYQ2DGk7u G+EOMBJQM1duIutknStFGhlveSbdrz7V+590sz4tu1cUGxCsZ2fNLCmqvPN/aenuN5EpUn VRzEzbbL7cGG9UC1IhC25kAwoQR+UF+Mahb8REwcDsunWXFzwakEfUEeXbuDitK+l4wnym 9efMuVdLXjWzIA2ykJqm7AP+jRtJyHNw1Y/qSXdAk7n7xdch3EGQVSUxzIsDqsltCRIRO0 jNxDY8kdNb/nbWSX5orK4XVTFqZ5q4akRLEwShFNhxdZUAF7SPoly3jzd+PMJw== 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 4MC1Vp2lVBzk7R; Tue, 23 Aug 2022 20:46:58 +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 27NKkwHK049368; Tue, 23 Aug 2022 20:46:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 27NKkwTE049367; Tue, 23 Aug 2022 20:46:58 GMT (envelope-from git) Date: Tue, 23 Aug 2022 20:46:58 GMT Message-Id: <202208232046.27NKkwTE049367@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: ff481f220232 - stable/13 - Fix shared_shadow_inval_test when superpages are disabled 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: ff481f220232db52b8a85c298d04a349f6980c3e Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1661287618; 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=WTaqCjA/Reld0f46wbboHeFMNjTR4PgbOlb7D3gskRg=; b=ZTmv38gIMtyprFpaDOjvC9ICjilo7kynjFjw5g5rK9XSXrUuDSRxDhtKmnY3LFxwU0YiUX iHibiTz5XRjDacrvBM23QhF/YVzzbA0SxSm0gwVBjqaa78FwS6SxCn4b2XYTAsAjJWAhba IdUWrGWM+zJXjoNlbCUMPsXzqobVs+cUQu1GKXNoAcwDDJTBeQPX2OYn9CQGVuiegjuKAT paY8R2MlHwy+UPhXu5ziRb1ANo5mgzQOVnKQy/8tOtBMNvq5xyodIV85qxa5WLiDWqFSfx JttMq7ob6UbdxKvi6a1T2qqAd7pBskRgZLAGkm/lgUxGhiU22/7jimlvZ8baCw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1661287618; a=rsa-sha256; cv=none; b=gubZQcTmuXukfYCjRgR0+DhgndlPlXXFVpZz3E8OyynbNKcDZqhViQxkLEJFF44qFoQ+H1 ZeI15mSXJMwsM849J4wkBlYLbM+Winuy2F2Hs101BiiQT/QRX24sk5yVSXfmrgSZUmzpky 0uT6NqCAPutGmFj3EWWZWNSzf0zqCaD++V+DgMKiEzyg3Vr2q7ELWVZ3QQa+1xur8Rpxn3 kqZ4Xkpamu/Ddf+DGyCCEubZ+i5Fu0CoN8wTgPlscfjEa08Ufesa2ogKv9vIx9CxD/gCH/ HIROvhlZOD/N5GoRcNPqoDwvwX9MEstueXCSxsXN0VTBZ43vjxLF2liXV620cg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=ff481f220232db52b8a85c298d04a349f6980c3e commit ff481f220232db52b8a85c298d04a349f6980c3e Author: Eric van Gyzen AuthorDate: 2022-08-19 20:05:19 +0000 Commit: Mark Johnston CommitDate: 2022-08-23 20:15:49 +0000 Fix shared_shadow_inval_test when superpages are disabled In that case, there is only one page size. Reviewed by: kib Sponsored by: Dell EMC Isilon (cherry picked from commit 3d268c19efb8b47dde1b5ac5bd367f2ff2d75c12) --- 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++) {