From nobody Thu Oct 13 14:09:56 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 4MpBH90tCYz4g2rV; Thu, 13 Oct 2022 14:09:57 +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 4MpBH905wQz3KgY; Thu, 13 Oct 2022 14:09:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1665670197; 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=LZhAOTrFkIZDx0LxlqtZbXkxtZVSvyB6qgCfOXz1wpM=; b=Xxb+/eOMpdw6GqVU+eaXjYeNDevPExuOGrLskJmRFM2MIgpOq1BfvWZThqkpwhS8lELbCG uxRC6LHBtoo5+TUh1LiKTwZxmB67wZZjX3X1guGv713XK4cfB1fxDRtwlmVBMrqgyjK5Ly +msFvHmfWeRGqZReFccMlNGKHlU4b1qv+3xBMt7nKFx/+uEmPq7AFykuftu+89liiBCs1v GZq2Xjpe698XpTmxVb5wlaQBLeChMLaOGI0mOIZMfkJnle0UOvBkunhBXUyLoE7oqcdB8i WesRUppx73J3pUKQLQ6PwbmszIzYWyN5FD8FuzIqnp/No5v0a2I5Tab8bhPWzQ== 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 4MpBH868qrzRYg; Thu, 13 Oct 2022 14:09:56 +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 29DE9unP099356; Thu, 13 Oct 2022 14:09:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 29DE9ulr099355; Thu, 13 Oct 2022 14:09:56 GMT (envelope-from git) Date: Thu, 13 Oct 2022 14:09:56 GMT Message-Id: <202210131409.29DE9ulr099355@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mitchell Horne Subject: git: cffe8054a61c - stable/13 - riscv: add an assert to pmap_remove_pages() 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: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: cffe8054a61ca435256f8fe2498ad14d2f61d570 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1665670197; 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=LZhAOTrFkIZDx0LxlqtZbXkxtZVSvyB6qgCfOXz1wpM=; b=StyTy/dkO5eiz8Ztdi4Qd5/zGxTFDdmOEPAs83fkaaPFNxqDFs+sShqzNUHLumb6DU1dQo SsVpjgN+KaEIIZfP6hsVKrTFHvm/NC46QDaEqq17/e518m0y7GiFKys6WIZ/pHVNF256Ua 4fX6j6Zh2CiBoVpeOo9AQYQK3LKGWJ0k1PqLKcP1OtFeRXIIvwcPZdOXUrhpJ90ORYLg2h +0f7uy3BSUX+TJjrCN/gJue61Peo+ViUulhUR00wVDiCueV9XDni3ftZCJZz9/W/g4uUHy R72S3/ZBwvqHJF0um/eDmkrz+sRo4kMRyPEKepKlY4iTv30sUXcRZ/Xj9V+eNQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1665670197; a=rsa-sha256; cv=none; b=iuE363WLv0FeiFKFswBSnm3G4fIbfGNbmAGQ3nxJ3MqCNdjH5EFNY8axTYG4+VK+c+p/uH jIOX70i0IJLbfANQtFKGY/SR4s+3MZiFr1yUyFW20AZMOiQazPpupy6IhuxpoMUmHkWH92 faQ0WJ3ahCaIXwaGZHQpYjczHF0ZzmwoyMMSbziTXMFrcXlHoJnaTkP8PJcZmemZS3zea6 6qbWaAei6Fe0oMo9Wbrf00/qNxBalloWgRy8CE169Y+qqcv4qjKLQYV2MDq1b8HwDyn4fB eiAd6+cfzFEjp3Cf7cuclKpKR05zTuKg8kkRMp2AzER0d6Ogu98FHBhxoyj4iA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=cffe8054a61ca435256f8fe2498ad14d2f61d570 commit cffe8054a61ca435256f8fe2498ad14d2f61d570 Author: Mitchell Horne AuthorDate: 2022-08-25 20:08:20 +0000 Commit: Mitchell Horne CommitDate: 2022-10-13 14:05:21 +0000 riscv: add an assert to pmap_remove_pages() Similar checks exist for both arm64 and amd64, but note that for amd64 it is a bare panic(). Reviewed by: markj MFC after: 1 week Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D36564 (cherry picked from commit 99fe523778af8cd0db3a17b253adb77a980176be) --- sys/riscv/riscv/pmap.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sys/riscv/riscv/pmap.c b/sys/riscv/riscv/pmap.c index d72b989f8f38..a3a26a8a883d 100644 --- a/sys/riscv/riscv/pmap.c +++ b/sys/riscv/riscv/pmap.c @@ -3908,6 +3908,10 @@ pmap_remove_pages(pmap_t pmap) ptepde = pmap_load(pte); pte = pmap_l1_to_l2(pte, pv->pv_va); tpte = pmap_load(pte); + + KASSERT((tpte & PTE_V) != 0, + ("L2 PTE is invalid... bogus PV entry? " + "va=%#lx, pte=%#lx", pv->pv_va, tpte)); if ((tpte & PTE_RWX) != 0) { superpage = true; } else {