From nobody Fri Apr 25 06:02:44 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 4ZkMh50vnfz5vHl0; Fri, 25 Apr 2025 06:02:45 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZkMh45XN8z3Ls4; Fri, 25 Apr 2025 06:02:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1745560964; 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=ThplnLVrMKdjlQF5b4DBkleqOwl6+Vnhz4DDQnMHXaE=; b=CBYkJZCOPPzH6imF59gEubjcVd9hq9/rCbNiLx+ySfZR+f5C3HaOt34jCx3DKBGwWtU4ES kdVlAiYKsce7o51sfL5lSmKDYKRcjloIs0UcLeTckMfwYQXf6DxYktlw3u9VsgKjCaPjKL wXSy9y2d9XVAL1ECqDBgKu3tNVSEqtulWMyCk952ZtkoUcERjLrrWy3v+4vGpBInQhfhiJ i5fwVCpWF1bvGYr66kPnVdV0kkXdSp4AFopfdYzOMy/EbBfiOZP1YF4SKc86Yd4EPUTZ7i bMuYe9jT81J+QxwYFSmO8+6RpEq1Dh44RjAY44xhlMBLSkKS29o5AZ4rnTDQ9g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1745560964; a=rsa-sha256; cv=none; b=ToSXVPvQiTS/PQU+fnnc3DUid3ivZzYSNy0ag8tKrPXCtn5RI8yb7L2hp1T15HW9KrnvWR wwQ9E6j6Ft7sGxx4ynkju7PIq+ob4JdP4o340hkZc/ET7c1L4vJFegVEdE6MRksD1dk2bk IjCPfZrSc/8f2Uz3ZlZK90c+JMMIzoXIPqz15E24D2RJQqRjJJ+LeBXKqak+wC+x2TS/qh gYXET/neEWimXX0jQ0lc4OXkND9YcrVx1fulezZiJIZHoeWqXdhEQyyWEQQQYEiujgArpH VcOlxotXaC75gJZfJTL8Y6JKDWTixxVzycp4pYTxJBY0Wq9O9jPeqbyxPJ+Z4w== 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=1745560964; 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=ThplnLVrMKdjlQF5b4DBkleqOwl6+Vnhz4DDQnMHXaE=; b=lUPR+IQnUWDqBQzZlENrTY28tuBiSjd4vvP1fO0F9sPknEKH/T9d4Y/45b1wpgSa0xWZwj h9DDkZAiuHPKUMk+Xw0vGRB+hMHpG8+FOLcZKHYb/RYo8Ob09ePR4mehH7nf59XvQW8tKE 3xkZPX+ZQUWCNWygR/IYEKFjWe9WImeKJ14YCS6jYVKuoQsh71URck5v6Hk/iu2UyUMrIU dtgxoVmgQT2xyKkGW1SBOzdg7R1chTzz+3tsLa0CSoVxjC2PRA2exQx3NVcOBSZ3AVoP82 7sRmzeoTwOe/wFJvbmYlqarYwen2sFEZzF3UX+pBKQO6Gtv89UF8YdGUhAhu5A== 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 4ZkMh456Tbz7XF; Fri, 25 Apr 2025 06:02:44 +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 53P62iVW015753; Fri, 25 Apr 2025 06:02:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 53P62iCw015750; Fri, 25 Apr 2025 06:02:44 GMT (envelope-from git) Date: Fri, 25 Apr 2025 06:02:44 GMT Message-Id: <202504250602.53P62iCw015750@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: 925906a61caf - main - vm_fault: use iterator in populate() 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: 925906a61cafb44df8643e33aa781ba546e92082 Auto-Submitted: auto-generated The branch main has been updated by dougm: URL: https://cgit.FreeBSD.org/src/commit/?id=925906a61cafb44df8643e33aa781ba546e92082 commit 925906a61cafb44df8643e33aa781ba546e92082 Author: Doug Moore AuthorDate: 2025-04-25 06:01:43 +0000 Commit: Doug Moore CommitDate: 2025-04-25 06:01:43 +0000 vm_fault: use iterator in populate() Use iterators instead of tailq_next pointers in vm_fault_populate(). Reviewed by: kib Differential Revision: https://reviews.freebsd.org/D50010 --- sys/vm/vm_fault.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/sys/vm/vm_fault.c b/sys/vm/vm_fault.c index c096bfaffe73..24fc457adcad 100644 --- a/sys/vm/vm_fault.c +++ b/sys/vm/vm_fault.c @@ -497,6 +497,7 @@ vm_fault_populate_cleanup(vm_object_t object, vm_pindex_t first, static enum fault_status vm_fault_populate(struct faultstate *fs) { + struct pctrie_iter pages; vm_offset_t vaddr; vm_page_t m; vm_pindex_t map_first, map_last, pager_first, pager_last, pidx; @@ -623,9 +624,10 @@ vm_fault_populate(struct faultstate *fs) pager_last); pager_last = map_last; } - for (pidx = pager_first, m = vm_page_lookup(fs->first_object, pidx); + vm_page_iter_init(&pages, fs->first_object); + for (pidx = pager_first, m = vm_radix_iter_lookup(&pages, pidx); pidx <= pager_last; - pidx += npages, m = TAILQ_NEXT(&m[npages - 1], listq)) { + pidx += npages, m = vm_radix_iter_stride(&pages, npages)) { vaddr = fs->entry->start + IDX_TO_OFF(pidx) - fs->entry->offset; KASSERT(m != NULL && m->pindex == pidx, ("%s: pindex mismatch", __func__));