From nobody Mon Apr 21 04:13:07 2025 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 4ZgsRS0rRTz5ss0m; Mon, 21 Apr 2025 04:13:08 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZgsRR30G9z3bw6; Mon, 21 Apr 2025 04:13:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1745208787; 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=RJ9UurtVCd3ceoFMXOg/JQf2n6jeexd0JtxKoMfWEuo=; b=oWKYTQxziX3cvZQ/C3fGTorB1alvt7In2Kkvb8668JOSqtwHWRg1lYKplAz0dFG/RzdSkF 0fvK/j4VTL/i2HSliiqrsBwdr29tt2seuaYvrVdnrItXiBO5A15JRF6H0spnHsWZ0D/Ayw uHLYEbWvu5N5HoDzG5sCOZBzHd1FMJ3/m1UZh5K37SI7BlAXCXzQuFFuXM3wQZVXUjTm21 VKNdvP9uXHGWEr4vgwrjFCqkP3W/CB1wic1Jch7T/sA+O8ChiuNWDAsbh+y3+jZ0U5qSKd KngciW8bXCqTKyOYi9jJgXRvwGE3+4l7BfvHB2gf12MUOnu9vBfimto2XP9+9w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1745208787; a=rsa-sha256; cv=none; b=Rw2XzL0IYBDu861cPnDUIbkUjhHV5CEcxMhKRq/+X1so2PGvKjdDSdr0GdoSGu4rGOhIRG zRXXFkJrvKZT/7lxwTpHrUsms0JnpxdSpOhYNiGubSqvToGy3BLejF7M79MF8vCQTjPLQs 3RH+iivDleOcCZcJivCFLEVGPg0sHbnvCVY99gYNR4vC6WHiMVHgMfOjlNPzBUkjKMkvSS Ega8HvCfpPiVdpLKLD1b1/Ie2Twvks4PNnXICLGgNmV63tIUGk/LTbCMzNpOJh2hl25P71 acnE2nbev9OO71l8llHS+2QiUQqunM+9IekfOZHl8slSbdLGahRuh67FGh1kLA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1745208787; 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=RJ9UurtVCd3ceoFMXOg/JQf2n6jeexd0JtxKoMfWEuo=; b=q0DAxN97gqE98hNnC6+pJ4Wd5X/1E80OmrG0A1n/BZYC2DDXL4dQn/ALg1pOygP9cmh6vm eDfg/xy5oi7W6e3fuR/6JblJefIRoKIhauoeAWqNazRLX223cXUgqzPXKqhuyfd0IVxR7L 1WQXW4gAqrME/HdHFZpgG5xqlkgWLxG8TxD2KI7QySDLc+kCUnRExVtLr72mT49EKn97nn +U6NYJZ1tJtLXlhApTeAtmMiYgfL4NrXpUcFHHwNiOkp/b3j9fRUF5HuVJJ2NYPIr+4Ole aoskDjTZOxzxuu2kR/kpXh0dE/jQHw24f2VgT4HU97Xd03dE3Cr+wTl5pVExig== 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 4ZgsRR2Rr2zb6h; Mon, 21 Apr 2025 04:13:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 53L4D7ow017967; Mon, 21 Apr 2025 04:13:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 53L4D7gc017964; Mon, 21 Apr 2025 04:13:07 GMT (envelope-from git) Date: Mon, 21 Apr 2025 04:13:07 GMT Message-Id: <202504210413.53L4D7gc017964@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Doug Moore Subject: git: aa60a08f2a57 - main - amd64: replace tailq pointers with iterators 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dougm X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: aa60a08f2a5737ef1fab34e539fb546871df2662 Auto-Submitted: auto-generated The branch main has been updated by dougm: URL: https://cgit.FreeBSD.org/src/commit/?id=aa60a08f2a5737ef1fab34e539fb546871df2662 commit aa60a08f2a5737ef1fab34e539fb546871df2662 Author: Doug Moore AuthorDate: 2025-04-21 04:11:43 +0000 Commit: Doug Moore CommitDate: 2025-04-21 04:11:43 +0000 amd64: replace tailq pointers with iterators Change architecture-specific code to use iterators rather than tailq pointers. Reviewed by: kib Differential Revision: https://reviews.freebsd.org/D49923 --- sys/amd64/amd64/efirt_machdep.c | 5 ++++- sys/amd64/amd64/pmap.c | 25 ++++++++++++++----------- sys/amd64/conf/PHO | 13 +++++++++++++ 3 files changed, 31 insertions(+), 12 deletions(-) diff --git a/sys/amd64/amd64/efirt_machdep.c b/sys/amd64/amd64/efirt_machdep.c index 2c00a16b1499..81a28ebe97ee 100644 --- a/sys/amd64/amd64/efirt_machdep.c +++ b/sys/amd64/amd64/efirt_machdep.c @@ -54,6 +54,7 @@ #include #include #include +#include static pml5_entry_t *efi_pml5; static pml4_entry_t *efi_pml4; @@ -64,11 +65,13 @@ static vm_pindex_t efi_1t1_idx; void efi_destroy_1t1_map(void) { + struct pctrie_iter pages; vm_page_t m; if (obj_1t1_pt != NULL) { + vm_page_iter_init(&pages, obj_1t1_pt); VM_OBJECT_RLOCK(obj_1t1_pt); - TAILQ_FOREACH(m, &obj_1t1_pt->memq, listq) + VM_RADIX_FOREACH(m, &pages) m->ref_count = VPRC_OBJREF; vm_wire_sub(obj_1t1_pt->resident_page_count); VM_OBJECT_RUNLOCK(obj_1t1_pt); diff --git a/sys/amd64/amd64/pmap.c b/sys/amd64/amd64/pmap.c index 5d31ad0dd495..9ff630de5b6e 100644 --- a/sys/amd64/amd64/pmap.c +++ b/sys/amd64/amd64/pmap.c @@ -7697,30 +7697,32 @@ void pmap_enter_object(pmap_t pmap, vm_offset_t start, vm_offset_t end, vm_page_t m_start, vm_prot_t prot) { + struct pctrie_iter pages; struct rwlock *lock; vm_offset_t va; vm_page_t m, mpte; - vm_pindex_t diff, psize; int rv; VM_OBJECT_ASSERT_LOCKED(m_start->object); - psize = atop(end - start); mpte = NULL; - m = m_start; + vm_page_iter_limit_init(&pages, m_start->object, + m_start->pindex + atop(end - start)); + m = vm_radix_iter_lookup(&pages, m_start->pindex); lock = NULL; PMAP_LOCK(pmap); - while (m != NULL && (diff = m->pindex - m_start->pindex) < psize) { - va = start + ptoa(diff); + while (m != NULL) { + va = start + ptoa(m->pindex - m_start->pindex); if ((va & PDRMASK) == 0 && va + NBPDR <= end && m->psind == 1 && pmap_ps_enabled(pmap) && ((rv = pmap_enter_2mpage(pmap, va, m, prot, &lock)) == KERN_SUCCESS || rv == KERN_NO_SPACE)) - m = &m[NBPDR / PAGE_SIZE - 1]; - else + m = vm_radix_iter_jump(&pages, NBPDR / PAGE_SIZE); + else { mpte = pmap_enter_quick_locked(pmap, va, m, prot, mpte, &lock); - m = TAILQ_NEXT(m, listq); + m = vm_radix_iter_step(&pages); + } } if (lock != NULL) rw_wunlock(lock); @@ -7894,6 +7896,7 @@ void pmap_object_init_pt(pmap_t pmap, vm_offset_t addr, vm_object_t object, vm_pindex_t pindex, vm_size_t size) { + struct pctrie_iter pages; pd_entry_t *pde; pt_entry_t PG_A, PG_M, PG_RW, PG_V; vm_paddr_t pa, ptepa; @@ -7913,7 +7916,8 @@ pmap_object_init_pt(pmap_t pmap, vm_offset_t addr, vm_object_t object, return; if (!vm_object_populate(object, pindex, pindex + atop(size))) return; - p = vm_page_lookup(object, pindex); + vm_page_iter_init(&pages, object); + p = vm_radix_iter_lookup(&pages, pindex); KASSERT(vm_page_all_valid(p), ("pmap_object_init_pt: invalid page %p", p)); pat_mode = p->md.pat_mode; @@ -7931,15 +7935,14 @@ pmap_object_init_pt(pmap_t pmap, vm_offset_t addr, vm_object_t object, * the pages are not physically contiguous or have differing * memory attributes. */ - p = TAILQ_NEXT(p, listq); for (pa = ptepa + PAGE_SIZE; pa < ptepa + size; pa += PAGE_SIZE) { + p = vm_radix_iter_next(&pages); KASSERT(vm_page_all_valid(p), ("pmap_object_init_pt: invalid page %p", p)); if (pa != VM_PAGE_TO_PHYS(p) || pat_mode != p->md.pat_mode) return; - p = TAILQ_NEXT(p, listq); } /* diff --git a/sys/amd64/conf/PHO b/sys/amd64/conf/PHO new file mode 100644 index 000000000000..7f0d3906ac64 --- /dev/null +++ b/sys/amd64/conf/PHO @@ -0,0 +1,13 @@ +include GENERIC +ident PHO-GENERIC +options ALT_BREAK_TO_DEBUGGER +options SW_WATCHDOG +options WITNESS +options INVARIANTS # Enable calls of extra sanity checking +options INVARIANT_SUPPORT # Extra sanity checks of internal structures, required by INVARIANTS +options DEBUG_LOCKS +options DEBUG_VFS_LOCKS +options DIAGNOSTIC +nooptions DEADLKRES # watchdogd handles this +options UFS_EXTATTR +options UFS_EXTATTR_AUTOSTART