Date: Mon, 21 Apr 2025 04:13:01 GMT From: Doug Moore <dougm@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: git: 478c4fab8405 - main - riscv: replace tailq pointers with iterators Message-ID: <202504210413.53L4D1ol017786@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by dougm: URL: https://cgit.FreeBSD.org/src/commit/?id=478c4fab8405b18b784c9e6b60eb023354645a35 commit 478c4fab8405b18b784c9e6b60eb023354645a35 Author: Doug Moore <dougm@FreeBSD.org> AuthorDate: 2025-04-21 04:02:50 +0000 Commit: Doug Moore <dougm@FreeBSD.org> CommitDate: 2025-04-21 04:02:50 +0000 riscv: 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/D49928 --- sys/riscv/riscv/pmap.c | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/sys/riscv/riscv/pmap.c b/sys/riscv/riscv/pmap.c index c8a69f9674e9..46dea0d7dc85 100644 --- a/sys/riscv/riscv/pmap.c +++ b/sys/riscv/riscv/pmap.c @@ -3614,31 +3614,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; rw_rlock(&pvh_global_lock); 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 == 1 && pmap_ps_enabled(pmap) && ((rv = pmap_enter_2mpage(pmap, va, m, prot, &lock)) == - KERN_SUCCESS || rv == KERN_NO_SPACE)) - m = &m[L2_SIZE / PAGE_SIZE - 1]; - else + KERN_SUCCESS || rv == KERN_NO_SPACE)) { + m = vm_radix_iter_jump(&pages, L2_SIZE / 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);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202504210413.53L4D1ol017786>