From nobody Mon Apr 21 04:13:04 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 4ZgsRP35dkz5ss0d; Mon, 21 Apr 2025 04:13:05 +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 4ZgsRP1Bk4z3bZB; Mon, 21 Apr 2025 04:13:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1745208785; 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=rgJMEjP/8qPgu0SVDeEQHZoHbXMc/eV+kAYaNq/XnCU=; b=qsegW9dyc5WiztkKVwbeGen4bmkvKM0GvSX1yWCXwF6owTM4MOeFUJxw77XP9wRvMVLjT3 jCpW6vw3gAyAWESlJ/1+fzgS0/xt5DvYcYVn/FqTUGDBw7edIUmVuVdamJYHSOrlAz2JjV G0wSyOCLf3UCgbWXj15tbe9fP7MrVdaxn1PkYioGvo9zDxEAQ6Cz4AAFSzD7k9p3RyTGbT hNDvfL6GwLRlP2Up6yDmI5CnWpFHVIm13dcv6WJldreUPo6QLeN1/qx9YuvtCyAjXJCNfj 83mZQgeYqDACU3VAlXqiY3dPSan3zxRmvfZZSdxpWMMi+oqqumhZAGwUwh+1OQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1745208785; a=rsa-sha256; cv=none; b=OZ+X65QwTEhLht78XHuNZSupG8R+RRJxO1afB/ly2DYCp+cPBp9fsCKbhISU2QWSoccdpe YPwQRbye+DJYK7RMj/tIEJXyOpF7GYget1W4JkdWZzSFM7jLet38v008juS3x6rBHHD83M 025lZnst28tOXC0Lavn5GFOPW/018mDbDVCfFuR3+N0Zrd9UVQ9GxIc4Noa7Uv1nq804VK ERP2znCR9RJGcdwT/NhhOoCvabyI2EqKMMvpD2Kii9AWcYCEWQWe54Qm+Oq4SU2DKrXpOr Rh2NjxaJVqMwe3uRzxUH5mrtGFOFF5D5UvWLgpBvq9NSxxadKQltb2KzuN6ZPw== 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=1745208785; 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=rgJMEjP/8qPgu0SVDeEQHZoHbXMc/eV+kAYaNq/XnCU=; b=APgbRBcEnLD7PvWCUaXz3Sn7K31ok3Su1rQPcC0ZgfH1jzNoh/cMENzPgxOOtPuM1k0JJX fbK9qbCJJGjpbZibueacRqJhLb43eeBpwUkRTPksgSj0wh07uUpUKvFosfzp9ASqTaJN2r 4bQ70KJlPDyU+dmSIVmaKgaWoaZC0NIwE0JHJuTuiclhkyhKhFc1RO2vCgg25JNN2swb+Y hebOvpYeKB+hLjbZGskL2xaanxxEAeqGD5HASSRFbs9NrLJ5yYQmDk3/M/G+G7neq4Jkwr iwe8NMigf2zDqjHRwnVeoy+qFRQZJcZF6b9TV1LZbrnqz7YDZjIOBZOUSjnqvA== 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 4ZgsRP0kz9zbNT; Mon, 21 Apr 2025 04:13:05 +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 53L4D5WK017898; Mon, 21 Apr 2025 04:13:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 53L4D4TR017895; Mon, 21 Apr 2025 04:13:04 GMT (envelope-from git) Date: Mon, 21 Apr 2025 04:13:04 GMT Message-Id: <202504210413.53L4D4TR017895@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: b7e671bf3e56 - main - arm64: 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: b7e671bf3e561b99f2603a0356a8fd0123d0e921 Auto-Submitted: auto-generated The branch main has been updated by dougm: URL: https://cgit.FreeBSD.org/src/commit/?id=b7e671bf3e561b99f2603a0356a8fd0123d0e921 commit b7e671bf3e561b99f2603a0356a8fd0123d0e921 Author: Doug Moore AuthorDate: 2025-04-21 04:08:53 +0000 Commit: Doug Moore 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 #include #include +#include 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);