From nobody Sat Oct 01 16:13:26 2022 X-Original-To: dev-commits-src-branches@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 4MfsbB4HR1z4cvlG; Sat, 1 Oct 2022 16:13:26 +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 4MfsbB3Z0Kz3wn3; Sat, 1 Oct 2022 16:13:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664640806; 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=qeyT2sp8OMGo9q0nt29hUZy9vUa7WTOK3WkzI/3qskQ=; b=hNLDJY+lZsCOMpOXiQxS20K+RHKhH2tt+ba2qbjJk2PnMo16QKSgz3+w5v0JBU1K6CkgA5 2NPTDVx6pTmQkSUHd+/6iOUk6YrsCfvcWQa1hEJyH1buuhkOo9PZ5v4qj9qHEzCcl1lSI8 vawTRs5dqlWIW0ICVbXlMe69aJDAPtPe1ILtmH9K4Ceh46jNedX0Wtvsrj5WW+Mo5woj2a E1q8pERBcOsDQt49eI29VskyomObI2qAbWhCPMJJRjt/ayKWxS/6jDD3y1Q/pA40+K63Nk JrlkLG8EnTHmVOQwNYIb2lRgEzz4Vo3xu98sW90P5PTtJ8kt8uNav5xHwsdCdA== 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 4MfsbB2fpZzZsW; Sat, 1 Oct 2022 16:13:26 +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 291GDQqV048954; Sat, 1 Oct 2022 16:13:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 291GDQcf048953; Sat, 1 Oct 2022 16:13:26 GMT (envelope-from git) Date: Sat, 1 Oct 2022 16:13:26 GMT Message-Id: <202210011613.291GDQcf048953@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: fb448e37e98a - stable/13 - arm64: Ignore 1GB mappings in pmap_advise() List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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: fb448e37e98ab7930b2b8e8bcbd79e6756c4aacc Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664640806; 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=qeyT2sp8OMGo9q0nt29hUZy9vUa7WTOK3WkzI/3qskQ=; b=fqJ6F/3nBEjXPsd/iQ7OhEj3aC2ZehdvC9gA0krdx1qZPikKGgJcjFR+I5qB76WWIdlBlz fQdOdtKNZ87PYXJJbFIK+rtdn6Ml22lFd87XjleClzlXRUucl0JivrfLjB+Mb1bHcj1wMS JRY4hzYZIWJyuYv7MwS2DfNbCUcSP9hbRSbfdHqr9EQBJoCGtug3B3x0J2yq8TWbyZSbtK VQyel6fwjyyCzFd6BHlOCZWyzU0EavyTEMNrCVzHxvmLQ1PndYVS6G5sNn3Pk398jNCw98 93kHDqVvuHhOC4u+gpJine3vNlSZT0afeNTHMnMxw80o/TjxmkVZn7GSLLANdQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1664640806; a=rsa-sha256; cv=none; b=w+UHcF6lTvi41eYGbdfgqsY8j+hoKoOENI/lGUXhAkjhgxL8Oag7C4MYvAQv6OCqDadSdE 65fTC1uiEiywU+YDPp6n1sRV6K1eV/LxQQA2ORollhnERg0+l/Xq6eIa2vnfBKsUsMKymK w6dznzFTvAcf0fWqZKfCOvjQDimL2lVjm+YJkVoqjX2vsUlqRFJ4RRvVi7k5n8CJIzZRhH HSyEJyAIa4fW0XiPAGrjyMnWa/rIew7FjIhta0XCsyfdC6wj89KvenqBUysRiTk4L6V0aN aCFZTKVgaZf6mjksSCwVxpthI1nbTSFpPwlga7Tw4ykumKMDnNFC35IPFCToyw== 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=fb448e37e98ab7930b2b8e8bcbd79e6756c4aacc commit fb448e37e98ab7930b2b8e8bcbd79e6756c4aacc Author: Mark Johnston AuthorDate: 2022-09-24 13:26:54 +0000 Commit: Mark Johnston CommitDate: 2022-10-01 15:34:58 +0000 arm64: Ignore 1GB mappings in pmap_advise() For the same reason as commit 4c224f8e5f36cfad5a9af8db7c7acdecc3d4c7b5. (cherry picked from commit 89a2ef4d5226135deb89cececdf32d55812d84fd) --- sys/arm64/arm64/pmap.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/sys/arm64/arm64/pmap.c b/sys/arm64/arm64/pmap.c index d76376a96e56..5dd7c11062f9 100644 --- a/sys/arm64/arm64/pmap.c +++ b/sys/arm64/arm64/pmap.c @@ -5920,13 +5920,8 @@ pmap_advise(pmap_t pmap, vm_offset_t sva, vm_offset_t eva, int advice) l1 = pmap_l0_to_l1(l0, sva); if (pmap_load(l1) == 0) continue; - if ((pmap_load(l1) & ATTR_DESCR_MASK) == L1_BLOCK) { - KASSERT(va_next <= eva, - ("partial update of non-transparent 1G page " - "l1 %#lx sva %#lx eva %#lx va_next %#lx", - pmap_load(l1), sva, eva, va_next)); + if ((pmap_load(l1) & ATTR_DESCR_MASK) == L1_BLOCK) continue; - } va_next = (sva + L2_SIZE) & ~L2_OFFSET; if (va_next < sva)