From nobody Mon Apr 21 04:13:06 2025 X-Original-To: dev-commits-src-main@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 4ZgsRQ6t1Rz5srhp; Mon, 21 Apr 2025 04:13:06 +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 4ZgsRQ2kWQz3bWb; Mon, 21 Apr 2025 04:13:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1745208786; 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=O7vI2MReK3ooTEGzUieRN1MAJX+UbKqyrkBoLKlCmWA=; b=oJSTkGqQgr6QkRShOE9+IVCKlBqhR7Z4R/b1W3WBlo24Q/M4TCPiPLvWB+EZcX6jo/hPYk VM7zHJYAi9r65veTMC5zHsUx8VEvzVf0MGhdCJDnh2WA5Q0lzIavjFpeepNH+YITIav+pJ PIytLabuwG1LXPTnWWEtW+2YetNH9M6VoZYv0NrOAZltf73Nh069HMxKf5MJRZoGR6uN4S UF2lhWa0bQG+/Fh1BAW8tdTHqocRs+KSLe6oY3JTpQ+1mIy9zeZiA9IGyvSS4H/Xjix8zi 2cEstwBhp9Gy006cBNMTHwYPRNHoybje5SFBuAsD7aEsCs87Jf9DDz4loPRZmA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1745208786; a=rsa-sha256; cv=none; b=o3jcku0dQcKJ/Tme5XNllRiJjukzjErIkbhP+PUefiDVvoT7CfdM2wPExd2lRjMdS2awnq q4sn+MWsnn4o551tSlo+wU6nuFA5qyrKspIEoQdJTUzHVjxGcLPSesW93sNZmfH8WH7oMf JViPvWFyl+QksNh4J/O/Sg4oIPmNAYsBL3prfFO3+e+QJ6z5rrMZuY5ryRtq9qAOg063vk 9OE9POeht6IujfLLf1Lxhftq5Am0X7vrtOpJErbBLvdHYWGp6afH2kADmibAt3Jh5oe+cn wnHZmMPidwHKZMVrHkc9UjGPe9A5BxAyBkV9CuD844X/a4BBR2gkz4VheNDtRA== 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=1745208786; 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=O7vI2MReK3ooTEGzUieRN1MAJX+UbKqyrkBoLKlCmWA=; b=BHgvRaMAwuV731b4AfLcVPGUCt4SRuLSuQtTHbI7kQt1NkWe98B9txJHT8tKO47U8dUZTI jhEqmt2wW2oNr3zmxET+5aJ11B417JZ6FKm2xs3ZOWqwt+tUZd4pjOtZOl72NGBmvuY++P Zjtq4bxlWelRv3SKf7SEscoO6gqm4eIyUfKpOjxUA7U+HHznrGo1A0jhlHAEJ/tOf9UVMh JRkk2RB0nq88r4ePz6JhL5UO8MwFkN/GARkn6I36LhzmvyhYgywxJZfdFE4NefoVznqtiY 78GDM9mSaCy9ZS8QQl3hCq6XTQ/AbtJMHm1VO3Nphu1AknQHSkFEO3uBbEkOcQ== 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 4ZgsRQ1sxVzbQs; Mon, 21 Apr 2025 04:13:06 +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 53L4D6QE017934; Mon, 21 Apr 2025 04:13:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 53L4D6iO017931; Mon, 21 Apr 2025 04:13:06 GMT (envelope-from git) Date: Mon, 21 Apr 2025 04:13:06 GMT Message-Id: <202504210413.53L4D6iO017931@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: c5f477a637c2 - main - arm: replace tailq pointers with iterators List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: c5f477a637c28a28b13b91e6d8dac6015277c8e6 Auto-Submitted: auto-generated The branch main has been updated by dougm: URL: https://cgit.FreeBSD.org/src/commit/?id=c5f477a637c28a28b13b91e6d8dac6015277c8e6 commit c5f477a637c28a28b13b91e6d8dac6015277c8e6 Author: Doug Moore AuthorDate: 2025-04-21 04:10:17 +0000 Commit: Doug Moore CommitDate: 2025-04-21 04:10:17 +0000 arm: 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/D49924 --- sys/arm/arm/pmap-v6.c | 29 +++++++++++++++++------------ 1 file changed, 17 insertions(+), 12 deletions(-) diff --git a/sys/arm/arm/pmap-v6.c b/sys/arm/arm/pmap-v6.c index bb2aced34c94..fafa8908dcd1 100644 --- a/sys/arm/arm/pmap-v6.c +++ b/sys/arm/arm/pmap-v6.c @@ -124,6 +124,7 @@ #include #include #include +#include #include #include #include @@ -4782,29 +4783,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; vm_offset_t va; vm_page_t m, mpt2pg; - vm_pindex_t diff, psize; PDEBUG(6, printf("%s: pmap %p start %#x end %#x m %p prot %#x\n", __func__, pmap, start, end, m_start, prot)); VM_OBJECT_ASSERT_LOCKED(m_start->object); - psize = atop(end - start); + mpt2pg = 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); rw_wlock(&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 & PTE1_OFFSET) == 0 && va + PTE1_SIZE <= end && m->psind == 1 && sp_enabled && - pmap_enter_1mpage(pmap, va, m, prot)) - m = &m[PTE1_SIZE / PAGE_SIZE - 1]; - else + pmap_enter_1mpage(pmap, va, m, prot)) { + m = vm_radix_iter_jump(&pages, NBPDR / PAGE_SIZE); + } else { mpt2pg = pmap_enter_quick_locked(pmap, va, m, prot, mpt2pg); - m = TAILQ_NEXT(m, listq); + m = vm_radix_iter_step(&pages); + } } rw_wunlock(&pvh_global_lock); PMAP_UNLOCK(pmap); @@ -4819,6 +4823,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; pt1_entry_t *pte1p; vm_paddr_t pa, pte2_pa; vm_page_t p; @@ -4831,7 +4836,8 @@ pmap_object_init_pt(pmap_t pmap, vm_offset_t addr, vm_object_t object, if ((addr & PTE1_OFFSET) == 0 && (size & PTE1_OFFSET) == 0) { 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(p->valid == VM_PAGE_BITS_ALL, ("%s: invalid page %p", __func__, p)); pat_mode = p->md.pat_mode; @@ -4849,15 +4855,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 = pte2_pa + PAGE_SIZE; pa < pte2_pa + size; pa += PAGE_SIZE) { + p = vm_radix_iter_next(&pages); KASSERT(p->valid == VM_PAGE_BITS_ALL, ("%s: invalid page %p", __func__, p)); if (pa != VM_PAGE_TO_PHYS(p) || pat_mode != p->md.pat_mode) return; - p = TAILQ_NEXT(p, listq); } /*