From nobody Mon Apr 21 04:13:03 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 4ZgsRN26dkz5srYp; Mon, 21 Apr 2025 04:13:04 +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 4ZgsRN0HTmz3bZ8; Mon, 21 Apr 2025 04:13:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1745208784; 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=WGoqzvHqXxrH7ljOdUKhHN4cNiTu8yK4BRIhqQlQoJI=; b=YXPSOABxIX4B4zS72f9tC7U4SFhdBb4nGlbx0DltBA/qMVkbQUEgclhlnPsV6bj9U/KA1a FfZRkyrKd9ZxRTFfoROihn0lW/UNkfZz8P6ZTpTXRJgCNAFb4BtZ/AXzeTi97nSY0kVufZ oPlyCNR58BB2ijbm3LIH1eEff+ODfBqLNyI5/Sp+ptaNntbgcMF9rSnExIE8q9jnBu0a3X 356XyddZyh957ALvZL/5JKKw5Gjn/kGQjuE8cvTUhidfcfa/Ni4Gb/Pa/iOvPvcYQmS0M1 Q8kwUPykUai0r+bwmdUrwsm9sRZwEEAHRGrOeBkyPm62ZjpvuAMzFM7NAhP+aw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1745208784; a=rsa-sha256; cv=none; b=hZ6KTp14vkRSp0slKTI0+GS32eZ75soTPwOXINY06/U3dyoQk9VXsJSeSDI7Q5pK7SQGMs mUDQpPOj0B/hmMpaW2SxWaJwLxe5ZhXWhKipxUE7Ak7OlPqjH9QYkJWR2MJ9FoULovHxUA JvLxWO3TAVk6uFnvJEbeDisnQKfad3QJtM2T2XUj8z4DSH3Xqo8cjuo3CUjXTwGtY7FZVU 9NlTbsXCR32ezegnhSgO372O6s7P3qzqTzxqUwMpNchk0ufVozAK8jYvcstvgrdSazE5yq WAZQlWtXVCsJGOlvK60ZFKt7xQYDSOp+qgAN7eduYLqoVahD6AOozQrUauAxcw== 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=1745208784; 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=WGoqzvHqXxrH7ljOdUKhHN4cNiTu8yK4BRIhqQlQoJI=; b=hmZOrK91Hv0EqTOvV5U/bG+me2fGr+rueq8kJ2+I7ljMV2EaNhGmQb7wSw/CDDLXzBuOa8 AT72H0zJG8CBjG4C7RtCrdMvGuNYeUluGawXkGqjq5LUoPooqXHlQQ6oKkGgsHKozZ1bjz 78fd5z7eXt2lUM3uZfFUjM3tZH/cQxdL2oXMMxoiQXLtS+RRAz+W/DB9C4Ln7z297MbjGa vAXTlHpIU6l5N0bER5D3SltmT3YBTRnN809izmEAPofBzTYi4GtCELh0ucRnh0DOOaFogh z19/LRBhP5t9pvPz42s+ugiCZA0yw7npwfe1DZLsJjU4sP43fPJurTQLSUz5cQ== 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 4ZgsRM6hPPzb4w; Mon, 21 Apr 2025 04:13:03 +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 53L4D38u017861; Mon, 21 Apr 2025 04:13:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 53L4D3c6017858; Mon, 21 Apr 2025 04:13:03 GMT (envelope-from git) Date: Mon, 21 Apr 2025 04:13:03 GMT Message-Id: <202504210413.53L4D3c6017858@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: f16d2213af21 - main - i386: 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: f16d2213af2187644563a7db34f2f0dad7d5ae4b Auto-Submitted: auto-generated The branch main has been updated by dougm: URL: https://cgit.FreeBSD.org/src/commit/?id=f16d2213af2187644563a7db34f2f0dad7d5ae4b commit f16d2213af2187644563a7db34f2f0dad7d5ae4b Author: Doug Moore AuthorDate: 2025-04-21 04:05:48 +0000 Commit: Doug Moore CommitDate: 2025-04-21 04:05:48 +0000 i386: 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/D49926 --- sys/i386/i386/pmap.c | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/sys/i386/i386/pmap.c b/sys/i386/i386/pmap.c index 302e493e44d1..89701c1061b0 100644 --- a/sys/i386/i386/pmap.c +++ b/sys/i386/i386/pmap.c @@ -4095,29 +4095,30 @@ static void __CONCAT(PMTYPE, 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, 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); 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 & PDRMASK) == 0 && va + NBPDR <= end && m->psind == 1 && pg_ps_enabled && ((rv = pmap_enter_4mpage(pmap, va, m, prot)) == - KERN_SUCCESS || rv == KERN_NO_SPACE)) - m = &m[NBPDR / PAGE_SIZE - 1]; - else - mpte = pmap_enter_quick_locked(pmap, va, m, prot, - mpte); - m = TAILQ_NEXT(m, listq); + KERN_SUCCESS || rv == KERN_NO_SPACE)) { + m = vm_radix_iter_jump(&pages, NBPDR / PAGE_SIZE); + } else { + mpte = pmap_enter_quick_locked(pmap, va, m, prot, mpte); + m = vm_radix_iter_step(&pages); + } } rw_wunlock(&pvh_global_lock); PMAP_UNLOCK(pmap); @@ -4285,6 +4286,7 @@ static void __CONCAT(PMTYPE, 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; vm_paddr_t pa, ptepa; vm_page_t p; @@ -4297,7 +4299,8 @@ __CONCAT(PMTYPE, object_init_pt)(pmap_t pmap, vm_offset_t addr, (addr & (NBPDR - 1)) == 0 && (size & (NBPDR - 1)) == 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(vm_page_all_valid(p), ("pmap_object_init_pt: invalid page %p", p)); pat_mode = p->md.pat_mode; @@ -4315,15 +4318,14 @@ __CONCAT(PMTYPE, object_init_pt)(pmap_t pmap, vm_offset_t addr, * 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); } /*