git: b7e671bf3e56 - main - arm64: replace tailq pointers with iterators
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Mon, 21 Apr 2025 04:13:04 UTC
The branch main has been updated by dougm: URL: https://cgit.FreeBSD.org/src/commit/?id=b7e671bf3e561b99f2603a0356a8fd0123d0e921 commit b7e671bf3e561b99f2603a0356a8fd0123d0e921 Author: Doug Moore <dougm@FreeBSD.org> AuthorDate: 2025-04-21 04:08:53 +0000 Commit: Doug Moore <dougm@FreeBSD.org> CommitDate: 2025-04-21 04:08:53 +0000 arm64: 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/D49925 --- sys/arm64/arm64/efirt_machdep.c | 5 ++++- sys/arm64/arm64/pmap.c | 25 +++++++++++++------------ 2 files changed, 17 insertions(+), 13 deletions(-) diff --git a/sys/arm64/arm64/efirt_machdep.c b/sys/arm64/arm64/efirt_machdep.c index aad3761844e1..0f46e44f5d6a 100644 --- a/sys/arm64/arm64/efirt_machdep.c +++ b/sys/arm64/arm64/efirt_machdep.c @@ -55,6 +55,7 @@ #include <vm/vm_object.h> #include <vm/vm_page.h> #include <vm/vm_pager.h> +#include <vm/vm_radix.h> static vm_object_t obj_1t1_pt; static vm_pindex_t efi_1t1_idx; @@ -64,11 +65,13 @@ static uint64_t efi_ttbr0; 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/arm64/arm64/pmap.c b/sys/arm64/arm64/pmap.c index 14ef7dd0169c..e3b8e3bf01ee 100644 --- a/sys/arm64/arm64/pmap.c +++ b/sys/arm64/arm64/pmap.c @@ -6009,32 +6009,33 @@ 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 & L2_OFFSET) == 0 && va + L2_SIZE <= end && m->psind == 2 && pmap_ps_enabled(pmap) && ((rv = pmap_enter_l2_rx(pmap, va, m, prot, &lock)) == - KERN_SUCCESS || rv == KERN_NO_SPACE)) - m = &m[L2_SIZE / PAGE_SIZE - 1]; - else if ((va & L3C_OFFSET) == 0 && va + L3C_SIZE <= end && + KERN_SUCCESS || rv == KERN_NO_SPACE)) { + m = vm_radix_iter_jump(&pages, L2_SIZE / PAGE_SIZE); + } else if ((va & L3C_OFFSET) == 0 && va + L3C_SIZE <= end && m->psind >= 1 && pmap_ps_enabled(pmap) && ((rv = pmap_enter_l3c_rx(pmap, va, m, &mpte, prot, - &lock)) == KERN_SUCCESS || rv == KERN_NO_SPACE)) - m = &m[L3C_ENTRIES - 1]; - else { + &lock)) == KERN_SUCCESS || rv == KERN_NO_SPACE)) { + m = vm_radix_iter_jump(&pages, L3C_ENTRIES); + } else { /* * In general, if a superpage mapping were possible, * it would have been created above. That said, if @@ -6046,8 +6047,8 @@ pmap_enter_object(pmap_t pmap, vm_offset_t start, vm_offset_t end, */ mpte = pmap_enter_quick_locked(pmap, va, m, prot | VM_PROT_NO_PROMOTE, mpte, &lock); + m = vm_radix_iter_step(&pages); } - m = TAILQ_NEXT(m, listq); } if (lock != NULL) rw_wunlock(lock);