From nobody Thu Oct 13 00:51:20 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 4MnrYh43Phz4fVtm; Thu, 13 Oct 2022 00:51:20 +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 4MnrYh3cSYz3FSx; Thu, 13 Oct 2022 00:51:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1665622280; 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=+POF+cotP2vo04dKnxddPwUrT3A+Gq5kJEoWafMfLWI=; b=poPyemgJ0EsyqT2mI7urYmP8sl9nJZ6Svv6KQG7kCAMpef0mZoejSLURtg82KyV9ViJgZC i/7ifcqXV10OWkS4ieh2Qvr6wtS/NUtyPfsHdJW2GaT6d1vExOED2Cw8mLYGCHi0KWqsKU wBcZa7zUi32cc1X+l99HcvUC9A2ts+Ust+Xze4bzf5U0Gjsb3npgi5aNHqZNRqgrmvDGH0 EuZMUoSAhIwkVKtmadbTYyYxcu8GyrOVR6w+GHnhNAFlKLXt8bBmG4rmBd4SVpUshuAkvu 8vEZ62LqE1aPHO0rtitfWhWpafzYjxV/V7tl1/Fk+jA/Xl/VC86O2InkGwRZdA== 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 4MnrYh2hJszFkN; Thu, 13 Oct 2022 00:51:20 +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 29D0pKlN015049; Thu, 13 Oct 2022 00:51:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 29D0pKBm015048; Thu, 13 Oct 2022 00:51:20 GMT (envelope-from git) Date: Thu, 13 Oct 2022 00:51:20 GMT Message-Id: <202210130051.29D0pKBm015048@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: 4539de92bce9 - stable/13 - riscv: Handle invalid L2 entries in pmap_extract() 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: 4539de92bce9afef8a041a0c6b6a1a078a49fe71 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1665622280; 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=+POF+cotP2vo04dKnxddPwUrT3A+Gq5kJEoWafMfLWI=; b=QzfVRw3lYjt8My5SOF2TsmNh1xYR7gTboozRJubjgD8Q7hbQ3ooZ03Si+XPoh4v0cVvS3/ dC4MvFKNC5CUa+aT6x4MzbgyuqHwGc7TeLzXg7sUokum6lX0r3GcxuTKA6ydToYEsxIOrB XsXg7OC261weHDppBz1is3uuOh7lfZJ4wKgeLQrpzdp/SPr2CVfv8Ru5ZZAxpVKRx4KNxy vXwO115Ww7JrL0vZvcEqba5YtE5cckNta4bvBgrfvmraIDLPaIwlS29OtOoRPax1jDDW3w KpDavq9lnaZHMd/UZPo5akx/YAc+i6A8/JELfTbTcBVmY/VAOeBpeVx2Eape4w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1665622280; a=rsa-sha256; cv=none; b=txRMuyl7E3a9lR3dWzsRIRaXfIxedEwtRc0fwgdz6zhuLkXDUlZeKnvxi3QAWiRKM9+WiS thO0bg7r0zgXPD0FJAmjDY3rr8TihkYgAZwK0+P00WELeOrVwVxH8KhwcMC0250PGZOoon bH3+T5/yyjIo4rTlIarQ/ZctbCeyNcc7rsqbDrbxYuLYrnRbfVazO9gxopCoKNErbOg63t j+3GI1Kvzk7cbjr2hqakVxXEYWGpvZvyz3ishADi+RHIc9Qu0r517x5Z43nsebRPiShzaA BwQMGw8jEy5DUHm/5D4qyrS7e+ftRgWVwD8iGBl5ueJJBd+d/fQsI5eNHWAezQ== 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=4539de92bce9afef8a041a0c6b6a1a078a49fe71 commit 4539de92bce9afef8a041a0c6b6a1a078a49fe71 Author: Mark Johnston AuthorDate: 2022-09-29 17:07:26 +0000 Commit: Mark Johnston CommitDate: 2022-10-13 00:44:03 +0000 riscv: Handle invalid L2 entries in pmap_extract() While here, eliminate a single-use local variable. PR: 266103 Reviewed by: mhorne (cherry picked from commit ec21f85ab5f03a803884cc7bafa88621c613f4ca) --- sys/riscv/riscv/pmap.c | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/sys/riscv/riscv/pmap.c b/sys/riscv/riscv/pmap.c index 412c2484f1e8..e925beb91c14 100644 --- a/sys/riscv/riscv/pmap.c +++ b/sys/riscv/riscv/pmap.c @@ -903,27 +903,25 @@ vm_paddr_t pmap_extract(pmap_t pmap, vm_offset_t va) { pd_entry_t *l2p, l2; - pt_entry_t *l3p, l3; + pt_entry_t *l3p; vm_paddr_t pa; pa = 0; - PMAP_LOCK(pmap); + /* - * Start with the l2 tabel. We are unable to allocate - * pages in the l1 table. + * Start with an L2 lookup, L1 superpages are currently not implemented. */ + PMAP_LOCK(pmap); l2p = pmap_l2(pmap, va); - if (l2p != NULL) { - l2 = pmap_load(l2p); - if ((l2 & PTE_RX) == 0) { + if (l2p != NULL && ((l2 = pmap_load(l2p)) & PTE_V) != 0) { + if ((l2 & PTE_RWX) == 0) { l3p = pmap_l2_to_l3(l2p, va); if (l3p != NULL) { - l3 = pmap_load(l3p); - pa = PTE_TO_PHYS(l3); + pa = PTE_TO_PHYS(pmap_load(l3p)); pa |= (va & L3_OFFSET); } } else { - /* L2 is superpages */ + /* L2 is a superpage mapping. */ pa = L2PTE_TO_PHYS(l2); pa |= (va & L2_OFFSET); }