From nobody Mon Apr 21 04:13:01 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 4ZgsRK6XFJz5ss24; Mon, 21 Apr 2025 04:13:01 +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 4ZgsRK5Snnz3bkV; Mon, 21 Apr 2025 04:13:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1745208781; 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=XUEbfvlKI3PXPgMx+wKjiBhCGeIHah6fqjjd1WJ8w8M=; b=G2Gg5DTBQmtru6JJvWAsO6VUXPSTEnA9ELniGixzKeYaXNygS8tx71XN9tg9hfH+MkTv3M +UkfqCVKJzeoPfPmvDAfe9m2zFMzqO+IHsBLaDOuOfq0HmGlGE2YHNA/X+MhUrI9gb52s5 Hvj8pKf7npGAmKrJNxvdwMX/4Lg3WZZUpcDDs1HBbYQOvAtiDP6KgDtvGVlSQK57ZYxpQl 92R1nUnfmJMHX6VhAgY076pFLMkTcpcV0D5lQsEiJR5Gn22VV8VFBOt0FEkSvKrkdHwUYi Rk3y8ePOM+JM8nr/+Yy9PFWD9ak7+s5VtCMo+xySaGcXzNS8MyzZTWibMsXD8w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1745208781; a=rsa-sha256; cv=none; b=GuXt5C9IRJkRf9B3/ynfHHsgijI2LaraHJmSMbFQwnzzbpbEfy+CwEF8awvEN10ciCJs8U PVl7AGbYdr0Kv72EKXH7jj6wQkV+QR5FHLQND99mqxcMYLt5hdszDKM3mUShyrdxGAxdKe wHxvVPFfEmhjBS3ud9N5L7xrV4E1pea3eqKv/iI8As2GnAEDprSvJVEK36I2SxxSgd2gW0 lw1JyUKmS37xoqOJxLHZUHwaQDnbAss8j29yURiwQAkFnENdGXxXtQOvPJCrxfa3JX93PD UeZ3jscFk+G1C39SqpKDMkn77Utba4jICs1fHcTogdC+4WviG3deEYdQpIRBvQ== 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=1745208781; 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=XUEbfvlKI3PXPgMx+wKjiBhCGeIHah6fqjjd1WJ8w8M=; b=tWEUTfr0bIUhJ7iyEzSkfsZIfwxdtuTr08WZPDdsVaEmZorKgKOsCf4XqXqOW63RY8te9T fORj/252bPtUOIDNP5XI/1wb6AuBP6z39LV/SWQg+zCENti79acPbEoP5UTtm/C7QMotNm jxvBap6OjUmQR25gDQN3eZ1WFSMGzJOHKIL17IlF4bysrCdR26JELQ3upY0CiAkBTim/fE BsCQRBTneuuSIsNF0I2/FKcJubhr5Bq4ZyUdkli/+07OdUXhwo837a2fte75HR4ZkXu5vj vQeN4r+ybe6OSX/VHd9RjU0/a+VXwASah8zGRJ/v3poxFLpjvemutYPfBZky5Q== 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 4ZgsRK4yS2zZll; Mon, 21 Apr 2025 04:13:01 +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 53L4D1Xp017789; Mon, 21 Apr 2025 04:13:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 53L4D1ol017786; Mon, 21 Apr 2025 04:13:01 GMT (envelope-from git) Date: Mon, 21 Apr 2025 04:13:01 GMT Message-Id: <202504210413.53L4D1ol017786@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: 478c4fab8405 - main - riscv: 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: 478c4fab8405b18b784c9e6b60eb023354645a35 Auto-Submitted: auto-generated The branch main has been updated by dougm: URL: https://cgit.FreeBSD.org/src/commit/?id=478c4fab8405b18b784c9e6b60eb023354645a35 commit 478c4fab8405b18b784c9e6b60eb023354645a35 Author: Doug Moore AuthorDate: 2025-04-21 04:02:50 +0000 Commit: Doug Moore 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);