From nobody Mon Oct 03 13:11: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 4Mh1Sr4LSFz4V3RW; Mon, 3 Oct 2022 13:11:56 +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 4Mh1Sr3pc8z3tj9; Mon, 3 Oct 2022 13:11:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664802716; 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=fJdaKjS3cXy1n74FhRg99ZivJB9+I1iN2uj/fY3FhUo=; b=FKmaD8mCpCHXeHYhBQU4L627JTzdHpt34UK+sULSQ/jD5L0DwL2inWVycXcnJWvK8CDnHx drG7eFVViWMgubxL6HZaQdR3VEF1eAmXrIh4JCWyZB7E9q2eH3SwJocI5Z0s/JA1oRUZW5 Gc13AUIxUermFLbj5sPbCBtEePcWJn3r8V1EvlHV9GLyvWRd0gxeT+/ewteLKhsjJzcfh7 ZxxZ6IhA4LmcTrp2wqR1+yV+a83BpOltpsKHGSKUNG+P/wq+W5TJu6nhFB2RcOsLHHRYr+ vPo8Thomrh1ZXyIjpywoLQR7g5td6/PlcHRXHBXcObX+Q4++Co4NpytHERjQew== 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 4Mh1Sr2sYnz1Cc2; Mon, 3 Oct 2022 13:11: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 293DBuq8009720; Mon, 3 Oct 2022 13:11:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 293DBuLn009719; Mon, 3 Oct 2022 13:11:56 GMT (envelope-from git) Date: Mon, 3 Oct 2022 13:11:56 GMT Message-Id: <202210031311.293DBuLn009719@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: fadf4e90adff - stable/13 - arm64: Handle 1GB mappings in pmap_enter_quick_locked() 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: fadf4e90adff2fdea94aaaff6e8a344c13045245 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664802716; 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=fJdaKjS3cXy1n74FhRg99ZivJB9+I1iN2uj/fY3FhUo=; b=xeCWLqMqv8iZ7ACX7themW9GP2NX6red4b0lwmFLKmklG/OfKrowCBhysuygGWk6K079DN hnU1b8h9k7hBP4k0Qf/SXHf9sa0d9676SFsrkQxXhzon7gJ1mEQljIb2F+UN1wVb2JQPlz DZ9LGH3Umg2Yb18NIrJIchZQ9LYYCEzKKVVmGkcK0RVX1/pqWiyYY2RqQOElVT0LwoXp7q Lm0mIDMCf0TWPkGRDDAVUhzaTtmiJ1qKHjVu5nu0ARjzs5XIEJA9pLMgZFfyNQzzdUkzQd KMcWbjWeU1Vu9TvcqFvG6WmaC+5uKk2fB/Lp/r+/46pHjZlJgeUHhuZQnfAixg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1664802716; a=rsa-sha256; cv=none; b=QdGhETvo0j/FOtjnehrjjCVdA5y0GujnejvileEKd3yAud/vsbNTwKVDZ3EcTwRkB4TG2A kpqE80nN+x8SXNkuIh9q7Vz7gbiPMQdw+gSEBp2l6Eu754qoPLJqGZXa6Uq0CdNK2Z/q6T acv//P/oFQFIIQmw3Pm17bM8ELcNwOEeKnoA+dLffRB/ND36OFHpJY2//k1iwEH2XS3lBY /BsGGuFT8wNFNBXhLzgNUwm3UlJaiqeyhVQ1qPG2CSUvCOIlPITxU563c9swjiA543poZD t4clBQs8IB6Dpcr5nZBXZNearRJ5v1uy9erKzmvW9NMBfThGDzJ0ogP8etvSOA== 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=fadf4e90adff2fdea94aaaff6e8a344c13045245 commit fadf4e90adff2fdea94aaaff6e8a344c13045245 Author: Mark Johnston AuthorDate: 2022-09-26 12:54:35 +0000 Commit: Mark Johnston CommitDate: 2022-10-03 13:06:22 +0000 arm64: Handle 1GB mappings in pmap_enter_quick_locked() Reviewed by: alc, kib (cherry picked from commit 7533062ae133a0e6e8f5b9913565bb99eabacb5f) --- sys/arm64/arm64/pmap.c | 44 +++++++++++++++++++++++--------------------- 1 file changed, 23 insertions(+), 21 deletions(-) diff --git a/sys/arm64/arm64/pmap.c b/sys/arm64/arm64/pmap.c index 5dd7c11062f9..f2a94769b40d 100644 --- a/sys/arm64/arm64/pmap.c +++ b/sys/arm64/arm64/pmap.c @@ -4660,7 +4660,7 @@ pmap_enter_quick_locked(pmap_t pmap, vm_offset_t va, vm_page_t m, vm_prot_t prot, vm_page_t mpte, struct rwlock **lockp) { pd_entry_t *pde; - pt_entry_t *l2, *l3, l3_val; + pt_entry_t *l1, *l2, *l3, l3_val; vm_paddr_t pa; int lvl; @@ -4687,32 +4687,34 @@ pmap_enter_quick_locked(pmap_t pmap, vm_offset_t va, vm_page_t m, if (mpte && (mpte->pindex == l2pindex)) { mpte->ref_count++; } else { - /* - * Get the l2 entry - */ - pde = pmap_pde(pmap, va, &lvl); - /* * If the page table page is mapped, we just increment * the hold count, and activate it. Otherwise, we - * attempt to allocate a page table page. If this - * attempt fails, we don't retry. Instead, we give up. + * attempt to allocate a page table page, passing NULL + * instead of the PV list lock pointer because we don't + * intend to sleep. If this attempt fails, we don't + * retry. Instead, we give up. */ - if (lvl == 1) { - l2 = pmap_l1_to_l2(pde, va); - if ((pmap_load(l2) & ATTR_DESCR_MASK) == - L2_BLOCK) + l1 = pmap_l1(pmap, va); + if (l1 != NULL && pmap_load(l1) != 0) { + if ((pmap_load(l1) & ATTR_DESCR_MASK) == + L1_BLOCK) return (NULL); - } - if (lvl == 2 && pmap_load(pde) != 0) { - mpte = - PHYS_TO_VM_PAGE(pmap_load(pde) & ~ATTR_MASK); - mpte->ref_count++; + l2 = pmap_l1_to_l2(l1, va); + if (pmap_load(l2) != 0) { + if ((pmap_load(l2) & ATTR_DESCR_MASK) == + L2_BLOCK) + return (NULL); + mpte = PHYS_TO_VM_PAGE(pmap_load(l2) & + ~ATTR_MASK); + mpte->ref_count++; + } else { + mpte = _pmap_alloc_l3(pmap, l2pindex, + NULL); + if (mpte == NULL) + return (mpte); + } } else { - /* - * Pass NULL instead of the PV list lock - * pointer, because we don't intend to sleep. - */ mpte = _pmap_alloc_l3(pmap, l2pindex, NULL); if (mpte == NULL) return (mpte);